feat: remove unused fields

elibosley · elibosley · commit d2d0f7cd9acb · 2025-01-27T13:34:32.000-05:00
diff --git a/api/src/store/modules/config.ts b/api/src/store/modules/config.ts
@@ -270,7 +270,7 @@ export const config = createSlice({
         });
 
         builder.addCase(setGraphqlConnectionStatus, (state, action) => {
-                state.connectionStatus.minigraph = action.payload.status;
+            state.connectionStatus.minigraph = action.payload.status;
         });
 
         builder.addCase(setupRemoteAccessThunk.fulfilled, (state, action) => {
diff --git a/api/src/unraid-api/cli/cli.module.ts b/api/src/unraid-api/cli/cli.module.ts
@@ -11,6 +11,7 @@ import { VersionCommand } from '@app/unraid-api/cli/version.command';
 import { StatusCommand } from '@app/unraid-api/cli/status.command';
 import { ValidateTokenCommand } from '@app/unraid-api/cli/validate-token.command';
 import { LogsCommand } from '@app/unraid-api/cli/logs.command';
+import { ConfigCommand } from '@app/unraid-api/cli/config.command';
 
 @Module({
     providers: [
@@ -24,7 +25,8 @@ import { LogsCommand } from '@app/unraid-api/cli/logs.command';
         VersionCommand,
         StatusCommand,
         ValidateTokenCommand,
-        LogsCommand
+        LogsCommand,
+        ConfigCommand
     ],
 })
 export class CliModule {}
diff --git a/api/src/unraid-api/cli/config.command.ts b/api/src/unraid-api/cli/config.command.ts
@@ -0,0 +1,25 @@
+import { Injectable } from '@nestjs/common';
+import { readFile } from 'fs/promises';
+
+import { Command, CommandRunner } from 'nest-commander';
+
+import { getters } from '@app/store/index';
+import { LogService } from '@app/unraid-api/cli/log.service';
+
+@Injectable()
+@Command({
+    name: 'config',
+    description: 'Display current configuration values',
+})
+export class ConfigCommand extends CommandRunner {
+    constructor(private readonly logger: LogService) {
+        super();
+    }
+
+    async run(): Promise<void> {
+        this.logger.log('\nDisk Configuration:');
+        const diskConfig = await readFile(getters.paths()['myservers-config'], 'utf8');
+        this.logger.log(diskConfig);
+        process.exit(0);
+    }
+}
diff --git a/api/src/unraid-api/cli/restart.command.ts b/api/src/unraid-api/cli/restart.command.ts
@@ -14,7 +14,7 @@ export class RestartCommand extends CommandRunner {
     }
 
     async run(_): Promise<void> {
-        const { stderr, stdout } = await execa(PM2_PATH, ['restart', ECOSYSTEM_PATH]);
+        const { stderr, stdout } = await execa(PM2_PATH, ['restart', ECOSYSTEM_PATH, '--update-env']);
         if (stderr) {
             this.logger.error(stderr);
             process.exit(1);
diff --git a/api/src/unraid-api/cli/validate-token.command.ts b/api/src/unraid-api/cli/validate-token.command.ts
@@ -79,6 +79,7 @@ export class ValidateTokenCommand extends CommandRunner {
         const possibleUserIds = configFile.remote.ssoSubIds.split(',');
         if (possibleUserIds.includes(username)) {
             this.logger.info(JSON.stringify({ error: null, valid: true, username }));
+            process.exit(0);
         } else {
             this.createErrorAndExit('Username on token does not match');
         }

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ export class RestartCommand extends CommandRunner {`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`async run(_): Promise<void> {`
`17`		`- const { stderr, stdout } = await execa(PM2_PATH, ['restart', ECOSYSTEM_PATH]);`
	`17`	`+ const { stderr, stdout } = await execa(PM2_PATH, ['restart', ECOSYSTEM_PATH, '--update-env']);`
`18`	`18`	`if (stderr) {`
`19`	`19`	`this.logger.error(stderr);`
`20`	`20`	`process.exit(1);`
Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,7 @@ export class ValidateTokenCommand extends CommandRunner {`
`79`	`79`	`const possibleUserIds = configFile.remote.ssoSubIds.split(',');`
`80`	`80`	`if (possibleUserIds.includes(username)) {`
`81`	`81`	`this.logger.info(JSON.stringify({ error: null, valid: true, username }));`
	`82`	`+ process.exit(0);`
`82`	`83`	`} else {`
`83`	`84`	`this.createErrorAndExit('Username on token does not match');`
`84`	`85`	`}`