mirror/api
1
0
Fork 0
mirror of https://github.com/unraid/api.git synced 2025-12-31 13:39:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: update configValid state to ineligible in var.ini and adjust rel… (#1268)

Browse Source 
…ated tests

- Changed `configValid` value from "yes" to "ineligible" in `var.ini`.
- Updated tests in `emhttp.test.ts` and `var.test.ts` to reflect the new
state.
- Refactored `var.ts` to handle the new `configErrorState` logic based
on `configValid`.
- Adjusted `config.resolver.ts` to return the correct error state.

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

- **New Features**
- Enhanced configuration status reporting to indicate when settings are
ineligible, improving clarity on configuration validity.

- **Chores**
  - Updated recorded download times to maintain accurate logging.
- Refined the installation process with streamlined dependency linkage
and improved script readability.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->

---------

Co-authored-by: Zack Spear <hi@zackspear.com>
This commit is contained in:
Eli Bosley
2025-03-24 14:19:30 -04:00
committed by GitHub
parent 5958d33fce
commit cc85fba207
13 changed files with 1686 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/dev/states/var.ini
View File

@@ -87,7 +87,7 @@ shareAvahiSMBModel="Xserve"
shfs_logging="1" shfs_logging="1"
safeMode="no" safeMode="no"
startMode="Normal" startMode="Normal"
configValid="yes" configValid="ineligible"
joinStatus="Not joined" joinStatus="Not joined"
deviceCount="4" deviceCount="4"
flashGUID="0000-0000-0000-000000000000" flashGUID="0000-0000-0000-000000000000"

312
api/src/__test__/store/modules/emhttp.test.ts
View File

