@syngrisi/syngrisi 2.2.2 → 2.2.6-alpha.0

package/src/types/Midleware.ts

@@ -0,0 +1,3 @@
+import { Request, Response, NextFunction } from 'express';
+
+export type Midleware = (req: Request, res: Response, next?: NextFunction) => Promise<void> ; 

package/src/types/RequestUser.ts

@@ -0,0 +1,14 @@
+import { Schema } from "mongoose";
+
+export interface RequestUser {
+  _id: Schema.Types.ObjectId
+  changePassword: (currentPassword: string, newPassword: string) => void;
+  apiKey: string;
+  username: string;
+  role?: string;
+  id?: string;
+  firstName?: string;
+  lastName?: string;
+  save: () => void;
+  setPassword: (newPassword: string) => void;
+}

package/src/types/index.ts

@@ -0,0 +1,4 @@
+export * from './ExtRequest';
+export * from './RequestUser';
+export * from './LogOpts';
+export * from './Midleware';

package/src/ui-app/README.md

@@ -1,4 +1,4 @@
-## REACT UI APP
+# React UI App
 
 This is the Vite based React app, to build asserts run from Syngrisi root folder:
 
@@ -6,7 +6,7 @@ This is the Vite based React app, to build asserts run from Syngrisi root folder
 
 Show `vite.config.ts` for configuration details
 
-## ENVIRONMENT VARIABLES
+## Environment variables
 
 `VITE_SYNGRISI_BASED_URL` - base url for test purposes, to send request from Vite dev server to local app
 

package/src/ui-app/auth/components/ChangePasswordForm.tsx

@@ -114,7 +114,7 @@ export default function ChangePasswordForm() {
             );
             const result: { message: string } = await resp.json();
             setLoader(false);
-
+            console.log(result);
             if (result.message === 'success') {
                 return window.location.assign('/auth/changeSuccess');
             }

package/src/ui-app/index2/components/Tests/Table/Checks/CheckDetails/Canvas/mainView.ts

@@ -410,8 +410,8 @@ export class MainView {
             log.error(`Cannot set baseline ignored regions , status: '${response.status}',  resp: '${text}'`);
             errorMsg({ error: 'Cannot set baseline ignored regions' });
             // MainView.showToaster('Cannot set baseline ignored regions', 'Error');
-        } catch (e) {
-            log.error(`Cannot set baseline ignored regions: ${e.stack  || e.toString()}`);
+        } catch (e: unknown) {
+            log.error(`Cannot set baseline ignored regions: ${errorMsg(e)}`);
             errorMsg({ error: 'Cannot set baseline ignored regions' });
             // MainView.showToaster('Cannot set baseline ignored regions', 'Error');
         }
@@ -480,7 +480,7 @@ export class MainView {
             // MainView.showToaster('Cannot get baseline ignored regions', 'Error');
             errorMsg({ error: 'Cannot get baseline ignored regions' });
         } catch (e) {
-            log.error(`Cannot get baseline ignored regions: ${e.stack  || e.toString()}`);
+            log.error(`Cannot get baseline ignored regions: ${errorMsg(e)}`);
             // MainView.showToaster('Cannot get baseline ignored regions', 'Error');
             errorMsg({ error: 'Cannot get baseline ignored regions' });
         }

package/src/ui-app/index2/components/Tests/Table/Checks/Checks.tsx

