diff --git a/api/dev/Unraid.net/myservers.cfg b/api/dev/Unraid.net/myservers.cfg index 8dd9a1747..f293a6aaf 100644 --- a/api/dev/Unraid.net/myservers.cfg +++ b/api/dev/Unraid.net/myservers.cfg @@ -1,5 +1,5 @@ [api] -version="3.1.1+8efc0992" +version="3.2.3+28b0cd7b" [local] [notifier] apikey="unnotify_30994bfaccf839c65bae75f7fa12dd5ee16e69389f754c3b98ed7d5" diff --git a/api/dev/states/myservers.cfg b/api/dev/states/myservers.cfg index 5800457d5..0cf8088e2 100644 --- a/api/dev/states/myservers.cfg +++ b/api/dev/states/myservers.cfg @@ -1,5 +1,5 @@ [api] -version="3.1.1+8efc0992" +version="3.2.3+28b0cd7b" [local] [notifier] apikey="unnotify_30994bfaccf839c65bae75f7fa12dd5ee16e69389f754c3b98ed7d5" @@ -15,8 +15,8 @@ regWizTime="1611175408732_0951-1653-3509-FBA155FA23C0" idtoken="" accesstoken="" refreshtoken="" -allowedOrigins="/var/run/unraid-notifications.sock, /var/run/unraid-php.sock, /var/run/unraid-cli.sock, http://localhost:8080, https://localhost:4443, https://tower.local:4443, https://192.168.1.150:4443, https://tower:4443, https://192-168-1-150.thisisfourtyrandomcharacters012345678900.myunraid.net:4443, https://85-121-123-122.thisisfourtyrandomcharacters012345678900.myunraid.net:8443, https://10-252-0-1.hash.myunraid.net:4443, https://10-252-1-1.hash.myunraid.net:4443, https://10-253-3-1.hash.myunraid.net:4443, https://10-253-4-1.hash.myunraid.net:4443, https://10-253-5-1.hash.myunraid.net:4443, https://connect.myunraid.net, https://staging.connect.myunraid.net, https://dev-my.myunraid.net:4000, https://studio.apollographql.com" +allowedOrigins="" [upc] apikey="unupc_fab6ff6ffe51040595c6d9ffb63a353ba16cc2ad7d93f813a2e80a5810" [connectionStatus] -minigraph="PRE_INIT" +minigraph="ERROR_RETRYING" diff --git a/api/package.json b/api/package.json index 98fa6477f..a90e61190 100644 --- a/api/package.json +++ b/api/package.json @@ -30,7 +30,7 @@ "build-pkg": "./scripts/build.mjs", "codegen": "MOTHERSHIP_GRAPHQL_LINK='https://staging.mothership.unraid.net/ws' graphql-codegen --config codegen.yml -r dotenv/config './.env.staging'", "codegen:watch": "DOTENV_CONFIG_PATH='./.env.staging' graphql-codegen-esm --config codegen.yml --watch -r dotenv/config", - "codegen:local": "MOTHERSHIP_GRAPHQL_LINK='http://localhost:3000/graphql' graphql-codegen-esm --config codegen.yml --watch", + "codegen:local": "NODE_TLS_REJECT_UNAUTHORIZED=0 MOTHERSHIP_GRAPHQL_LINK='https://mothership.localhost/ws' graphql-codegen-esm --config codegen.yml --watch", "tsc": "tsc --noEmit", "lint": "DEBUG=eslint:cli-engine eslint . --config .eslintrc.cjs", "lint:fix": "DEBUG=eslint:cli-engine eslint . --fix --config .eslintrc.cjs", diff --git a/api/src/common/dashboard/generate-data.ts b/api/src/common/dashboard/generate-data.ts index 87a75d838..20f6a64e6 100644 --- a/api/src/common/dashboard/generate-data.ts +++ b/api/src/common/dashboard/generate-data.ts @@ -74,6 +74,8 @@ const getData = async (): Promise => { regState: emhttp.var.regState, regTy: emhttp.var.regTy, flashGuid: emhttp.var.flashGuid, + serverName: emhttp.var.name, + serverDescription: emhttp.var.comment, }, apps: { installed: docker.installed ?? 0, diff --git a/api/src/graphql/generated/client/graphql.ts b/api/src/graphql/generated/client/graphql.ts index a1fe53515..02319f54b 100644 --- a/api/src/graphql/generated/client/graphql.ts +++ b/api/src/graphql/generated/client/graphql.ts @@ -271,12 +271,18 @@ export type DashboardVars = { flashGuid?: Maybe; regState?: Maybe; regTy?: Maybe; + serverDescription?: Maybe; + serverName?: Maybe; }; export type DashboardVarsInput = { flashGuid: Scalars['String']['input']; regState: Scalars['String']['input']; regTy: Scalars['String']['input']; + /** Server description */ + serverDescription?: InputMaybe; + /** Name of the server */ + serverName?: InputMaybe; }; export type DashboardVersions = { @@ -347,7 +353,7 @@ export type KsServerDetails = { flashVendor: Scalars['String']['output']; guid: Scalars['String']['output']; ipsId: Scalars['String']['output']; - keyType: KeyType; + keyType?: Maybe; licenseKey: Scalars['String']['output']; name: Scalars['String']['output']; plgVersion?: Maybe; diff --git a/api/src/graphql/generated/client/validators.ts b/api/src/graphql/generated/client/validators.ts index abec3b8d8..ee1c69839 100644 --- a/api/src/graphql/generated/client/validators.ts +++ b/api/src/graphql/generated/client/validators.ts @@ -157,7 +157,9 @@ export function DashboardVarsInputSchema(): z.ZodObject