@@ -949,160 +949,160 @@ test('After init returns values from cfg file for all fields', async () => {
] ]
`); `);
expect(varState).toMatchInlineSnapshot(` expect(varState).toMatchInlineSnapshot(`
{ {
"bindMgt": false, "bindMgt": false,
"cacheNumDevices": NaN, "cacheNumDevices": NaN,
"cacheSbNumDisks": NaN, "cacheSbNumDisks": NaN,
"comment": "Dev Server", "comment": "Dev Server",
"configState": "yes", "configErrorState": "INELIGIBLE",
"configValid": true, "configValid": false,
"csrfToken": "0000000000000000", "csrfToken": "0000000000000000",
"defaultFsType": "xfs", "defaultFsType": "xfs",
"deviceCount": 4, "deviceCount": 4,
"domain": "", "domain": "",
"domainLogin": "Administrator", "domainLogin": "Administrator",
"domainShort": "", "domainShort": "",
"enableFruit": "no", "enableFruit": "no",
"flashGuid": "0000-0000-0000-000000000000", "flashGuid": "0000-0000-0000-000000000000",
"flashProduct": "DataTraveler_3.0", "flashProduct": "DataTraveler_3.0",
"flashVendor": "KINGSTON", "flashVendor": "KINGSTON",
"fsCopyPrcnt": 0, "fsCopyPrcnt": 0,
"fsNumMounted": 0, "fsNumMounted": 0,
"fsNumUnmountable": 0, "fsNumUnmountable": 0,
"fsProgress": "Autostart disabled", "fsProgress": "Autostart disabled",
"fsState": "Stopped", "fsState": "Stopped",
"fsUnmountableMask": "", "fsUnmountableMask": "",
"fuseDirectio": "auto", "fuseDirectio": "auto",
"fuseDirectioDefault": "auto", "fuseDirectioDefault": "auto",
"fuseDirectioStatus": "default", "fuseDirectioStatus": "default",
"fuseRemember": "330", "fuseRemember": "330",
"fuseRememberDefault": "330", "fuseRememberDefault": "330",
"fuseRememberStatus": "default", "fuseRememberStatus": "default",
"fuseUseino": "yes", "fuseUseino": "yes",
"hideDotFiles": false, "hideDotFiles": false,
"joinStatus": "Not joined", "joinStatus": "Not joined",
"localMaster": true, "localMaster": true,
"localTld": "local", "localTld": "local",
"luksKeyfile": "/tmp/unraid/keyfile", "luksKeyfile": "/tmp/unraid/keyfile",
"maxArraysz": 30, "maxArraysz": 30,
"maxCachesz": 30, "maxCachesz": 30,
"mdColor": "green-blink", "mdColor": "green-blink",
"mdNumDisabled": 1, "mdNumDisabled": 1,
"mdNumDisks": 4, "mdNumDisks": 4,
"mdNumErased": 0, "mdNumErased": 0,
"mdNumInvalid": 1, "mdNumInvalid": 1,
"mdNumMissing": 0, "mdNumMissing": 0,
"mdNumNew": 0, "mdNumNew": 0,
"mdNumStripes": 1280, "mdNumStripes": 1280,
"mdNumStripesDefault": 1280, "mdNumStripesDefault": 1280,
"mdNumStripesStatus": "default", "mdNumStripesStatus": "default",
"mdQueueLimit": "80", "mdQueueLimit": "80",
"mdQueueLimitDefault": "80", "mdQueueLimitDefault": "80",
"mdQueueLimitStatus": "default", "mdQueueLimitStatus": "default",
"mdResync": 0, "mdResync": 0,
"mdResyncAction": "check P", "mdResyncAction": "check P",
"mdResyncCorr": "0", "mdResyncCorr": "0",
"mdResyncDb": "0", "mdResyncDb": "0",
"mdResyncDt": "0", "mdResyncDt": "0",
"mdResyncPos": 0, "mdResyncPos": 0,
"mdResyncSize": 438960096, "mdResyncSize": 438960096,
"mdScheduler": "auto", "mdScheduler": "auto",
"mdSchedulerDefault": "auto", "mdSchedulerDefault": "auto",
"mdSchedulerStatus": "default", "mdSchedulerStatus": "default",
"mdState": "STOPPED", "mdState": "STOPPED",
"mdSyncLimit": "5", "mdSyncLimit": "5",
"mdSyncLimitDefault": "5", "mdSyncLimitDefault": "5",
"mdSyncLimitStatus": "default", "mdSyncLimitStatus": "default",
"mdSyncThresh": NaN, "mdSyncThresh": NaN,
"mdSyncThreshDefault": NaN, "mdSyncThreshDefault": NaN,
"mdSyncWindow": NaN, "mdSyncWindow": NaN,
"mdSyncWindowDefault": NaN, "mdSyncWindowDefault": NaN,
"mdVersion": "2.9.14", "mdVersion": "2.9.14",
"mdWriteMethod": NaN, "mdWriteMethod": NaN,
"mdWriteMethodDefault": "auto", "mdWriteMethodDefault": "auto",
"mdWriteMethodStatus": "default", "mdWriteMethodStatus": "default",
"name": "Tower", "name": "Tower",
"nrRequests": NaN, "nrRequests": NaN,
"nrRequestsDefault": NaN, "nrRequestsDefault": NaN,
"nrRequestsStatus": "default", "nrRequestsStatus": "default",
"ntpServer1": "time1.google.com", "ntpServer1": "time1.google.com",
"ntpServer2": "time2.google.com", "ntpServer2": "time2.google.com",
"ntpServer3": "time3.google.com", "ntpServer3": "time3.google.com",
"ntpServer4": "time4.google.com", "ntpServer4": "time4.google.com",
"pollAttributes": "1800", "pollAttributes": "1800",
"pollAttributesDefault": "1800", "pollAttributesDefault": "1800",
"pollAttributesStatus": "default", "pollAttributesStatus": "default",
"port": 80, "port": 80,
"portssh": 22, "portssh": 22,
"portssl": 443, "portssl": 443,
"porttelnet": 23, "porttelnet": 23,
"queueDepth": "auto", "queueDepth": "auto",
"regCheck": "Valid", "regCheck": "Valid",
"regExp": "", "regExp": "",
"regFile": "/app/dev/Unraid.net/Pro.key", "regFile": "/app/dev/Unraid.net/Pro.key",
"regGen": "0", "regGen": "0",
"regGuid": "13FE-4200-C300-58C372A52B19", "regGuid": "13FE-4200-C300-58C372A52B19",
"regState": "PRO", "regState": "PRO",
"regTm": "1833409182", "regTm": "1833409182",
"regTm2": "0", "regTm2": "0",
"regTo": "Eli Bosley", "regTo": "Eli Bosley",
"regTy": "PRO", "regTy": "PRO",
"reservedNames": "parity,parity2,parity3,diskP,diskQ,diskR,disk,disks,flash,boot,user,user0,disk0,disk1,disk2,disk3,disk4,disk5,disk6,disk7,disk8,disk9,disk10,disk11,disk12,disk13,disk14,disk15,disk16,disk17,disk18,disk19,disk20,disk21,disk22,disk23,disk24,disk25,disk26,disk27,disk28,disk29,disk30,disk31", "reservedNames": "parity,parity2,parity3,diskP,diskQ,diskR,disk,disks,flash,boot,user,user0,disk0,disk1,disk2,disk3,disk4,disk5,disk6,disk7,disk8,disk9,disk10,disk11,disk12,disk13,disk14,disk15,disk16,disk17,disk18,disk19,disk20,disk21,disk22,disk23,disk24,disk25,disk26,disk27,disk28,disk29,disk30,disk31",
"safeMode": false, "safeMode": false,
"sbClean": true, "sbClean": true,
"sbEvents": 173, "sbEvents": 173,
"sbName": "/boot/config/super.dat", "sbName": "/boot/config/super.dat",
"sbNumDisks": 5, "sbNumDisks": 5,
"sbState": "1", "sbState": "1",
"sbSyncErrs": 0, "sbSyncErrs": 0,
"sbSyncExit": "0", "sbSyncExit": "0",
"sbSynced": 1586819259, "sbSynced": 1586819259,
"sbSynced2": 1586822456, "sbSynced2": 1586822456,
"sbUpdated": "1596079143", "sbUpdated": "1596079143",
"sbVersion": "2.9.13", "sbVersion": "2.9.13",
"security": "user", "security": "user",
"shareAvahiEnabled": true, "shareAvahiEnabled": true,
"shareAvahiSmbModel": "Xserve", "shareAvahiSmbModel": "Xserve",
"shareAvahiSmbName": "%h", "shareAvahiSmbName": "%h",
"shareCacheEnabled": true, "shareCacheEnabled": true,
"shareCacheFloor": "2000000", "shareCacheFloor": "2000000",
"shareCount": 0, "shareCount": 0,
"shareDisk": "yes", "shareDisk": "yes",
"shareInitialGroup": "Domain Users", "shareInitialGroup": "Domain Users",
"shareInitialOwner": "Administrator", "shareInitialOwner": "Administrator",
"shareMoverActive": false, "shareMoverActive": false,
"shareMoverLogging": false, "shareMoverLogging": false,
"shareMoverSchedule": "40 3 * * *", "shareMoverSchedule": "40 3 * * *",
"shareNfsCount": 0, "shareNfsCount": 0,
"shareNfsEnabled": false, "shareNfsEnabled": false,
"shareSmbCount": 1, "shareSmbCount": 1,
"shareSmbEnabled": true, "shareSmbEnabled": true,
"shareSmbMode": "workgroup", "shareSmbMode": "workgroup",
"shareUser": "e", "shareUser": "e",
"shareUserExclude": "", "shareUserExclude": "",
"shareUserInclude": "", "shareUserInclude": "",
"shfsLogging": "1", "shfsLogging": "1",
"shutdownTimeout": 90, "shutdownTimeout": 90,
"spindownDelay": 0, "spindownDelay": 0,
"spinupGroups": false, "spinupGroups": false,
"startArray": false, "startArray": false,
"startMode": "Normal", "startMode": "Normal",
"startPage": "Main", "startPage": "Main",
"sysArraySlots": 24, "sysArraySlots": 24,
"sysCacheSlots": NaN, "sysCacheSlots": NaN,
"sysFlashSlots": 1, "sysFlashSlots": 1,
"sysModel": "Dell R710", "sysModel": "Dell R710",
"timeZone": "Australia/Adelaide", "timeZone": "Australia/Adelaide",
"useNetbios": "yes", "useNetbios": "yes",
"useNtp": true, "useNtp": true,
"useSsh": true, "useSsh": true,
"useSsl": null, "useSsl": null,
"useTelnet": true, "useTelnet": true,
"useUpnp": true, "useUpnp": true,
"useWsd": "no", "useWsd": "no",
"version": "6.11.2", "version": "6.11.2",
"workgroup": "WORKGROUP", "workgroup": "WORKGROUP",
"wsdOpt": "", "wsdOpt": "",
} }
`); `);
}); });