@@ -16,14 +16,15 @@ interface Props {
 export function Checks({ item, testUpdateQuery }: Props) {
     // eslint-disable-next-line no-unused-vars
     const [checksViewMode, setChecksViewMode] = useLocalStorage({ key: 'check-view-mode', defaultValue: 'bounded' });
+
     const checksQuery = useQuery(
         [
             'preview_checks',
             item._id,
         ],
-        () => GenericService.get_via_post(
+        () => GenericService.get(
             'checks',
-            { _id: { $in: item.checks.map((x: any) => x._id) } },
+            { test: item._id },
             {
                 populate: 'baselineId,actualSnapshotId,diffId',
                 limit: '0',
@@ -41,6 +42,33 @@ export function Checks({ item, testUpdateQuery }: Props) {
             },
         },
     );
+
+    // const checksQuery = useQuery(
+    //     [
+    //         'preview_checks',
+    //         item._id,
+    //     ],
+    //     () => GenericService.get_via_post(
+    //         'checks',
+    //         { _id: { $in: item.checks.map((x: any) => x._id) } },
+    //         {
+    //             populate: 'baselineId,actualSnapshotId,diffId',
+    //             limit: '0',
+    //             sortBy: 'CreatedDate',
+    //             sortOrder: -1,
+    //         },
+    //         'checksByIds',
+    //     ),
+    //     {
+    //         refetchOnWindowFocus: false,
+    //         onSuccess: () => {
+    //         },
+    //         onError: (e) => {
+    //             errorMsg({ error: e });
+    //         },
+    //     },
+    // );
+
     const ChecksContainer = (checksViewMode === 'list') ? Stack : Group;
 
     return (

package/src/ui-app/package-lock.json

@@ -28,7 +28,7 @@
                 "dayjs": "^1.11.5",
                 "fabric": "^5.2.4",
                 "jquery": "^3.6.1",
-                "ky": "^0.31.1",
+                "ky": "1.7.4",
                 "query-string": "^7.1.1",
                 "react": "^18.2.0",
                 "react-dom": "^18.2.0",
@@ -40,7 +40,7 @@
             },
             "devDependencies": {
                 "@types/node": "^18.7.14",
-                "@types/react": "^18.0.17",
+                "@types/react": "^18.3.3",
                 "@types/react-dom": "^18.0.6",
                 "@typescript-eslint/eslint-plugin": "^5.36.0",
                 "@typescript-eslint/parser": "^5.36.0",
@@ -1256,13 +1256,12 @@
             "devOptional": true
         },
         "node_modules/@types/react": {
-            "version": "18.0.21",
-            "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.21.tgz",
-            "integrity": "sha512-7QUCOxvFgnD5Jk8ZKlUAhVcRj7GuJRjnjjiY/IUBWKgOlnvDvTMLD4RTF7NPyVmbRhNrbomZiOepg7M/2Kj1mA==",
+            "version": "18.3.3",
+            "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.3.tgz",
+            "integrity": "sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw==",
             "devOptional": true,
             "dependencies": {
                 "@types/prop-types": "*",
-                "@types/scheduler": "*",
                 "csstype": "^3.0.2"
             }
         },
@@ -1275,12 +1274,6 @@
                 "@types/react": "*"
             }
         },
-        "node_modules/@types/scheduler": {
-            "version": "0.16.2",
-            "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
-            "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==",
-            "devOptional": true
-        },
         "node_modules/@typescript-eslint/eslint-plugin": {
             "version": "5.40.0",
             "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.40.0.tgz",
@@ -4336,11 +4329,12 @@
             }
         },
         "node_modules/ky": {
-            "version": "0.31.3",
-            "resolved": "https://registry.npmjs.org/ky/-/ky-0.31.3.tgz",
-            "integrity": "sha512-YDDQKG0Lt4PFSPZGJI8WKAm5y+1ebbeA306am+4nT7riX13wjNVD5sR/QOKtgsaQaARwrdUHlv0M9kJ1qv+Jug==",
+            "version": "1.7.4",
+            "resolved": "https://registry.npmjs.org/ky/-/ky-1.7.4.tgz",
+            "integrity": "sha512-zYEr/gh7uLW2l4su11bmQ2M9xLgQLjyvx58UyNM/6nuqyWFHPX5ktMjvpev3F8QWdjSsHUpnWew4PBCswBNuMQ==",
+            "license": "MIT",
             "engines": {
-                "node": ">=14.16"
+                "node": ">=18"
             },
             "funding": {
                 "url": "https://github.com/sindresorhus/ky?sponsor=1"

package/src/ui-app/package.json

@@ -28,7 +28,7 @@
         "dayjs": "^1.11.5",
         "fabric": "^5.2.4",
         "jquery": "^3.6.1",
-        "ky": "^0.31.1",
+        "ky": "1.7.4",
         "query-string": "^7.1.1",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
@@ -40,7 +40,7 @@
     },
     "devDependencies": {
         "@types/node": "^18.7.14",
-        "@types/react": "^18.0.17",
+        "@types/react": "^18.3.3",
         "@types/react-dom": "^18.0.6",
         "@typescript-eslint/eslint-plugin": "^5.36.0",
         "@typescript-eslint/parser": "^5.36.0",

package/src/ui-app/shared/services/checks.service.ts

@@ -6,7 +6,7 @@ export const ChecksService = {
     // eslint-disable-next-line consistent-return
     async acceptCheck({ check, newBaselineId }: { check: any, newBaselineId: string }) {
         try {
-            const resp = await ky(`${config.baseUri}/v1/checks/accept/${check._id}`, {
+            const resp = await ky(`${config.baseUri}/v1/checks/${check._id}/accept`, {
                 headers: { 'Content-Type': 'application/json' },
                 body: JSON.stringify({
                     baselineId: newBaselineId,

package/src/ui-app/shared/services/generic.service.ts

@@ -26,10 +26,6 @@ export const GenericService = {
     async get(resource: string, filter: any = {}, options: IRequestOptions = {}, queryID = ''): Promise<IApiResult> {
         const queryOptions = { ...options, limit: options.limit || 10 };
         const queryOptionsString = queryString.stringify(queryOptions);
-        // if (resource === 'checks') {
-        // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-        // await new Promise(resolve => setTimeout(resolve, 2000));
-        // }
         // eslint-disable-next-line max-len
         const uri = `${config.baseUri}/v1/${resource}?${queryOptionsString}&filter=${JSON.stringify(filter)}&queryID=${queryID}`;
         const resp = await ky(uri);
@@ -40,30 +36,6 @@ export const GenericService = {
         throw new Error(`cannot get resource: ${uri}, resp: '${JSON.stringify(resp)}'`);
     },
 
-    // eslint-disable-next-line consistent-return
-    async get_via_post(resource: string, filter: any = {}, options: IRequestOptions = {}, queryID = '') {
-        try {
-            const resp = await ky(`${config.baseUri}/v1/${resource}/get_via_post`, {
-                headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify({
-                    filter,
-                    options,
-                    queryID,
-                }),
-                method: 'POST',
-            });
-            if (resp.ok) {
-                return resp.json();
-            }
-        } catch (e) {
-            log.error(`cannot get (get_via_post) ${resource},`
-                + `\noptions: '${JSON.stringify(options)}', error: '${e.stack || e.toString()}'}`);
-
-            throw new Error(`cannot get (get_via_post) ${resource},`
-                + `\noptions: '${JSON.stringify(options)}', error: '${e}'}`);
-        }
-    },
-
     async create<ResType>(resource: string, data: ResType): Promise<ResType[]> {
         const url = `${config.baseUri}/v1/${resource}`;
         const resp = await ky.post(

package/src/ui-app/tsconfig.json

@@ -14,8 +14,9 @@
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,
-    "jsx": "react-jsx"
+    "jsx": "react-jsx",
+    "composite": true,
   },
   "include": ["src"],
-  "references": [{ "path": "./tsconfig.node.json" }]
+  // "references": [{ "path": "./tsconfig.node.json" }]
 }

package/config.js

@@ -1,17 +0,0 @@
-const fs = require('fs');
-require('dotenv')
-    .config();
-
-const bsPath = process.env.SYNGRISI_IMAGES_PATH || './.snapshots-images/';
-if (!fs.existsSync(bsPath)) {
-    fs.mkdirSync(bsPath, { recursive: true });
-}
-
-exports.config = {
-    defaultImagesPath: bsPath,
-    connectionString: process.env.SYNGRISI_DB_URI || process.env.VRS_CONN_STRING || 'mongodb://127.0.0.1:27017/SyngrisiDb',
-    port: process.env.SYNGRISI_APP_PORT || 3000,
-    backupsFolder: './backups',
-    enableHttpLogger: process.env.SYNGRISI_HTTP_LOG,
-    httpLoggerFilePath:  './logs/http.log'
-};

package/dist/config.js

@@ -1,16 +0,0 @@
-"use strict";
-const fs = require('fs');
-require('dotenv')
-    .config();
-const bsPath = process.env.SYNGRISI_IMAGES_PATH || './.snapshots-images/';
-if (!fs.existsSync(bsPath)) {
-    fs.mkdirSync(bsPath, { recursive: true });
-}
-exports.config = {
-    defaultImagesPath: bsPath,
-    connectionString: process.env.SYNGRISI_DB_URI || process.env.VRS_CONN_STRING || 'mongodb://127.0.0.1:27017/SyngrisiDb',
-    port: process.env.SYNGRISI_APP_PORT || 3000,
-    backupsFolder: './backups',
-    enableHttpLogger: process.env.SYNGRISI_HTTP_LOG,
-    httpLoggerFilePath: './logs/http.log'
-};