Merge pull request #962 from joshunrau/dev

joshunrau · web-flow · commit 9c2b951aa9be · 2024-10-01T21:57:58.000-04:00
diff --git a/.github/scripts/lib.js b/.github/scripts/lib.js
@@ -38,6 +38,7 @@ export async function getLatestPublishedVersion({ github }) {
       );
     }
   }
+  // eslint-disable-next-line no-console
   console.log(`Found latest published version: ${packageVersion}`);
   return packageVersion;
 }
diff --git a/apps/api/package.json b/apps/api/package.json
@@ -19,10 +19,10 @@
   "dependencies": {
     "@casl/ability": "catalog:",
     "@casl/prisma": "catalog:",
-    "@douglasneuroinformatics/libcrypto": "^0.0.2",
+    "@douglasneuroinformatics/libcrypto": "catalog:",
     "@douglasneuroinformatics/libjs": "catalog:",
-    "@douglasneuroinformatics/libnest": "^0.1.1",
-    "@douglasneuroinformatics/libpasswd": "^0.0.3",
+    "@douglasneuroinformatics/libnest": "catalog:",
+    "@douglasneuroinformatics/libpasswd": "catalog:",
     "@douglasneuroinformatics/libstats": "catalog:",
     "@faker-js/faker": "^9.0.0",
     "@nestjs/axios": "^3.0.3",
@@ -56,7 +56,7 @@
     "zod": "workspace:zod__3.23.x@*"
   },
   "devDependencies": {
-    "@douglasneuroinformatics/esbuild-plugin-prisma": "^1.0.0",
+    "@douglasneuroinformatics/esbuild-plugin-prisma": "catalog:",
     "@nestjs/testing": "^10.4.1",
     "@opendatacapture/instrument-stubs": "workspace:*",
     "@types/express": "^4.17.21",
diff --git a/apps/api/scripts/build.ts b/apps/api/scripts/build.ts
@@ -1,5 +1,7 @@
 #!/usr/bin/env tsx
 
+/* eslint-disable no-console */
+
 import fs from 'fs/promises';
 import module from 'module';
 import path from 'path';
@@ -28,7 +30,7 @@ const options: { external: NonNullable<unknown>; plugins: NonNullable<unknown> }
   },
   bundle: true,
   define: {
-    __RELEASE_INFO__: JSON.stringify(await getReleaseInfo())
+    __RELEASE__: JSON.stringify(await getReleaseInfo())
   },
   entryPoints: [entryFile],
   external: ['@nestjs/microservices', '@nestjs/websockets/socket-module', 'class-transformer', 'class-validator'],
diff --git a/apps/api/src/main.ts b/apps/api/src/main.ts
@@ -18,10 +18,12 @@ async function bootstrap() {
   const configurationService = app.get(ConfigurationService);
   const logLevels: LogLevel[] = ['error', 'fatal', 'log', 'warn'];
   if (configurationService.get('DEBUG')) {
+    // eslint-disable-next-line no-console
     console.log("Enabled 'debug' logs");
     logLevels.push('debug');
   }
   if (configurationService.get('VERBOSE')) {
+    // eslint-disable-next-line no-console
     console.log("Enabled 'verbose' logs");
     logLevels.push('verbose');
   }
@@ -43,6 +45,7 @@ async function bootstrap() {
 
   await app.listen(port);
 
+  // eslint-disable-next-line no-console
   console.log(`Application is running on: ${await app.getUrl()}`);
 }
 
diff --git a/apps/api/src/setup/setup.service.ts b/apps/api/src/setup/setup.service.ts
@@ -29,7 +29,7 @@ export class SetupService {
       isDemo: Boolean(savedOptions?.isDemo),
       isGatewayEnabled: this.configurationService.get('GATEWAY_ENABLED'),
       isSetup: Boolean(savedOptions?.isSetup),
-      releaseInfo: __RELEASE_INFO__,
+      release: __RELEASE__,
       uptime: Math.round(process.uptime())
     } satisfies SetupState;
   }
diff --git a/apps/api/src/typings/global.d.ts b/apps/api/src/typings/global.d.ts
@@ -1,5 +1,5 @@
 import type { ReleaseInfo } from '@opendatacapture/schemas/setup';
 
 declare global {
-  const __RELEASE_INFO__: ReleaseInfo;
+  const __RELEASE__: ReleaseInfo;
 }
