From 93f137f38e977fe4bf210a59f8213972d52097f4 Mon Sep 17 00:00:00 2001 From: Zack Spear Date: Wed, 12 Mar 2025 17:46:39 -0700 Subject: [PATCH 1/4] fix: add INELIGIBLE state to ConfigErrorState enum --- api/src/graphql/generated/api/types.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/api/src/graphql/generated/api/types.ts b/api/src/graphql/generated/api/types.ts index 6989428810..5cc0a6bf8e 100644 --- a/api/src/graphql/generated/api/types.ts +++ b/api/src/graphql/generated/api/types.ts @@ -288,7 +288,8 @@ export enum ConfigErrorState { INVALID = 'INVALID', NO_KEY_SERVER = 'NO_KEY_SERVER', UNKNOWN_ERROR = 'UNKNOWN_ERROR', - WITHDRAWN = 'WITHDRAWN' + WITHDRAWN = 'WITHDRAWN', + INELIGIBLE = 'INELIGIBLE' } export type Connect = Node & { From d0c20cb6a666a143df926d71cfa1970e4e5c5492 Mon Sep 17 00:00:00 2001 From: Zack Spear Date: Wed, 12 Mar 2025 17:59:45 -0700 Subject: [PATCH 2/4] fix: add INELIGIBLE state to ConfigErrorState enum in GraphQL and related files --- api/src/graphql/generated/api/types.ts | 4 ++-- api/src/graphql/schema/types/config/config.graphql | 1 + api/src/graphql/schema/types/vars/vars.graphql | 1 + web/_webGui/testWebComponents.page | 1 + web/composables/gql/graphql.ts | 1 + 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/api/src/graphql/generated/api/types.ts b/api/src/graphql/generated/api/types.ts index 5cc0a6bf8e..695a0377a7 100644 --- a/api/src/graphql/generated/api/types.ts +++ b/api/src/graphql/generated/api/types.ts @@ -285,11 +285,11 @@ export type Config = Node & { }; export enum ConfigErrorState { + INELIGIBLE = 'INELIGIBLE', INVALID = 'INVALID', NO_KEY_SERVER = 'NO_KEY_SERVER', UNKNOWN_ERROR = 'UNKNOWN_ERROR', - WITHDRAWN = 'WITHDRAWN', - INELIGIBLE = 'INELIGIBLE' + WITHDRAWN = 'WITHDRAWN' } export type Connect = Node & { diff --git a/api/src/graphql/schema/types/config/config.graphql b/api/src/graphql/schema/types/config/config.graphql index 3ff69ac845..3ec01dc8d4 100644 --- a/api/src/graphql/schema/types/config/config.graphql +++ b/api/src/graphql/schema/types/config/config.graphql @@ -1,5 +1,6 @@ enum ConfigErrorState { UNKNOWN_ERROR + INELIGIBLE INVALID NO_KEY_SERVER WITHDRAWN diff --git a/api/src/graphql/schema/types/vars/vars.graphql b/api/src/graphql/schema/types/vars/vars.graphql index 7cbdfe046c..e99c3fc178 100644 --- a/api/src/graphql/schema/types/vars/vars.graphql +++ b/api/src/graphql/schema/types/vars/vars.graphql @@ -8,6 +8,7 @@ type Subscription { enum ConfigErrorState { UNKNOWN_ERROR + INELIGIBLE INVALID NO_KEY_SERVER WITHDRAWN diff --git a/web/_webGui/testWebComponents.page b/web/_webGui/testWebComponents.page index fd7b87af78..929ad4ebf1 100644 --- a/web/_webGui/testWebComponents.page +++ b/web/_webGui/testWebComponents.page @@ -46,6 +46,7 @@ if (!function_exists('ipaddr')) { } $configErrorEnum = [ // used to map $var['configValid'] value to mimic unraid-api's `configError` ENUM "error" => 'UNKNOWN_ERROR', + "ineligible" => 'INELIGIBLE', "invalid" => 'INVALID', "nokeyserver" => 'NO_KEY_SERVER', "withdrawn" => 'WITHDRAWN', diff --git a/web/composables/gql/graphql.ts b/web/composables/gql/graphql.ts index 36164a0744..9220dadf08 100644 --- a/web/composables/gql/graphql.ts +++ b/web/composables/gql/graphql.ts @@ -288,6 +288,7 @@ export type Config = Node & { }; export enum ConfigErrorState { + Ineligible = 'INELIGIBLE', Invalid = 'INVALID', NoKeyServer = 'NO_KEY_SERVER', UnknownError = 'UNKNOWN_ERROR', From 22557165337087a663e0708d67dd95991d23ac4c Mon Sep 17 00:00:00 2001 From: Eli Bosley Date: Thu, 13 Mar 2025 11:59:28 -0400 Subject: [PATCH 3/4] chore: update layouts --- .../__fixtures__/downloaded/.login.php.last-download-time | 2 +- .../__test__/__fixtures__/downloaded/DefaultPageLayout.php | 2 +- .../downloaded/DefaultPageLayout.php.last-download-time | 2 +- .../downloaded/Notifications.page.last-download-time | 2 +- .../__fixtures__/downloaded/auth-request.php.last-download-time | 2 +- .../snapshots/DefaultPageLayout.php.modified.snapshot.php | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/api/src/unraid-api/unraid-file-modifier/modifications/__test__/__fixtures__/downloaded/.login.php.last-download-time b/api/src/unraid-api/unraid-file-modifier/modifications/__test__/__fixtures__/downloaded/.login.php.last-download-time index 9e339bed1b..bfdd52e50d 100644 --- a/api/src/unraid-api/unraid-file-modifier/modifications/__test__/__fixtures__/downloaded/.login.php.last-download-time +++ b/api/src/unraid-api/unraid-file-modifier/modifications/__test__/__fixtures__/downloaded/.login.php.last-download-time @@ -1 +1 @@ -1740588065597 \ No newline at end of file +1741881521869 \ No newline at end of file diff --git a/api/src/unraid-api/unraid-file-modifier/modifications/__test__/__fixtures__/downloaded/DefaultPageLayout.php b/api/src/unraid-api/unraid-file-modifier/modifications/__test__/__fixtures__/downloaded/DefaultPageLayout.php index b8f39ce4a1..7fbb2469d2 100644 --- a/api/src/unraid-api/unraid-file-modifier/modifications/__test__/__fixtures__/downloaded/DefaultPageLayout.php +++ b/api/src/unraid-api/unraid-file-modifier/modifications/__test__/__fixtures__/downloaded/DefaultPageLayout.php @@ -676,7 +676,7 @@ function flashReport() { echo "
"; if (isset($myPage['Lock'])) { $title = $themes2 ? "" : _('Unlock sortable items'); - echo "
"._('Unlock sortable items')."
"; + echo "
"._('Unlock sortable items')."
"; } if ($display['usage']) my_usage(); diff --git a/api/src/unraid-api/unraid-file-modifier/modifications/__test__/__fixtures__/downloaded/DefaultPageLayout.php.last-download-time b/api/src/unraid-api/unraid-file-modifier/modifications/__test__/__fixtures__/downloaded/DefaultPageLayout.php.last-download-time index 28745ffb3d..a1c8b70827 100644 --- a/api/src/unraid-api/unraid-file-modifier/modifications/__test__/__fixtures__/downloaded/DefaultPageLayout.php.last-download-time +++ b/api/src/unraid-api/unraid-file-modifier/modifications/__test__/__fixtures__/downloaded/DefaultPageLayout.php.last-download-time @@ -1 +1 @@ -1740588063495 \ No newline at end of file +1741881520894 \ No newline at end of file diff --git a/api/src/unraid-api/unraid-file-modifier/modifications/__test__/__fixtures__/downloaded/Notifications.page.last-download-time b/api/src/unraid-api/unraid-file-modifier/modifications/__test__/__fixtures__/downloaded/Notifications.page.last-download-time index 890c275e21..e783e2b634 100644 --- a/api/src/unraid-api/unraid-file-modifier/modifications/__test__/__fixtures__/downloaded/Notifications.page.last-download-time +++ b/api/src/unraid-api/unraid-file-modifier/modifications/__test__/__fixtures__/downloaded/Notifications.page.last-download-time @@ -1 +1 @@ -1740588063858 \ No newline at end of file +1741881521463 \ No newline at end of file diff --git a/api/src/unraid-api/unraid-file-modifier/modifications/__test__/__fixtures__/downloaded/auth-request.php.last-download-time b/api/src/unraid-api/unraid-file-modifier/modifications/__test__/__fixtures__/downloaded/auth-request.php.last-download-time index 57b142023c..2f8016ba3c 100644 --- a/api/src/unraid-api/unraid-file-modifier/modifications/__test__/__fixtures__/downloaded/auth-request.php.last-download-time +++ b/api/src/unraid-api/unraid-file-modifier/modifications/__test__/__fixtures__/downloaded/auth-request.php.last-download-time @@ -1 +1 @@ -1740588065854 \ No newline at end of file +1741881522200 \ No newline at end of file diff --git a/api/src/unraid-api/unraid-file-modifier/modifications/__test__/snapshots/DefaultPageLayout.php.modified.snapshot.php b/api/src/unraid-api/unraid-file-modifier/modifications/__test__/snapshots/DefaultPageLayout.php.modified.snapshot.php index 717ede4c87..a299ab856a 100644 --- a/api/src/unraid-api/unraid-file-modifier/modifications/__test__/snapshots/DefaultPageLayout.php.modified.snapshot.php +++ b/api/src/unraid-api/unraid-file-modifier/modifications/__test__/snapshots/DefaultPageLayout.php.modified.snapshot.php @@ -667,7 +667,7 @@ function flashReport() { echo "
"; if (isset($myPage['Lock'])) { $title = $themes2 ? "" : _('Unlock sortable items'); - echo "
"._('Unlock sortable items')."
"; + echo "
"._('Unlock sortable items')."
"; } if ($display['usage']) my_usage(); From b9a271e7ef7a017357802a60135c1d843fa6afb1 Mon Sep 17 00:00:00 2001 From: Eli Bosley Date: Thu, 13 Mar 2025 12:27:51 -0400 Subject: [PATCH 4/4] chore: update type gen --- api/src/graphql/schema/types/config/config.graphql | 8 -------- web/composables/gql/graphql.ts | 3 ++- web/store/server.ts | 1 - 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/api/src/graphql/schema/types/config/config.graphql b/api/src/graphql/schema/types/config/config.graphql index 3ec01dc8d4..e5969dcecb 100644 --- a/api/src/graphql/schema/types/config/config.graphql +++ b/api/src/graphql/schema/types/config/config.graphql @@ -1,11 +1,3 @@ -enum ConfigErrorState { - UNKNOWN_ERROR - INELIGIBLE - INVALID - NO_KEY_SERVER - WITHDRAWN -} - type Config implements Node { id: ID! valid: Boolean diff --git a/web/composables/gql/graphql.ts b/web/composables/gql/graphql.ts index 9220dadf08..5e6f2aa5e1 100644 --- a/web/composables/gql/graphql.ts +++ b/web/composables/gql/graphql.ts @@ -1,4 +1,4 @@ - +/* eslint-disable */ import type { TypedDocumentNode as DocumentNode } from '@graphql-typed-document-node/core'; export type Maybe = T | null; export type InputMaybe = Maybe; @@ -372,6 +372,7 @@ export type Disk = { bytesPerSector: Scalars['Long']['output']; device: Scalars['String']['output']; firmwareRevision: Scalars['String']['output']; + id: Scalars['ID']['output']; interfaceType: DiskInterfaceType; name: Scalars['String']['output']; partitions?: Maybe>; diff --git a/web/store/server.ts b/web/store/server.ts index 8c3e472906..6b83317458 100644 --- a/web/store/server.ts +++ b/web/store/server.ts @@ -792,7 +792,6 @@ export const useServerStore = defineStore('server', () => { // ref: 'configError', // type: 'server', // }; - //@ts-expect-error - causing a build-breaking type error, but seems plausible, so i kept it around - pujitm case 'INELIGIBLE': return { heading: 'Ineligible for OS Version',