mirror/api
1
0
Fork 0
mirror of https://github.com/unraid/api.git synced 2026-01-06 16:49:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: add serverName / description to dashboard payload

Browse Source
This commit is contained in:
Eli Bosley
2023-11-13 09:01:05 -05:00
parent eaddb696d4
commit 8dd99b7f32
7 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/dev/Unraid.net/myservers.cfg
View File

@@ -1,5 +1,5 @@
[api]
version="3.1.1+8efc0992"
version="3.2.3+28b0cd7b"
[local]
[notifier]
apikey="unnotify_30994bfaccf839c65bae75f7fa12dd5ee16e69389f754c3b98ed7d5"

6
api/dev/states/myservers.cfg
View File

@@ -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"

2
api/package.json
View File

@@ -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",

2
api/src/common/dashboard/generate-data.ts
View File

@@ -74,6 +74,8 @@ const getData = async (): Promise<DashboardInput> => {
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,

8
api/src/graphql/generated/client/graphql.ts
View File

@@ -271,12 +271,18 @@ export type DashboardVars = {
flashGuid?: Maybe<Scalars['String']['output']>;
regState?: Maybe<Scalars['String']['output']>;
regTy?: Maybe<Scalars['String']['output']>;
serverDescription?: Maybe<Scalars['String']['output']>;
serverName?: Maybe<Scalars['String']['output']>;
};
export type DashboardVarsInput = {
flashGuid: Scalars['String']['input'];
regState: Scalars['String']['input'];
regTy: Scalars['String']['input'];
/** Server description */
serverDescription?: InputMaybe<Scalars['String']['input']>;
/** Name of the server */
serverName?: InputMaybe<Scalars['String']['input']>;
};
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<Scalars['String']['output']>;
licenseKey: Scalars['String']['output'];
name: Scalars['String']['output'];
plgVersion?: Maybe<Scalars['String']['output']>;

4
api/src/graphql/generated/client/validators.ts
View File

@@ -157,7 +157,9 @@ export function DashboardVarsInputSchema(): z.ZodObject<Properties<DashboardVars
return z.object({
flashGuid: z.string(),
regState: z.string(),
regTy: z.string()
regTy: z.string(),
serverDescription: z.string().nullish(),
serverName: z.string().nullish()
})
}

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

@@ -2,10 +2,10 @@ import {
type IniStringBoolean,
type IniStringBooleanOrAuto,
} from '@app/core/types/ini';
import { type FsType } from '@app/core/types/states/var';
import { toNumber } from '@app/core/utils';
import {
ArrayState,
type DiskFsType,
RegistrationState,
registrationType,
} from '@app/graphql/generated/api/types';
@@ -29,7 +29,7 @@ export type VarIni = {
configState: string;
csrfToken: string;
defaultFormat: string;
defaultFsType: FsType;
defaultFsType: DiskFsType;
deviceCount: string;
domain: string;
domainLogin: string;