37 export rules fixes (#207)

* Rules export working * Upgraded monaco editors and fixed build * removed unused imports * Added scope and formula escaping * fixes for rule editor exports
cdisc-org · Jan 4, 2024 · f38ebb6 · f38ebb6
1 parent e87ecbe
commit f38ebb6
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/.github/workflows/azure-static-web-apps-conformance-rules-editor.yml b/.github/workflows/azure-static-web-apps-conformance-rules-editor.yml
@@ -34,6 +34,8 @@ jobs:
           api_location: "/api" # Api source code path - optional
           output_location: "build" # Built app content directory - optional
           ###### End of Repository/Build Configurations ######
+        env:
+          NPM_CONFIG_LEGACY_PEER_DEPS: true
 
   build_and_deploy_training_job:
     if: github.ref_name == 'main' && (github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed') || github.event_name == 'workflow_dispatch')
@@ -56,6 +58,8 @@ jobs:
           api_location: "/api" # Api source code path - optional
           output_location: "build" # Built app content directory - optional
           ###### End of Repository/Build Configurations ######
+        env:
+          NPM_CONFIG_LEGACY_PEER_DEPS: true
 
   close_pull_request_job:
     if: github.event_name == 'pull_request' && github.event.action == 'closed'

diff --git a/api/providers/CosmosSQLStorage.ts b/api/providers/CosmosSQLStorage.ts
@@ -164,7 +164,7 @@ function buildSelect(query: IQuery, aliasIndex: number) {
    * For example,
    *
    * SELECT
-   *   DISTINCT ARRAY(
+   *   ARRAY(
    *     SELECT
    *       DISTINCT VALUE Rules10["Rule_Identifier"]["Id"]
    *     FROM
@@ -334,7 +334,7 @@ const getRules = async (query: IQuery): Promise<IRules> => {
 
   const querySpec = {
     parameters: [...filterParams, offsetParam, limitParam],
-    query: `SELECT DISTINCT ${select} FROM ${rulesAlias}1${joins}${filters}${orderBy} OFFSET @offset LIMIT @limit`,
+    query: `SELECT ${select} FROM ${rulesAlias}1${joins}${filters}${orderBy} OFFSET @offset LIMIT @limit`,
   };
   try {
     const results = await rulesContainer.items.query(querySpec).fetchAll();

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
     "js-yaml": "^4.1.0",
     "jszip": "^3.10.1",
     "lodash-es": "^4.17.21",
-    "monaco-editor": "^0.44.0",
+    "monaco-editor": "^0.45.0",
     "monaco-yaml": "^5.1.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",