312
api/src/__test__/store/state-parsers/var.test.ts
View File

@@ -16,160 +16,160 @@ test('Returns parsed state file', async () => {
}); });
expect(parse(stateFile)).toMatchInlineSnapshot(` expect(parse(stateFile)).toMatchInlineSnapshot(`
{ {
"bindMgt": false, "bindMgt": false,
"cacheNumDevices": NaN, "cacheNumDevices": NaN,
"cacheSbNumDisks": NaN, "cacheSbNumDisks": NaN,
"comment": "Dev Server", "comment": "Dev Server",
"configState": "yes", "configErrorState": "INELIGIBLE",
"configValid": true, "configValid": false,
"csrfToken": "0000000000000000", "csrfToken": "0000000000000000",
"defaultFsType": "xfs", "defaultFsType": "xfs",
"deviceCount": 4, "deviceCount": 4,
"domain": "", "domain": "",
"domainLogin": "Administrator", "domainLogin": "Administrator",
"domainShort": "", "domainShort": "",
"enableFruit": "no", "enableFruit": "no",
"flashGuid": "0000-0000-0000-000000000000", "flashGuid": "0000-0000-0000-000000000000",
"flashProduct": "DataTraveler_3.0", "flashProduct": "DataTraveler_3.0",
"flashVendor": "KINGSTON", "flashVendor": "KINGSTON",
"fsCopyPrcnt": 0, "fsCopyPrcnt": 0,
"fsNumMounted": 0, "fsNumMounted": 0,
"fsNumUnmountable": 0, "fsNumUnmountable": 0,
"fsProgress": "Autostart disabled", "fsProgress": "Autostart disabled",
"fsState": "Stopped", "fsState": "Stopped",
"fsUnmountableMask": "", "fsUnmountableMask": "",
"fuseDirectio": "auto", "fuseDirectio": "auto",
"fuseDirectioDefault": "auto", "fuseDirectioDefault": "auto",
"fuseDirectioStatus": "default", "fuseDirectioStatus": "default",
"fuseRemember": "330", "fuseRemember": "330",
"fuseRememberDefault": "330", "fuseRememberDefault": "330",
"fuseRememberStatus": "default", "fuseRememberStatus": "default",
"fuseUseino": "yes", "fuseUseino": "yes",
"hideDotFiles": false, "hideDotFiles": false,
"joinStatus": "Not joined", "joinStatus": "Not joined",
"localMaster": true, "localMaster": true,
"localTld": "local", "localTld": "local",
"luksKeyfile": "/tmp/unraid/keyfile", "luksKeyfile": "/tmp/unraid/keyfile",
"maxArraysz": 30, "maxArraysz": 30,
"maxCachesz": 30, "maxCachesz": 30,
"mdColor": "green-blink", "mdColor": "green-blink",
"mdNumDisabled": 1, "mdNumDisabled": 1,
"mdNumDisks": 4, "mdNumDisks": 4,
"mdNumErased": 0, "mdNumErased": 0,
"mdNumInvalid": 1, "mdNumInvalid": 1,
"mdNumMissing": 0, "mdNumMissing": 0,
"mdNumNew": 0, "mdNumNew": 0,
"mdNumStripes": 1280, "mdNumStripes": 1280,
"mdNumStripesDefault": 1280, "mdNumStripesDefault": 1280,
"mdNumStripesStatus": "default", "mdNumStripesStatus": "default",
"mdQueueLimit": "80", "mdQueueLimit": "80",
"mdQueueLimitDefault": "80", "mdQueueLimitDefault": "80",
"mdQueueLimitStatus": "default", "mdQueueLimitStatus": "default",
"mdResync": 0, "mdResync": 0,
"mdResyncAction": "check P", "mdResyncAction": "check P",
"mdResyncCorr": "0", "mdResyncCorr": "0",
"mdResyncDb": "0", "mdResyncDb": "0",
"mdResyncDt": "0", "mdResyncDt": "0",
"mdResyncPos": 0, "mdResyncPos": 0,
"mdResyncSize": 438960096, "mdResyncSize": 438960096,
"mdScheduler": "auto", "mdScheduler": "auto",
"mdSchedulerDefault": "auto", "mdSchedulerDefault": "auto",
"mdSchedulerStatus": "default", "mdSchedulerStatus": "default",
"mdState": "STOPPED", "mdState": "STOPPED",
"mdSyncLimit": "5", "mdSyncLimit": "5",
"mdSyncLimitDefault": "5", "mdSyncLimitDefault": "5",
"mdSyncLimitStatus": "default", "mdSyncLimitStatus": "default",
"mdSyncThresh": NaN, "mdSyncThresh": NaN,
"mdSyncThreshDefault": NaN, "mdSyncThreshDefault": NaN,
"mdSyncWindow": NaN, "mdSyncWindow": NaN,
"mdSyncWindowDefault": NaN, "mdSyncWindowDefault": NaN,
"mdVersion": "2.9.14", "mdVersion": "2.9.14",
"mdWriteMethod": NaN, "mdWriteMethod": NaN,
"mdWriteMethodDefault": "auto", "mdWriteMethodDefault": "auto",
"mdWriteMethodStatus": "default", "mdWriteMethodStatus": "default",
"name": "Tower", "name": "Tower",
"nrRequests": NaN, "nrRequests": NaN,
"nrRequestsDefault": NaN, "nrRequestsDefault": NaN,
"nrRequestsStatus": "default", "nrRequestsStatus": "default",
"ntpServer1": "time1.google.com", "ntpServer1": "time1.google.com",
"ntpServer2": "time2.google.com", "ntpServer2": "time2.google.com",
"ntpServer3": "time3.google.com", "ntpServer3": "time3.google.com",
"ntpServer4": "time4.google.com", "ntpServer4": "time4.google.com",
"pollAttributes": "1800", "pollAttributes": "1800",
"pollAttributesDefault": "1800", "pollAttributesDefault": "1800",
"pollAttributesStatus": "default", "pollAttributesStatus": "default",
"port": 80, "port": 80,
"portssh": 22, "portssh": 22,
"portssl": 443, "portssl": 443,
"porttelnet": 23, "porttelnet": 23,
"queueDepth": "auto", "queueDepth": "auto",
"regCheck": "Valid", "regCheck": "Valid",
"regExp": "", "regExp": "",
"regFile": "/app/dev/Unraid.net/Pro.key", "regFile": "/app/dev/Unraid.net/Pro.key",
"regGen": "0", "regGen": "0",
"regGuid": "13FE-4200-C300-58C372A52B19", "regGuid": "13FE-4200-C300-58C372A52B19",
"regState": "PRO", "regState": "PRO",
"regTm": "1833409182", "regTm": "1833409182",
"regTm2": "0", "regTm2": "0",
"regTo": "Eli Bosley", "regTo": "Eli Bosley",
"regTy": "PRO", "regTy": "PRO",
"reservedNames": "parity,parity2,parity3,diskP,diskQ,diskR,disk,disks,flash,boot,user,user0,disk0,disk1,disk2,disk3,disk4,disk5,disk6,disk7,disk8,disk9,disk10,disk11,disk12,disk13,disk14,disk15,disk16,disk17,disk18,disk19,disk20,disk21,disk22,disk23,disk24,disk25,disk26,disk27,disk28,disk29,disk30,disk31", "reservedNames": "parity,parity2,parity3,diskP,diskQ,diskR,disk,disks,flash,boot,user,user0,disk0,disk1,disk2,disk3,disk4,disk5,disk6,disk7,disk8,disk9,disk10,disk11,disk12,disk13,disk14,disk15,disk16,disk17,disk18,disk19,disk20,disk21,disk22,disk23,disk24,disk25,disk26,disk27,disk28,disk29,disk30,disk31",
"safeMode": false, "safeMode": false,
"sbClean": true, "sbClean": true,
"sbEvents": 173, "sbEvents": 173,
"sbName": "/boot/config/super.dat", "sbName": "/boot/config/super.dat",
"sbNumDisks": 5, "sbNumDisks": 5,
"sbState": "1", "sbState": "1",
"sbSyncErrs": 0, "sbSyncErrs": 0,
"sbSyncExit": "0", "sbSyncExit": "0",
"sbSynced": 1586819259, "sbSynced": 1586819259,
"sbSynced2": 1586822456, "sbSynced2": 1586822456,
"sbUpdated": "1596079143", "sbUpdated": "1596079143",
"sbVersion": "2.9.13", "sbVersion": "2.9.13",
"security": "user", "security": "user",
"shareAvahiEnabled": true, "shareAvahiEnabled": true,
"shareAvahiSmbModel": "Xserve", "shareAvahiSmbModel": "Xserve",
"shareAvahiSmbName": "%h", "shareAvahiSmbName": "%h",
"shareCacheEnabled": true, "shareCacheEnabled": true,
"shareCacheFloor": "2000000", "shareCacheFloor": "2000000",
"shareCount": 0, "shareCount": 0,
"shareDisk": "yes", "shareDisk": "yes",
"shareInitialGroup": "Domain Users", "shareInitialGroup": "Domain Users",
"shareInitialOwner": "Administrator", "shareInitialOwner": "Administrator",
"shareMoverActive": false, "shareMoverActive": false,
"shareMoverLogging": false, "shareMoverLogging": false,
"shareMoverSchedule": "40 3 * * *", "shareMoverSchedule": "40 3 * * *",
"shareNfsCount": 0, "shareNfsCount": 0,
"shareNfsEnabled": false, "shareNfsEnabled": false,
"shareSmbCount": 1, "shareSmbCount": 1,
"shareSmbEnabled": true, "shareSmbEnabled": true,
"shareSmbMode": "workgroup", "shareSmbMode": "workgroup",
"shareUser": "e", "shareUser": "e",
"shareUserExclude": "", "shareUserExclude": "",
"shareUserInclude": "", "shareUserInclude": "",
"shfsLogging": "1", "shfsLogging": "1",
"shutdownTimeout": 90, "shutdownTimeout": 90,
"spindownDelay": 0, "spindownDelay": 0,
"spinupGroups": false, "spinupGroups": false,
"startArray": false, "startArray": false,
"startMode": "Normal", "startMode": "Normal",
"startPage": "Main", "startPage": "Main",
"sysArraySlots": 24, "sysArraySlots": 24,
"sysCacheSlots": NaN, "sysCacheSlots": NaN,
"sysFlashSlots": 1, "sysFlashSlots": 1,
"sysModel": "Dell R710", "sysModel": "Dell R710",
"timeZone": "Australia/Adelaide", "timeZone": "Australia/Adelaide",
"useNetbios": "yes", "useNetbios": "yes",
"useNtp": true, "useNtp": true,
"useSsh": true, "useSsh": true,
"useSsl": null, "useSsl": null,
"useTelnet": true, "useTelnet": true,
"useUpnp": true, "useUpnp": true,
"useWsd": "no", "useWsd": "no",
"version": "6.11.2", "version": "6.11.2",
"workgroup": "WORKGROUP", "workgroup": "WORKGROUP",
"wsdOpt": "", "wsdOpt": "",
} }
`); `);
}); });