diff --git a/apps/gateway/package.json b/apps/gateway/package.json
@@ -16,7 +16,7 @@
     "lint": "tsc && eslint --fix src"
   },
   "dependencies": {
-    "@douglasneuroinformatics/libcrypto": "^0.0.2",
+    "@douglasneuroinformatics/libcrypto": "catalog:",
     "@douglasneuroinformatics/libui": "catalog:",
     "@opendatacapture/instrument-renderer": "workspace:*",
     "@opendatacapture/react-core": "workspace:*",
@@ -37,7 +37,7 @@
     "zod": "workspace:zod__3.23.x@*"
   },
   "devDependencies": {
-    "@douglasneuroinformatics/esbuild-plugin-prisma": "^1.0.0",
+    "@douglasneuroinformatics/esbuild-plugin-prisma": "catalog:",
     "@opendatacapture/release-info": "workspace:*",
     "@opendatacapture/vite-plugin-runtime": "workspace:*",
     "@types/compression": "^1.7.5",
diff --git a/apps/gateway/scripts/build.ts b/apps/gateway/scripts/build.ts
@@ -16,9 +16,9 @@ await esbuild.build({
   },
   bundle: true,
   define: {
+    __RELEASE__: JSON.stringify(await getReleaseInfo()),
     'import.meta.env.DEV': 'false',
-    'import.meta.env.PROD': 'true',
-    'import.meta.env.RELEASE_INFO': JSON.stringify(await getReleaseInfo())
+    'import.meta.env.PROD': 'true'
   },
   entryPoints: [entryFile],
   external: ['lightningcss'],
@@ -35,4 +35,5 @@ await esbuild.build({
   tsconfig
 });
 
+// eslint-disable-next-line no-console
 console.log('Done!');
diff --git a/apps/gateway/scripts/dev.ts b/apps/gateway/scripts/dev.ts
@@ -1,5 +1,7 @@
 #!/usr/bin/env tsx
 
+/* eslint-disable no-console */
+
 import fs from 'fs';
 import module from 'module';
 import path from 'path';
@@ -19,7 +21,7 @@ if (fs.existsSync(outdir)) {
 
 await fs.promises.mkdir(outdir);
 
-const releaseInfo = await getReleaseInfo();
+const release = await getReleaseInfo();
 
 await new Promise<BuildResult>((resolve, reject) => {
   esbuild
@@ -29,9 +31,9 @@ await new Promise<BuildResult>((resolve, reject) => {
       },
       bundle: true,
       define: {
+        __RELEASE__: JSON.stringify(release),
         'import.meta.env.DEV': 'true',
-        'import.meta.env.PROD': 'false',
-        'import.meta.env.RELEASE_INFO': JSON.stringify(releaseInfo)
+        'import.meta.env.PROD': 'false'
       },
       entryPoints: [
         path.resolve(import.meta.dirname, '../src/main.ts'),
diff --git a/apps/gateway/src/routers/api.router.ts b/apps/gateway/src/routers/api.router.ts
@@ -118,7 +118,7 @@ router.delete(
 router.get('/healthcheck', (_, res) => {
   res.status(200).json({
     ok: true,
-    releaseInfo: import.meta.env.RELEASE_INFO,
+    release: __RELEASE__,
     status: 200,
     uptime: Math.round(process.uptime())
   } satisfies GatewayHealthcheckSuccessResult);
diff --git a/apps/gateway/src/server/server.base.ts b/apps/gateway/src/server/server.base.ts
@@ -75,6 +75,7 @@ export abstract class BaseServer {
 
   listen(port = config.port) {
     return this.app.listen(port, () => {
+      // eslint-disable-next-line no-console
       console.log(`Server started at http://localhost:${port}`);
     });
   }
diff --git a/apps/gateway/src/vite-env.d.ts b/apps/gateway/src/vite-env.d.ts
@@ -16,11 +16,9 @@ declare global {
     __ROOT_PROPS__: RootProps;
   }
 
-  interface ImportMetaEnv {
-    RELEASE_INFO: ReleaseInfo;
-  }
-
   interface ImportMeta {
     readonly env: ImportMetaEnv;
   }
+
+  const __RELEASE__: ReleaseInfo;
 }
diff --git a/apps/playground/package.json b/apps/playground/package.json
@@ -13,7 +13,7 @@
     "storybook": "env-cmd -f ../../.env storybook dev -p 6006"
   },
   "dependencies": {
-    "@douglasneuroinformatics/libcrypto": "^0.0.2",
+    "@douglasneuroinformatics/libcrypto": "catalog:",
     "@douglasneuroinformatics/libjs": "catalog:",
     "@douglasneuroinformatics/libui": "catalog:",
     "@monaco-editor/react": "^4.6.0",
diff --git a/apps/playground/vite.config.ts b/apps/playground/vite.config.ts
@@ -10,6 +10,7 @@ export default defineConfig(({ mode }) => ({
   build: {
     chunkSizeWarningLimit: 1000,
     emptyOutDir: false,
+    sourcemap: true,
     target: 'es2022'
   },
   css: {
diff --git a/apps/web/package.json b/apps/web/package.json
@@ -18,7 +18,7 @@
   "dependencies": {
     "@casl/ability": "catalog:",
     "@douglasneuroinformatics/libjs": "catalog:",
-    "@douglasneuroinformatics/libpasswd": "^0.0.3",
+    "@douglasneuroinformatics/libpasswd": "catalog:",
     "@douglasneuroinformatics/libui": "catalog:",
     "@heroicons/react": "^2.1.5",
     "@import-meta-env/cli": "^0.7.0",
diff --git a/apps/web/src/features/about/components/InfoBlock.tsx b/apps/web/src/features/about/components/InfoBlock.tsx
@@ -1,12 +1,21 @@
-export const InfoBlock: React.FC<{ items: { [key: string]: string }; label: string }> = ({ items, label }) => {
+import { TimeValue } from './TimeValue';
+
+export type InfoBlockProps = {
+  items: {
+    [key: string]: string;
+  };
+  label: string;
+};
+
+export const InfoBlock = ({ items, label }: InfoBlockProps) => {
   return (
     <div>
       <h5 className="mb-1 font-semibold">{label}</h5>
       <ul className="text-muted-foreground grid gap-0.5">
         {Object.entries(items).map(([key, value]) => (
           <li key={key}>
             <span>{key}: </span>
-            <span>{value}</span>
+            {value.startsWith('Uptime=') ? <TimeValue value={parseInt(value.slice(7))} /> : <span>{value}</span>}
           </li>
         ))}
       </ul>
diff --git a/apps/web/src/features/about/components/TimeValue.tsx b/apps/web/src/features/about/components/TimeValue.tsx
@@ -0,0 +1,26 @@
+import { useCallback, useRef, useState } from 'react';
+
+import { parseDuration } from '@douglasneuroinformatics/libjs';
+import { useInterval } from '@douglasneuroinformatics/libui/hooks';
+
+export type TimeValueProps = {
+  value: number;
+};
+
+export const TimeValue = ({ value }: TimeValueProps) => {
+  const format = useCallback((uptime: number) => {
+    let { days, hours, minutes, seconds } = parseDuration(uptime * 1000);
+    hours += days * 24;
+    return [hours, minutes, seconds].map((value) => (value < 10 ? '0' + value : value)).join(':');
+  }, []);
+  const valueRef = useRef<number>(value);
+
+  const [state, setState] = useState(format(value));
+
+  useInterval(() => {
+    valueRef.current = valueRef.current + 1;
+    setState(format(valueRef.current + 1));
+  }, 1000);
+
+  return <span>{state}</span>;
+};
diff --git a/apps/web/src/features/about/pages/AboutPage.tsx b/apps/web/src/features/about/pages/AboutPage.tsx
@@ -63,14 +63,14 @@ export const AboutPage = () => {
 
   const { isGatewayEnabled } = setupStateQuery.data;
 
-  const translateReleaseInfo = (releaseInfo: ReleaseInfo) => {
+  const translateReleaseInfo = (release: ReleaseInfo) => {
     const translatedReleaseInfo = {
-      [t(translations.buildType)]: t(translations.buildTypes[releaseInfo.type]),
-      [t(translations.version)]: releaseInfo.version
+      [t(translations.buildType)]: t(translations.buildTypes[release.type]),
+      [t(translations.version)]: release.version
     };
-    if (releaseInfo.type !== 'production') {
-      translatedReleaseInfo[t(translations.branch)] = releaseInfo.branch;
-      translatedReleaseInfo.Commit = releaseInfo.commit;
+    if (release.type !== 'production') {
+      translatedReleaseInfo[t(translations.branch)] = release.branch;
+      translatedReleaseInfo.Commit = release.commit;
     }
     return translatedReleaseInfo;
   };
@@ -84,8 +84,8 @@ export const AboutPage = () => {
     const gatewayHealthData = gatewayHealthcheckQuery.data!;
     gatewayInfo[t(translations.status)] = gatewayHealthData.status.toString();
     if (gatewayHealthData.ok) {
-      Object.assign(gatewayInfo, translateReleaseInfo(gatewayHealthData.releaseInfo), {
-        [t(translations.uptime)]: gatewayHealthData.uptime
+      Object.assign(gatewayInfo, translateReleaseInfo(gatewayHealthData.release), {
+        [t(translations.uptime)]: `Uptime=${gatewayHealthData.uptime}`
       });
     }
     return gatewayInfo;
@@ -116,14 +116,11 @@ export const AboutPage = () => {
           </Card.Description>
         </Card.Header>
         <Card.Content className="flex flex-col gap-6 p-6 text-sm">
-          <InfoBlock
-            items={translateReleaseInfo(window.__RELEASE_INFO__)}
-            label={t({ en: 'Web Client', fr: 'Client Web' })}
-          />
+          <InfoBlock items={translateReleaseInfo(__RELEASE__)} label={t({ en: 'Web Client', fr: 'Client Web' })} />
           <InfoBlock
             items={{
-              ...translateReleaseInfo(setupStateQuery.data.releaseInfo),
-              [t(translations.uptime)]: setupStateQuery.data.uptime.toString()
+              ...translateReleaseInfo(setupStateQuery.data.release),
+              [t(translations.uptime)]: `Uptime=${setupStateQuery.data.uptime}`
             }}
             label={t({
               en: 'Core API',
diff --git a/apps/web/src/providers/WalkthroughProvider.tsx b/apps/web/src/providers/WalkthroughProvider.tsx
@@ -50,8 +50,6 @@ type WalkthroughStep = {
 };
 
 const Walkthrough = () => {
-  const isDisclaimerAccepted = useAppStore((store) => store.isDisclaimerAccepted);
-  const isWalkthroughComplete = useAppStore((store) => store.isWalkthroughComplete);
   const setIsWalkthroughComplete = useAppStore((store) => store.setIsWalkthroughComplete);
   const startSession = useAppStore((store) => store.startSession);
   const endSession = useAppStore((store) => store.endSession);
@@ -331,12 +329,6 @@ const Walkthrough = () => {
     setIsWalkthroughOpen(false);
   };
 
-  useEffect(() => {
-    if (isDisclaimerAccepted && !isWalkthroughComplete) {
-      setIsWalkthroughOpen(true);
-    }
-  }, [isDisclaimerAccepted, isWalkthroughComplete]);
-
   useLayoutEffect(() => {
     if (window.location.pathname !== currentStep.url) {
       navigate(currentStep.url, currentStep.navigateOptions);
@@ -430,11 +422,22 @@ const Walkthrough = () => {
 };
 
 export const WalkthroughProvider: React.FC<{ children: React.ReactElement }> = ({ children }) => {
+  const isDisclaimerAccepted = useAppStore((store) => store.isDisclaimerAccepted);
   const isWalkthroughOpen = useAppStore((store) => store.isWalkthroughOpen);
+  const isWalkthroughComplete = useAppStore((store) => store.isWalkthroughComplete);
+  const setIsWalkthroughOpen = useAppStore((store) => store.setIsWalkthroughOpen);
   const isDesktop = useIsDesktop();
+
+  useEffect(() => {
+    if (isDisclaimerAccepted && !isWalkthroughComplete) {
+      setIsWalkthroughOpen(true);
+    }
+  }, [isDisclaimerAccepted, isWalkthroughComplete]);
+
   if (!isDesktop) {
     return children;
   }
+
   return (
     <React.Fragment>
       {children}
diff --git a/apps/web/src/vite-env.d.ts b/apps/web/src/vite-env.d.ts
@@ -26,6 +26,4 @@ interface ImportMeta {
   readonly env: ImportMetaEnv;
 }
 
-interface Window {
-  __RELEASE_INFO__: import('@opendatacapture/schemas/setup').ReleaseInfo;
-}
+declare const __RELEASE__: import('@opendatacapture/schemas/setup').ReleaseInfo;
diff --git a/apps/web/vite.config.ts b/apps/web/vite.config.ts
@@ -13,6 +13,7 @@ export default defineConfig({
   build: {
     chunkSizeWarningLimit: 1000,
     emptyOutDir: false,
+    sourcemap: true,
     target: 'es2022'
   },
   css: {
@@ -21,7 +22,7 @@ export default defineConfig({
     }
   },
   define: {
-    __RELEASE_INFO__: JSON.stringify(await getReleaseInfo())
+    __RELEASE__: JSON.stringify(await getReleaseInfo())
   },
   optimizeDeps: {
     esbuildOptions: {
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "opendatacapture",
   "type": "module",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "private": true,
   "packageManager": "pnpm@9.11.0",
   "license": "Apache-2.0",
@@ -35,9 +35,9 @@
     "@commitlint/cli": "^19.4.1",
     "@commitlint/config-conventional": "^19.4.1",
     "@commitlint/types": "^19.0.3",
-    "@douglasneuroinformatics/eslint-config": "^5.1.8",
-    "@douglasneuroinformatics/prettier-config": "^0.0.1",
-    "@douglasneuroinformatics/tsconfig": "^1.0.2",
+    "@douglasneuroinformatics/eslint-config": "catalog:",
+    "@douglasneuroinformatics/prettier-config": "catalog:",
+    "@douglasneuroinformatics/tsconfig": "catalog:",
     "@storybook/addon-essentials": "^8.2.9",
     "@storybook/addon-interactions": "^8.2.9",
     "@storybook/addon-links": "^8.2.9",
diff --git a/packages/instrument-bundler/src/cli.ts b/packages/instrument-bundler/src/cli.ts
diff --git a/packages/instrument-library/scripts/available.ts b/packages/instrument-library/scripts/available.ts
diff --git a/packages/runtime-bundler/src/bundler.ts b/packages/runtime-bundler/src/bundler.ts
diff --git a/packages/runtime-bundler/src/cli.ts b/packages/runtime-bundler/src/cli.ts
diff --git a/packages/schemas/src/gateway/gateway.ts b/packages/schemas/src/gateway/gateway.ts
diff --git a/packages/schemas/src/setup/setup.ts b/packages/schemas/src/setup/setup.ts
diff --git a/packages/subject-utils/package.json b/packages/subject-utils/package.json
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
diff --git a/testing/cypress/src/support/commands.ts b/testing/cypress/src/support/commands.ts

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ export async function getLatestPublishedVersion({ github }) {`
`38`	`38`	`);`
`39`	`39`	`}`
`40`	`40`	`}`
	`41`	`+ // eslint-disable-next-line no-console`
`41`	`42`	console.log(`Found latest published version: ${packageVersion}`);
`42`	`43`	`return packageVersion;`
`43`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,12 @@ async function bootstrap() {`
`18`	`18`	`const configurationService = app.get(ConfigurationService);`
`19`	`19`	`const logLevels: LogLevel[] = ['error', 'fatal', 'log', 'warn'];`
`20`	`20`	`if (configurationService.get('DEBUG')) {`
	`21`	`+ // eslint-disable-next-line no-console`
`21`	`22`	`console.log("Enabled 'debug' logs");`
`22`	`23`	`logLevels.push('debug');`
`23`	`24`	`}`
`24`	`25`	`if (configurationService.get('VERBOSE')) {`
	`26`	`+ // eslint-disable-next-line no-console`
`25`	`27`	`console.log("Enabled 'verbose' logs");`
`26`	`28`	`logLevels.push('verbose');`
`27`	`29`	`}`
`@@ -43,6 +45,7 @@ async function bootstrap() {`
`43`	`45`
`44`	`46`	`await app.listen(port);`
`45`	`47`
	`48`	`+ // eslint-disable-next-line no-console`
`46`	`49`	console.log(`Application is running on: ${await app.getUrl()}`);
`47`	`50`	`}`
`48`	`51`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ export class SetupService {`
`29`	`29`	`isDemo: Boolean(savedOptions?.isDemo),`
`30`	`30`	`isGatewayEnabled: this.configurationService.get('GATEWAY_ENABLED'),`
`31`	`31`	`isSetup: Boolean(savedOptions?.isSetup),`
`32`		`- releaseInfo: __RELEASE_INFO__,`
	`32`	`+ release: __RELEASE__,`
`33`	`33`	`uptime: Math.round(process.uptime())`
`34`	`34`	`} satisfies SetupState;`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`import type { ReleaseInfo } from '@opendatacapture/schemas/setup';`
`2`	`2`
`3`	`3`	`declare global {`
`4`		`- const __RELEASE_INFO__: ReleaseInfo;`
	`4`	`+ const __RELEASE__: ReleaseInfo;`
`5`	`5`	`}`