Bump qs, @nteract/data-explorer, less, wait-on and express

Bumps [qs](https://github.com/ljharb/qs) to 6.14.1 and updates ancestor dependencies [qs](https://github.com/ljharb/qs), [@nteract/data-explorer](https://github.com/nteract/data-explorer), [less](https://github.com/less/less.js), [wait-on](https://github.com/jeffbski/wait-on) and [express](https://github.com/expressjs/express). These dependencies need to be updated together.


Updates `qs` from 6.11.2 to 6.14.1
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.11.2...v6.14.1)

Updates `@nteract/data-explorer` from 8.0.3 to 8.2.12
- [Release notes](https://github.com/nteract/data-explorer/releases)
- [Changelog](https://github.com/nteract/data-explorer/blob/next/CHANGELOG.md)
- [Commits](https://github.com/nteract/data-explorer/compare/v8.0.3...v8.2.12)

Updates `less` from 3.8.1 to 3.13.1
- [Release notes](https://github.com/less/less.js/releases)
- [Changelog](https://github.com/less/less.js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/less/less.js/compare/v3.8.1...v3.13.1)

Updates `wait-on` from 4.0.2 to 9.0.3
- [Release notes](https://github.com/jeffbski/wait-on/releases)
- [Commits](https://github.com/jeffbski/wait-on/compare/v4.0.2...v9.0.3)

Updates `express` from 4.18.2 to 4.22.1
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/v4.22.1/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.18.2...v4.22.1)

---
updated-dependencies:
- dependency-name: qs
  dependency-version: 6.14.1
  dependency-type: indirect
- dependency-name: "@nteract/data-explorer"
  dependency-version: 8.2.12
  dependency-type: direct:production
- dependency-name: less
  dependency-version: 3.13.1
  dependency-type: direct:development
- dependency-name: wait-on
  dependency-version: 9.0.3
  dependency-type: direct:development
- dependency-name: express
  dependency-version: 4.22.1
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

package.json

@@ -19,7 +19,7 @@
     "@nteract/commutable": "7.5.1",
     "@nteract/connected-components": "6.8.2",
     "@nteract/core": "15.1.9",
-    "@nteract/data-explorer": "8.0.3",
+    "@nteract/data-explorer": "8.2.12",
     "@nteract/directory-listing": "2.0.6",
     "@nteract/dropdown-menu": "1.0.1",
     "@nteract/editor": "10.1.12",
@@ -177,7 +177,7 @@
     "jest-html-loader": "1.0.0",
     "jest-react-hooks-shallow": "1.5.1",
     "jest-trx-results-processor": "3.0.2",
-    "less": "3.8.1",
+    "less": "3.13.1",
     "less-loader": "11.1.3",
     "less-vars-loader": "1.1.0",
     "mini-css-extract-plugin": "2.1.0",
@@ -195,7 +195,7 @@
     "typedoc": "0.26.2",
     "typescript": "4.9.5",
     "url-loader": "4.1.1",
-    "wait-on": "4.0.2",
+    "wait-on": "9.0.3",
     "webpack": "5.88.2",
     "webpack-bundle-analyzer": "4.9.1",
     "webpack-cli": "5.1.4",

src/Explorer/Controls/Settings/SettingsComponent.tsx

@@ -16,7 +16,7 @@ import {
 import { useIndexingPolicyStore } from "Explorer/Tabs/QueryTab/ResultsView";
 import { useDatabases } from "Explorer/useDatabases";
 import { isFabricNative } from "Platform/Fabric/FabricUtil";
-import { isVectorSearchEnabled } from "Utils/CapabilityUtils";
+import { isCapabilityEnabled, isVectorSearchEnabled } from "Utils/CapabilityUtils";
 import { isRunningOnPublicCloud } from "Utils/CloudUtils";
 import * as React from "react";
 import DiscardIcon from "../../../../images/discard.svg";
@@ -70,7 +70,6 @@ import {
   getMongoNotification,
   getTabTitle,
   hasDatabaseSharedThroughput,
-  isDataMaskingEnabled,
   isDirty,
   parseConflictResolutionMode,
   parseConflictResolutionProcedure,
@@ -1074,8 +1073,8 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
 
       newCollection.fullTextPolicy = this.state.fullTextPolicy;
 
-      // Only send data masking policy if it was modified (dirty) and data masking is enabled
-      if (this.state.isDataMaskingDirty && isDataMaskingEnabled(this.collection.dataMaskingPolicy?.())) {
+      // Only send data masking policy if it was modified (dirty)
+      if (this.state.isDataMaskingDirty && isCapabilityEnabled(Constants.CapabilityNames.EnableDynamicDataMasking)) {
         newCollection.dataMaskingPolicy = this.state.dataMaskingContent;
       }
 
@@ -1464,7 +1463,15 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
       });
     }
 
-    if (isDataMaskingEnabled(this.collection.dataMaskingPolicy?.())) {
+    // Check if DDM should be enabled
+    const shouldEnableDDM = (): boolean => {
+      const hasDataMaskingCapability = isCapabilityEnabled(Constants.CapabilityNames.EnableDynamicDataMasking);
+      const isSqlAccount = userContext.apiType === "SQL";
+
+      return isSqlAccount && hasDataMaskingCapability; // Only show for SQL accounts with DDM capability
+    };
+
+    if (shouldEnableDDM()) {
       const dataMaskingComponentProps: DataMaskingComponentProps = {
         shouldDiscardDataMasking: this.state.shouldDiscardDataMasking,
         resetShouldDiscardDataMasking: this.resetShouldDiscardDataMasking,

src/Explorer/Controls/Settings/SettingsSubComponents/DataMaskingComponent.tsx

@@ -1,10 +1,12 @@
 import { MessageBar, MessageBarType, Stack } from "@fluentui/react";
 import * as monaco from "monaco-editor";
 import * as React from "react";
+import * as Constants from "../../../../Common/Constants";
 import * as DataModels from "../../../../Contracts/DataModels";
+import { isCapabilityEnabled } from "../../../../Utils/CapabilityUtils";
 import { loadMonaco } from "../../../LazyMonaco";
 import { titleAndInputStackProps, unsavedEditorWarningMessage } from "../SettingsRenderUtils";
-import { isDataMaskingEnabled, isDirty as isContentDirty } from "../SettingsUtils";
+import { isDirty as isContentDirty } from "../SettingsUtils";
 
 export interface DataMaskingComponentProps {
   shouldDiscardDataMasking: boolean;
@@ -138,7 +140,7 @@ export class DataMaskingComponent extends React.Component<DataMaskingComponentPr
   };
 
   public render(): JSX.Element {
-    if (!isDataMaskingEnabled(this.props.dataMaskingContent)) {
+    if (!isCapabilityEnabled(Constants.CapabilityNames.EnableDynamicDataMasking)) {
       return null;
     }
 

src/Explorer/Controls/Settings/SettingsUtils.tsx

@@ -2,8 +2,6 @@ import * as Constants from "../../../Common/Constants";
 import * as DataModels from "../../../Contracts/DataModels";
 import * as ViewModels from "../../../Contracts/ViewModels";
 import { isFabricNative } from "../../../Platform/Fabric/FabricUtil";
-import { userContext } from "../../../UserContext";
-import { isCapabilityEnabled } from "../../../Utils/CapabilityUtils";
 import { MongoIndex } from "../../../Utils/arm/generatedClients/cosmos/types";
 
 const zeroValue = 0;
@@ -90,19 +88,6 @@ export const hasDatabaseSharedThroughput = (collection: ViewModels.Collection):
   return database?.isDatabaseShared() && !collection.offer();
 };
 
-export const isDataMaskingEnabled = (dataMaskingPolicy?: DataModels.DataMaskingPolicy): boolean => {
-  const isSqlAccount = userContext.apiType === "SQL";
-  if (!isSqlAccount) {
-    return false;
-  }
-
-  const hasDataMaskingCapability = isCapabilityEnabled(Constants.CapabilityNames.EnableDynamicDataMasking);
-  const hasDataMaskingPolicyFromCollection =
-    dataMaskingPolicy?.includedPaths?.length > 0 || dataMaskingPolicy?.excludedPaths?.length > 0;
-
-  return hasDataMaskingCapability || hasDataMaskingPolicyFromCollection;
-};
-
 export const parseConflictResolutionMode = (modeFromBackend: string): DataModels.ConflictResolutionMode => {
   // Backend can contain different casing as it does case-insensitive comparisson
   if (!modeFromBackend) {

src/Explorer/Controls/Settings/__snapshots__/SettingsComponent.test.tsx.snap

@@ -604,60 +604,6 @@ exports[`SettingsComponent renders 1`] = `
           />
         </Stack>
       </PivotItem>
-      <PivotItem
-        headerButtonProps={
-          {
-            "data-test": "settings-tab-header/DataMaskingTab",
-          }
-        }
-        headerText="Masking Policy (preview)"
-        itemKey="DataMaskingTab"
-        key="DataMaskingTab"
-        style={
-          {
-            "backgroundColor": "var(--colorNeutralBackground1)",
-            "color": "var(--colorNeutralForeground1)",
-            "marginTop": 20,
-          }
-        }
-      >
-        <Stack
-          styles={
-            {
-              "root": {
-                "backgroundColor": "var(--colorNeutralBackground1)",
-                "color": "var(--colorNeutralForeground1)",
-              },
-            }
-          }
-        >
-          <DataMaskingComponent
-            dataMaskingContent={
-              {
-                "excludedPaths": [
-                  "/excludedPath",
-                ],
-                "includedPaths": [],
-                "isPolicyEnabled": true,
-              }
-            }
-            dataMaskingContentBaseline={
-              {
-                "excludedPaths": [
-                  "/excludedPath",
-                ],
-                "includedPaths": [],
-                "isPolicyEnabled": true,
-              }
-            }
-            onDataMaskingContentChange={[Function]}
-            onDataMaskingDirtyChange={[Function]}
-            resetShouldDiscardDataMasking={[Function]}
-            shouldDiscardDataMasking={false}
-            validationErrors={[]}
-          />
-        </Stack>
-      </PivotItem>
       <PivotItem
         headerButtonProps={
           {