13
api/src/core/types/states/var.ts
View File

@@ -1,9 +1,10 @@
import { import type {
type ArrayState, ArrayState,
type DiskFsType, DiskFsType,
type RegistrationState, RegistrationState,
type registrationType, registrationType,
} from '@app/graphql/generated/api/types.js'; } from '@app/graphql/generated/api/types.js';
import { ConfigErrorState } from '@app/graphql/generated/api/types.js';
/** /**
* Global vars * Global vars
@@ -17,7 +18,7 @@ export type Var = {
/** Is the array's config valid. */ /** Is the array's config valid. */
configValid: boolean; configValid: boolean;
/** @internal used to hold the value for config.error */ /** @internal used to hold the value for config.error */
configState: string; configErrorState: ConfigErrorState | null;
/** Current CSRF token for HTTP requests with emhttpd. */ /** Current CSRF token for HTTP requests with emhttpd. */
csrfToken: string; csrfToken: string;
defaultFormat: string; defaultFormat: string;

11
api/src/store/state-parsers/var.ts
View File

@@ -3,6 +3,7 @@ import { type IniStringBoolean, type IniStringBooleanOrAuto } from '@app/core/ty
import { toNumber } from '@app/core/utils/index.js'; import { toNumber } from '@app/core/utils/index.js';
import { import {
ArrayState, ArrayState,
ConfigErrorState,
DiskFsType, DiskFsType,
RegistrationState, RegistrationState,
registrationType, registrationType,
@@ -23,7 +24,7 @@ export type VarIni = {
cacheSbNumDisks: string; cacheSbNumDisks: string;
comment: string; comment: string;
configValid: string; configValid: string;
configState: string; configErrorState: string;
csrfToken: string; csrfToken: string;
defaultFormat: string; defaultFormat: string;
defaultFsType: string; defaultFsType: string;
@@ -200,6 +201,10 @@ const safeParseMdState = (mdState: string | undefined): ArrayState => {
return attemptedParse; return attemptedParse;
}; };
export const convertconfigErrorStateToEnum = (configErrorState: string): ConfigErrorState => {
return ConfigErrorState[configErrorState.toUpperCase()];
};
export const parse: StateFileToIniParserMap['var'] = (iniFile) => { export const parse: StateFileToIniParserMap['var'] = (iniFile) => {
return { return {
...iniFile, ...iniFile,
@@ -209,7 +214,9 @@ export const parse: StateFileToIniParserMap['var'] = (iniFile) => {
cacheNumDevices: toNumber(iniFile.cacheNumDevices), cacheNumDevices: toNumber(iniFile.cacheNumDevices),
cacheSbNumDisks: toNumber(iniFile.cacheSbNumDisks), cacheSbNumDisks: toNumber(iniFile.cacheSbNumDisks),
configValid: iniBooleanToJsBoolean(iniFile.configValid, false), configValid: iniBooleanToJsBoolean(iniFile.configValid, false),
configState: iniFile.configValid, configErrorState: iniBooleanToJsBoolean(iniFile.configValid, false)
? null
: convertconfigErrorStateToEnum(iniFile.configValid),
deviceCount: toNumber(iniFile.deviceCount), deviceCount: toNumber(iniFile.deviceCount),
fsCopyPrcnt: toNumber(iniFile.fsCopyPrcnt), fsCopyPrcnt: toNumber(iniFile.fsCopyPrcnt),
fsNumMounted: toNumber(iniFile.fsNumMounted), fsNumMounted: toNumber(iniFile.fsNumMounted),

4
api/src/unraid-api/graph/resolvers/config/config.resolver.ts
View File

@@ -21,9 +21,7 @@ export class ConfigResolver {
return { return {
id: 'config', id: 'config',
valid: emhttp.var.configValid, valid: emhttp.var.configValid,
error: emhttp.var.configValid error: emhttp.var.configValid ? null : emhttp.var.configErrorState,
? null
: (ConfigErrorState[emhttp.var.configState] ?? ConfigErrorState.UNKNOWN_ERROR),
}; };
} }

2
api/src/unraid-api/unraid-file-modifier/modifications/__test__/__fixtures__/downloaded/.login.php.last-download-time
View File

@@ -1 +1 @@
1741960696861 1742838682466

2
api/src/unraid-api/unraid-file-modifier/modifications/__test__/__fixtures__/downloaded/DefaultPageLayout.php.last-download-time
View File

@@ -1 +1 @@
1741960696132 1742838681735

2
api/src/unraid-api/unraid-file-modifier/modifications/__test__/__fixtures__/downloaded/Notifications.page.last-download-time
View File

@@ -1 +1 @@
1741960696408 1742838682135

2
api/src/unraid-api/unraid-file-modifier/modifications/__test__/__fixtures__/downloaded/auth-request.php.last-download-time
View File

@@ -1 +1 @@
1741960697108 1742838682936

1
plugin/plugins/dynamix.unraid.net.plg
View File

@@ -500,6 +500,7 @@ CFG_OLD=/boot/config/plugins/Unraid.net
CFG_NEW=/boot/config/plugins/dynamix.my.servers CFG_NEW=/boot/config/plugins/dynamix.my.servers
[[ -d "$CFG_OLD" ]] && [[ ! -d "$CFG_NEW" ]] && mv "$CFG_OLD" "$CFG_NEW" [[ -d "$CFG_OLD" ]] && [[ ! -d "$CFG_NEW" ]] && mv "$CFG_OLD" "$CFG_NEW"
# relax restrictions on built-in Firefox so it can sign in to Unraid Connect # relax restrictions on built-in Firefox so it can sign in to Unraid Connect
# brings older versions of Unraid in sync with 6.12.0 # brings older versions of Unraid in sync with 6.12.0
# no need to restore original file on uninstall # no need to restore original file on uninstall

1350
plugin/source/dynamix.unraid.net/install/doinst.sh
View File

File diff suppressed because it is too large Load Diff

2
web/components/UpdateOs/IgnoredRelease.vue
View File

@@ -8,7 +8,7 @@ import { useServerStore } from '~/store/server';
import { useThemeStore } from '~/store/theme'; import { useThemeStore } from '~/store/theme';
export interface Props { export interface Props {
label: string; label?: string;
t: ComposerTranslation; t: ComposerTranslation;
} }