diff --git a/.github/workflows/azure-static-web-apps-conformance-rules-editor.yml b/.github/workflows/azure-static-web-apps-conformance-rules-editor.yml index fbcf2f0..bda78ce 100644 --- 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 index c45a736..42581f1 100644 --- 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 => { 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 index 32fa3ef..5ce82d9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,7 +21,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", @@ -15172,9 +15172,9 @@ } }, "node_modules/monaco-editor": { - "version": "0.44.0", - "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.44.0.tgz", - "integrity": "sha512-5SmjNStN6bSuSE5WPT2ZV+iYn1/yI9sd4Igtk23ChvqB7kDk9lZbB9F5frsuvpB+2njdIeGGFf2G4gbE6rCC9Q==" + "version": "0.45.0", + "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.45.0.tgz", + "integrity": "sha512-mjv1G1ZzfEE3k9HZN0dQ2olMdwIfaeAAjFiwNprLfYNRSz7ctv9XuCT7gPtBGrMUeV1/iZzYKj17Khu1hxoHOA==" }, "node_modules/monaco-languageserver-types": { "version": "0.2.3", @@ -19544,6 +19544,7 @@ "version": "4.9.4", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz", "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==", + "dev": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -31690,9 +31691,9 @@ } }, "monaco-editor": { - "version": "0.44.0", - "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.44.0.tgz", - "integrity": "sha512-5SmjNStN6bSuSE5WPT2ZV+iYn1/yI9sd4Igtk23ChvqB7kDk9lZbB9F5frsuvpB+2njdIeGGFf2G4gbE6rCC9Q==" + "version": "0.45.0", + "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.45.0.tgz", + "integrity": "sha512-mjv1G1ZzfEE3k9HZN0dQ2olMdwIfaeAAjFiwNprLfYNRSz7ctv9XuCT7gPtBGrMUeV1/iZzYKj17Khu1hxoHOA==" }, "monaco-languageserver-types": { "version": "0.2.3", @@ -31714,6 +31715,11 @@ "resolved": "https://registry.npmjs.org/monaco-types/-/monaco-types-0.1.0.tgz", "integrity": "sha512-aWK7SN9hAqNYi0WosPoMjenMeXJjwCxDibOqWffyQ/qXdzB/86xshGQobRferfmNz7BSNQ8GB0MD0oby9/5fTQ==" }, + "monaco-types": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/monaco-types/-/monaco-types-0.1.0.tgz", + "integrity": "sha512-aWK7SN9hAqNYi0WosPoMjenMeXJjwCxDibOqWffyQ/qXdzB/86xshGQobRferfmNz7BSNQ8GB0MD0oby9/5fTQ==" + }, "monaco-worker-manager": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/monaco-worker-manager/-/monaco-worker-manager-2.0.1.tgz", diff --git a/package.json b/package.json index 7e5a102..b70b78b 100644 --- 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",