Khairul syazwan/analyze 1632

functions/mri-pa-config/src/main.ts

@@ -8,7 +8,10 @@ import {
   Connection,
   getUser,
   utils,
+  QueryObject as qo,
 } from "@alp/alp-base-utils";
+
+const QueryObject = qo.QueryObject;
 import * as xsenv from "@sap/xsenv";
 import express from "express";
 import { MRIConfig } from "./config/config";
@@ -187,6 +190,137 @@ function initRoutes() {
     res.json(configDefaultValues)
   });
 
+  // Wizards config endpoints
+  const WIZARDS_CONFIG_ID = "wizards-config";
+  const WIZARDS_CONFIG_VERSION = "1";
+  const WIZARDS_CONFIG_TYPE = "WIZARDS";
+
+  app.get("/pa-config-svc/wizards/config", (req: IRequest, res) => {
+    const { db } = req.dbConnections;
+
+    const query = QueryObject.format(
+      `SELECT "Data" FROM "ConfigDbModels_Config" WHERE "Id" = %s AND "Version" = %s`,
+      WIZARDS_CONFIG_ID,
+      WIZARDS_CONFIG_VERSION
+    );
+
+    query.executeQuery(db, (err, result) => {
+      if (err) {
+        log.error("Error fetching wizards config:", err);
+        return res.status(500).json({ error: "Failed to fetch wizards config" });
+      }
+
+      if (!result || !result.data || result.data.length === 0) {
+        return res.status(200).json({ wizards: [] });
+      }
+
+      try {
+        const data = JSON.parse(result.data[0].Data);
+        return res.status(200).json(data);
+      } catch (parseErr) {
+        log.error("Error parsing wizards config:", parseErr);
+        return res.status(500).json({ error: "Failed to parse wizards config" });
+      }
+    });
+  });
+
+  app.put("/pa-config-svc/wizards/config", (req: IRequest, res) => {
+    const user = getUser(req);
+    const { db } = req.dbConnections;
+    const configData = req.body;
+
+    if (!configData || !configData.wizards) {
+      return res.status(400).json({ error: "Invalid config format. Expected { wizards: [...] }" });
+    }
+
+    const dataJson = JSON.stringify(configData);
+    const username = user.getUser();
+    const now = new Date();
+
+    // Check if config exists
+    const checkQuery = QueryObject.format(
+      `SELECT "Id" FROM "ConfigDbModels_Config" WHERE "Id" = %s AND "Version" = %s`,
+      WIZARDS_CONFIG_ID,
+      WIZARDS_CONFIG_VERSION
+    );
+
+    checkQuery.executeQuery(db, (err, result) => {
+      if (err) {
+        log.error("Error checking existing config:", err);
+        return res.status(500).json({ error: "Failed to check existing config" });
+      }
+
+      const exists = result && result.data && result.data.length > 0;
+
+      if (exists) {
+        const updateQuery = QueryObject.format(
+          `UPDATE "ConfigDbModels_Config" SET "Data" = %s, "Modifier" = %s, "Modified" = %t WHERE "Id" = %s AND "Version" = %s`,
+          dataJson,
+          username,
+          now,
+          WIZARDS_CONFIG_ID,
+          WIZARDS_CONFIG_VERSION
+        );
+
+        updateQuery.executeUpdate(db, (updateErr) => {
+          if (updateErr) {
+            log.error("Error updating wizards config:", updateErr);
+            return res.status(500).json({ error: "Failed to update wizards config" });
+          }
+          db.commit();
+          return res.status(200).json({ success: true, message: "Config updated" });
+        });
+      } else {
+        const insertQuery = QueryObject.format(
+          `INSERT INTO "ConfigDbModels_Config" ("Id", "Version", "Status", "Name", "Type", "Creator", "Created", "Modifier", "Modified", "Data") VALUES (%s, %s, %s, %s, %s, %s, %t, %s, %t, %s)`,
+          WIZARDS_CONFIG_ID,
+          WIZARDS_CONFIG_VERSION,
+          "A",
+          "Wizards Configuration",
+          WIZARDS_CONFIG_TYPE,
+          username,
+          now,
+          username,
+          now,
+          dataJson
+        );
+
+        insertQuery.executeUpdate(db, (insertErr) => {
+          if (insertErr) {
+            log.error("Error inserting wizards config:", insertErr);
+            return res.status(500).json({ error: "Failed to create wizards config" });
+          }
+          db.commit();
+          return res.status(201).json({ success: true, message: "Config created" });
+        });
+      }
+    });
+  });
+
+  app.delete("/pa-config-svc/wizards/config", (req: IRequest, res) => {
+    const { db } = req.dbConnections;
+
+    const deleteQuery = QueryObject.format(
+      `DELETE FROM "ConfigDbModels_Config" WHERE "Id" = %s AND "Version" = %s`,
+      WIZARDS_CONFIG_ID,
+      WIZARDS_CONFIG_VERSION
+    );
+
+    deleteQuery.executeUpdate(db, (err, linesEffected) => {
+      if (err) {
+        log.error("Error deleting wizards config:", err);
+        return res.status(500).json({ error: "Failed to delete wizards config" });
+      }
+      db.commit();
+
+      if (linesEffected === 0) {
+        return res.status(404).json({ error: "Config not found" });
+      }
+
+      return res.status(200).json({ success: true, message: "Config deleted" });
+    });
+  });
+
   app.use((err, req, res, next) => {
     if (err) {
       log.enrichErrorWithRequestCorrelationID(err, req);

functions/package.json

@@ -1100,6 +1100,25 @@
             "PAConfig.svc"
           ]
         },
+        {
+          "path": "^/pa-config-svc/wizards/config$",
+          "scopes": [
+            "PAConfig.svc/read"
+          ],
+          "httpMethods": [
+            "GET"
+          ]
+        },
+        {
+          "path": "^/pa-config-svc/wizards/config$",
+          "scopes": [
+            "PAConfig.svc"
+          ],
+          "httpMethods": [
+            "PUT",
+            "DELETE"
+          ]
+        },
         {
           "path": "^/hc/hph/cdw/config/services/config.xsjs(.*)",
           "scopes": [

ui/apps/portal/.env.example

@@ -34,7 +34,7 @@ SSL_CRT_FILE="../../.cert/local_alp_portal_public.crt"
 REACT_APP_ALP_RELEASE_VERSION=v22.8-hotaka-dake
 
 # Plugin definition. Only required when running yarn start in portal folder
-REACT_APP_PLUGINS={ "researcher": [ { "enabled": true, "type": "app", "autoMount": true, "featureFlag": "conceptSets", "name": "Concepts", "nameI18nKey": "UI_PLUGIN_CONCEPTS", "pluginPath": "/resources/concept-sets/lifecycles.js", "requiredRoles": [ "RESEARCHER" ], "route": "concepts" }, { "enabled": true, "featureFlag": "cohort", "name": "Cohorts", "nameI18nKey": "UI_PLUGIN_COHORTS", "pluginPath": "plugins/mri/PatientAnalytics/module", "requiredRoles": [ "RESEARCHER" ], "route": "cohort" }, { "enabled": false, "featureFlag": "cohorts", "name": "Cohorts M", "pluginPath": "plugins/Cohort/module", "requiredRoles": [ "RESEARCHER" ], "route": "cohorts" }, { "enabled": true, "type": "app", "featureFlag": "starboard", "name": "Notebooks", "nameI18nKey": "UI_PLUGIN_NOTEBOOKS", "pluginPath": "/resources/notebook-ui/lifecycles.js", "requiredRoles": [ "RESEARCHER" ], "route": "starboard", "data": { "uiFilesUrl":"https://localhost:41100/" } }, { "enabled": true, "type": "app", "name": "Analysis", "nameI18nKey": "UI_PLUGIN_ANALYSIS", "route": "analysis", "pluginPath": "/resources/analysis-ui/lifecycles.js", "featureFlag": "strategus", "requiredRoles": [ "RESEARCHER" ] }, {"name": "Kaplan-Meier", "nameI18nKey": "UI_PLUGIN_KAPLAN_MEIER", "route": "kaplan-meier", "pluginPath": "plugins/Researcher/KaplanMeier/module", "featureFlag": "kaplanMeier", "requiredRoles": ["RESEARCHER"], "enabled": false}], "setup": [ { "description": "Database connection and credentials", "descriptionI18nKey": "UI_PLUGIN_SETUP_DB_DESCRIPTION", "enabled": true, "name": "Databases", "nameI18nKey": "UI_PLUGIN_DATABASES", "notes": "", "pluginPath": "plugins/Setup/Db/module", "route": "db" }, { "description": "Allow user to sign-in with Azure Active Directory", "enabled": false, "name": "Azure AD integration", "notes": "Notes: Require manual update of the environment variable to switch the identity provider to Azure", "pluginPath": "plugins/Setup/AzureAD/module", "route": "azure-ad" }, { "description": "Allow user to configure the git information", "descriptionI18nKey": "UI_PLUGIN_SETUP_GIT_DESCRIPTION", "enabled": true, "name": "Git configuration", "nameI18nKey": "UI_PLUGIN_GIT_CONFIG", "pluginPath": "plugins/Setup/GitConfig/module", "route": "git-config" }, { "description": "Enable / disable feature", "descriptionI18nKey": "UI_PLUGIN_SETUP_FEATURE_FLAGS_DESCRIPTION", "enabled": true, "name": "Feature flags", "nameI18nKey": "UI_PLUGIN_FEATURE_FLAGS", "pluginPath": "plugins/Setup/Feature/module", "route": "feature" }, { "description": "Configure dataset metadata and tags", "descriptionI18nKey": "UI_PLUGIN_SETUP_METADATA_DESCRIPTION", "enabled": true, "name": "Metadata", "nameI18nKey": "UI_PLUGIN_METADATA", "notes": "", "pluginPath": "plugins/Setup/Metadata/module", "route": "metadata" }, { "description": "Configure cohort builder", "descriptionI18nKey": "UI_PLUGIN_SETUP_PATIENT_ANALYTICS_DESCRIPTION", "enabled": true, "name": "Cohort Builder config", "nameI18nKey": "UI_PLUGIN_PATIENT_ANALYTICS_CONFIG", "notes": "", "pluginPath": "plugins/mri/PatientAnalyticsConfig/module", "route": "pa-config" }, { "description": "Configure CDM", "descriptionI18nKey": "UI_PLUGIN_SETUP_CDM_DESCRIPTION", "enabled": true, "name": "CDM Config", "nameI18nKey": "UI_PLUGIN_CDM_CONFIG", "notes": "", "pluginPath": "plugins/mri/CDM/module", "route": "cdm-config" }, { "description": "Configure patient summary", "enabled": false, "name": "Patient Summary Config", "notes": "", "pluginPath": "plugins/mri/PatientSummaryConfig/module", "route": "ps-config" }, { "description": "Configure overview description text", "descriptionI18nKey": "UI_PLUGIN_SETUP_OVERVIEW_DESCRIPTION", "enabled": true, "name": "Overview description", "nameI18nKey": "UI_PLUGIN_OVERVIEW_DESCRIPTION", "notes": "", "pluginPath": "plugins/Setup/OverviewDescription/module", "route": "overview-description" }, { "description": "Configure hybrid search for concepts", "descriptionI18nKey": "UI_PLUGIN_SETUP_HYBRID_SEARCH_DESCRIPTION", "enabled": true, "name": "Hybrid search", "nameI18nKey": "UI_PLUGIN_HYBRID_SEARCH", "notes": "", "pluginPath": "plugins/Setup/HybridSearch/module", "route": "hybrid-search" }, { "description": "Manage plugins", "descriptionI18nKey": "UI_PLUGIN_SETUP_PLUGINS_DESCRIPTION", "enabled": true, "name": "Plugins", "nameI18nKey": "UI_PLUGIN_PLUGINS", "notes": "", "pluginPath": "plugins/Setup/TrexPlugins/module", "route": "plugins" }, { "description": "Setting up demo dataset", "descriptionI18nKey": "UI_PLUGIN_SETUP_DEMO_DESCRIPTION", "enabled": true, "name": "Demo setup", "nameI18nKey": "UI_PLUGIN_DEMO_SETUP", "notes": "", "pluginPath": "plugins/Setup/DemoSetup/module", "route": "demo-setup" } ], "systemadmin": [ { "name": "Users", "nameI18nKey": "UI_PLUGIN_USERS", "enabled": true, "pluginPath": "plugins/SystemAdmin/UserOverview/module", "route": "user-overview" }, { "name": "Datasets", "nameI18nKey": "UI_PLUGIN_DATASETS", "enabled": true, "pluginPath": "plugins/SystemAdmin/StudyOverview/module", "route": "dataset-overview" }, { "name": "Jobs", "nameI18nKey": "UI_PLUGIN_JOBS", "enabled": true, "pluginPath": "plugins/SystemAdmin/Jobs/module", "route": "jobs" }, { "name": "ETL", "nameI18nKey": "UI_PLUGIN_ETL", "enabled": true, "route": "etl", "data": { "dnBaseUrl": "https://localhost:41100/", "mappingSuggestion": false }, "pluginPath": "/flow/module.js" }, {"name": "Studies", "nameI18nKey": "UI_PLUGIN_STUDIES", "enabled": true, "route": "study-page", "pluginPath": "plugins/SystemAdmin/StudyPage/module"}, { "name": "Setup", "nameI18nKey": "UI_PLUGIN_SETUP", "enabled": true, "pluginPath": "plugins/Setup/module", "route": "setup" }, {"enabled":true,"pluginPath":"plugins/SystemAdmin/D2ELogs/module","name":"Logs","nameI18nKey":"UI_PLUGIN_LOGS","route":"docker-logs", "featureFlag": "d2eLogs"} ] }
+REACT_APP_PLUGINS={ "researcher": [ { "enabled": true, "type": "app", "autoMount": true, "featureFlag": "conceptSets", "name": "Concepts", "nameI18nKey": "UI_PLUGIN_CONCEPTS", "pluginPath": "/resources/concept-sets/lifecycles.js", "requiredRoles": [ "RESEARCHER" ], "route": "concepts" }, { "enabled": true, "featureFlag": "cohort", "name": "Cohorts", "nameI18nKey": "UI_PLUGIN_COHORTS", "pluginPath": "plugins/mri/PatientAnalytics/module", "requiredRoles": [ "RESEARCHER" ], "route": "cohort" }, { "enabled": false, "featureFlag": "cohorts", "name": "Cohorts M", "pluginPath": "plugins/Cohort/module", "requiredRoles": [ "RESEARCHER" ], "route": "cohorts" }, { "enabled": true, "type": "app", "featureFlag": "starboard", "name": "Notebooks", "nameI18nKey": "UI_PLUGIN_NOTEBOOKS", "pluginPath": "/resources/notebook-ui/lifecycles.js", "requiredRoles": [ "RESEARCHER" ], "route": "starboard", "data": { "uiFilesUrl":"https://localhost:41100/" } }, { "enabled": true, "type": "app", "name": "Analysis", "nameI18nKey": "UI_PLUGIN_ANALYSIS", "route": "analysis", "pluginPath": "/resources/analysis-ui/lifecycles.js", "featureFlag": "strategus", "requiredRoles": [ "RESEARCHER" ] }, { "enabled": false, "type": "app", "name": "Wizards", "nameI18nKey": "UI_PLUGIN_WIZARDS", "route": "wizards", "pluginPath": "/resources/wizards/lifecycles.js", "featureFlag": "wizards", "requiredRoles": [ "RESEARCHER" ] }, {"name": "Kaplan-Meier", "nameI18nKey": "UI_PLUGIN_KAPLAN_MEIER", "route": "kaplan-meier", "pluginPath": "plugins/Researcher/KaplanMeier/module", "featureFlag": "kaplanMeier", "requiredRoles": ["RESEARCHER"], "enabled": false}], "setup": [ { "description": "Database connection and credentials", "descriptionI18nKey": "UI_PLUGIN_SETUP_DB_DESCRIPTION", "enabled": true, "name": "Databases", "nameI18nKey": "UI_PLUGIN_DATABASES", "notes": "", "pluginPath": "plugins/Setup/Db/module", "route": "db" }, { "description": "Allow user to sign-in with Azure Active Directory", "enabled": false, "name": "Azure AD integration", "notes": "Notes: Require manual update of the environment variable to switch the identity provider to Azure", "pluginPath": "plugins/Setup/AzureAD/module", "route": "azure-ad" }, { "description": "Allow user to configure the git information", "descriptionI18nKey": "UI_PLUGIN_SETUP_GIT_DESCRIPTION", "enabled": true, "name": "Git configuration", "nameI18nKey": "UI_PLUGIN_GIT_CONFIG", "pluginPath": "plugins/Setup/GitConfig/module", "route": "git-config" }, { "description": "Enable / disable feature", "descriptionI18nKey": "UI_PLUGIN_SETUP_FEATURE_FLAGS_DESCRIPTION", "enabled": true, "name": "Feature flags", "nameI18nKey": "UI_PLUGIN_FEATURE_FLAGS", "pluginPath": "plugins/Setup/Feature/module", "route": "feature" }, { "description": "Configure dataset metadata and tags", "descriptionI18nKey": "UI_PLUGIN_SETUP_METADATA_DESCRIPTION", "enabled": true, "name": "Metadata", "nameI18nKey": "UI_PLUGIN_METADATA", "notes": "", "pluginPath": "plugins/Setup/Metadata/module", "route": "metadata" }, { "description": "Configure cohort builder", "descriptionI18nKey": "UI_PLUGIN_SETUP_PATIENT_ANALYTICS_DESCRIPTION", "enabled": true, "name": "Cohort Builder config", "nameI18nKey": "UI_PLUGIN_PATIENT_ANALYTICS_CONFIG", "notes": "", "pluginPath": "plugins/mri/PatientAnalyticsConfig/module", "route": "pa-config" }, { "description": "Configure CDM", "descriptionI18nKey": "UI_PLUGIN_SETUP_CDM_DESCRIPTION", "enabled": true, "name": "CDM Config", "nameI18nKey": "UI_PLUGIN_CDM_CONFIG", "notes": "", "pluginPath": "plugins/mri/CDM/module", "route": "cdm-config" }, { "description": "Configure patient summary", "enabled": false, "name": "Patient Summary Config", "notes": "", "pluginPath": "plugins/mri/PatientSummaryConfig/module", "route": "ps-config" }, { "description": "Configure overview description text", "descriptionI18nKey": "UI_PLUGIN_SETUP_OVERVIEW_DESCRIPTION", "enabled": true, "name": "Overview description", "nameI18nKey": "UI_PLUGIN_OVERVIEW_DESCRIPTION", "notes": "", "pluginPath": "plugins/Setup/OverviewDescription/module", "route": "overview-description" }, { "description": "Configure hybrid search for concepts", "descriptionI18nKey": "UI_PLUGIN_SETUP_HYBRID_SEARCH_DESCRIPTION", "enabled": true, "name": "Hybrid search", "nameI18nKey": "UI_PLUGIN_HYBRID_SEARCH", "notes": "", "pluginPath": "plugins/Setup/HybridSearch/module", "route": "hybrid-search" }, { "description": "Manage plugins", "descriptionI18nKey": "UI_PLUGIN_SETUP_PLUGINS_DESCRIPTION", "enabled": true, "name": "Plugins", "nameI18nKey": "UI_PLUGIN_PLUGINS", "notes": "", "pluginPath": "plugins/Setup/TrexPlugins/module", "route": "plugins" }, { "description": "Setting up demo dataset", "descriptionI18nKey": "UI_PLUGIN_SETUP_DEMO_DESCRIPTION", "enabled": true, "name": "Demo setup", "nameI18nKey": "UI_PLUGIN_DEMO_SETUP", "notes": "", "pluginPath": "plugins/Setup/DemoSetup/module", "route": "demo-setup" } ], "systemadmin": [ { "name": "Users", "nameI18nKey": "UI_PLUGIN_USERS", "enabled": true, "pluginPath": "plugins/SystemAdmin/UserOverview/module", "route": "user-overview" }, { "name": "Datasets", "nameI18nKey": "UI_PLUGIN_DATASETS", "enabled": true, "pluginPath": "plugins/SystemAdmin/StudyOverview/module", "route": "dataset-overview" }, { "name": "Jobs", "nameI18nKey": "UI_PLUGIN_JOBS", "enabled": true, "pluginPath": "plugins/SystemAdmin/Jobs/module", "route": "jobs" }, { "name": "ETL", "nameI18nKey": "UI_PLUGIN_ETL", "enabled": true, "route": "etl", "data": { "dnBaseUrl": "https://localhost:41100/", "mappingSuggestion": false }, "pluginPath": "/flow/module.js" }, {"name": "Studies", "nameI18nKey": "UI_PLUGIN_STUDIES", "enabled": true, "route": "study-page", "pluginPath": "plugins/SystemAdmin/StudyPage/module"}, { "name": "Setup", "nameI18nKey": "UI_PLUGIN_SETUP", "enabled": true, "pluginPath": "plugins/Setup/module", "route": "setup" }, {"enabled":true,"pluginPath":"plugins/SystemAdmin/D2ELogs/module","name":"Logs","nameI18nKey":"UI_PLUGIN_LOGS","route":"docker-logs", "featureFlag": "d2eLogs"} ] }
 
 USE_PUBLIC_WEBAPI_PROXY=false
 PUBLIC_WEBAPI_PROXY_URL=http://localhost:3001

ui/apps/portal/src/containers/researcher/__tests__/Researcher.deeplink.test.tsx

@@ -202,8 +202,8 @@ describe("Researcher - Deep Link Integration", () => {
     expect(feedback?.message).toBe("Unable to Open Dataset");
   });
 
-  it("should route to /cohort when route=cohort and pass PA params", () => {
-    // Setup: URL with route=cohort and PA params (linkType, query)
+  it("should route to /information with all non-datasetId query params when no path stored", () => {
+    // Setup: URL with query params but no stored path
     (window as any).location = {
       href: "http://localhost:3000/researcher?datasetId=dataset-2&route=cohort&linkType=cohort-definition&query=abc",
     };
@@ -228,8 +228,8 @@ describe("Researcher - Deep Link Integration", () => {
     // Verify correct dataset was set
     expect(result.current.activeDataset.activeDataset.id).toBe("dataset-2");
 
-    // Verify navigation routes to /cohort with only PA params (not datasetId/route)
-    expect(mockNavigate).toHaveBeenCalledWith("/researcher/cohort?linkType=cohort-definition&query=abc", {
+    // Without a stored path, defaults to /information with all non-datasetId params
+    expect(mockNavigate).toHaveBeenCalledWith("/researcher/information?route=cohort&linkType=cohort-definition&query=abc", {
       state: { tenantId: "t1" },
     });
   });

ui/apps/portal/src/contexts/app-context/states/translation-state.ts

@@ -1134,6 +1134,7 @@ export const i18nDefault = {
     UI_PLUGIN_SETUP_PATIENT_ANALYTICS_DESCRIPTION: "Configure cohort builder",
     UI_PLUGIN_SETUP_PLUGINS_DESCRIPTION: "Manage plugins",
     UI_PLUGIN_SETUP_GIT_DESCRIPTION: "Allow user to configure the git information",
+    UI_PLUGIN_WIZARDS: "Wizards",
     UPDATE_SCHEMA_DIALOG__CANCEL: "Cancel",
     UPDATE_SCHEMA_DIALOG__CONFIRM: "Are you sure you want to update the schema of this dataset:",
     UPDATE_SCHEMA_DIALOG__ERROR: "Schema for dataset {0} failed to update",

ui/apps/portal/src/index.tsx

@@ -11,6 +11,8 @@ import "import-map-overrides";
 
 // Save deep link params BEFORE any redirects happen
 // This must run synchronously before React initializes
+// Only whitelisted paths (/researcher/cohort, /researcher/wizards) will have params extracted
+// New params always replace existing ones
 try {
   const params = extractDeepLinkParamsFromUrl(window.location.href);
   if (Object.keys(params).length > 0) {