Fix several minor data-connector bugs

client/src/features/dataConnectorsV2/components/DataConnectorModal/DataConnectorModalFooter.tsx

@@ -191,18 +191,12 @@ export default function DataConnectorModalFooter({
   useEffect(() => {
     const dataConnectorId = createResult.data?.id;
     if (dataConnectorId == null) return;
-    const shouldSaveCredentials = shouldSaveDataConnectorCredentials(
-      flatDataConnector.options,
-      cloudStorageState.saveCredentials,
-      validationResult?.isSuccess ?? false
-    );
-    if (!shouldSaveCredentials) return;
-
-    const options = flatDataConnector.options as CloudStorageDetailsOptions;
     if (!schemata) return;
     const sensitiveFieldNames = findSensitive(
       schemata.find((s) => s.prefix === flatDataConnector.schema)
     );
+    const options = flatDataConnector.options as CloudStorageDetailsOptions;
+    if (!options) return;
     const dataConnectorSecretPatchList = sensitiveFieldNames
       .map((name) => ({
         name,
@@ -213,6 +207,13 @@ export default function DataConnectorModalFooter({
         name: secret.name,
         value: "" + secret.value,
       }));
+    const shouldSaveCredentials = shouldSaveDataConnectorCredentials(
+      dataConnectorSecretPatchList,
+      cloudStorageState.saveCredentials,
+      validationResult?.isSuccess ?? false
+    );
+    if (!shouldSaveCredentials) return;
+
     saveCredentials({
       dataConnectorId,
       dataConnectorSecretPatchList,
@@ -365,12 +366,12 @@ export default function DataConnectorModalFooter({
 }
 
 function shouldSaveDataConnectorCredentials(
-  flatDataConnectorOptions: CloudStorageDetailsOptions | undefined,
+  dataConnectorSecretPatchList: { name: string; value: string }[],
   stateSaveCredentials: boolean,
   validationSucceeded: boolean
 ) {
   return !!(
-    flatDataConnectorOptions &&
+    dataConnectorSecretPatchList.length > 0 &&
     stateSaveCredentials &&
     validationSucceeded
   );

client/src/features/dataConnectorsV2/components/DataConnectorModal/DataConnectorModalResult.tsx

@@ -81,10 +81,10 @@ function DataConnectorResultAlertContent({
       </li>
     ) : null;
   return (
-    <p className="mb-0">
+    <div className="mb-0">
       {dataConnectorFragment}
       {credentialSaveFragment && <ul>{credentialSaveFragment}</ul>}
       {projectLinkFragment && <ul>{projectLinkFragment}</ul>}
-    </p>
+    </div>
   );
 }

client/src/features/projectsV2/fields/ProjectNamespaceFormField.module.scss

@@ -1,3 +1,6 @@
+@import "~bootstrap/scss/functions";
+@import "~bootstrap/scss/variables";
+
 .control {
   cursor: pointer !important;
 }
@@ -14,3 +17,7 @@
     background-color: #e4e7ea80;
   }
 }
+
+.zDropdown {
+  z-index: $zindex-dropdown !important;
+}

client/src/features/projectsV2/fields/ProjectNamespaceFormField.tsx

@@ -189,7 +189,14 @@ const selectClassNames: ClassNamesConfig<ResponseNamespace, false> = {
       styles.control
     ),
   dropdownIndicator: () => cx("pe-3"),
-  menu: () => cx("bg-white", "rounded-bottom", "border", "border-top-0"),
+  menu: () =>
+    cx(
+      "bg-white",
+      "rounded-bottom",
+      "border",
+      "border-top-0",
+      styles.zDropdown
+    ),
   menuList: () => cx("d-grid"),
   option: ({ isFocused, isSelected }) =>
     cx(

tests/cypress/e2e/groupV2DataConnectorCredentials.spec.ts

@@ -111,6 +111,50 @@ describe("Set up data connectors with credentials", () => {
     cy.wait("@listDataConnectors");
   });
 
+  it("do not store credentials if there are none", () => {
+    fixtures
+      .listDataConnectors({ namespace: "test-2-group-v2" })
+      .testCloudStorage({ success: true })
+      .postDataConnector({ namespace: "test-2-group-v2" })
+      .dataConnectorSecrets({
+        fixture: "dataConnector/data-connector-secrets-empty.json",
+      })
+      .patchDataConnectorSecrets({
+        content: [],
+        // No call to postCloudStorageSecrets is expected
+        shouldNotBeCalled: true,
+      });
+    cy.visit("/v2/groups/test-2-group-v2");
+    cy.wait("@readGroupV2");
+    // add data connector
+    cy.getDataCy("add-data-connector").should("be.visible").click();
+    cy.wait("@getStorageSchema");
+
+    // Pick a provider
+    cy.getDataCy("data-storage-s3").click();
+    cy.getDataCy("data-provider-Switch").click();
+    cy.getDataCy("data-connector-edit-next-button").click();
+
+    // // Fill out the details
+    cy.get("#sourcePath").type("bucket/my-source");
+    cy.get("#endpoint").clear().type("https://s3-zh.os.switch.ch");
+    cy.getDataCy("test-data-connector-button").click();
+    cy.getDataCy("add-data-connector-continue-button")
+      .contains("Continue")
+      .click();
+    cy.getDataCy("data-connector-edit-mount").within(() => {
+      cy.get("#name").type("example storage without credentials");
+    });
+    cy.getDataCy("data-connector-edit-update-button").click();
+    cy.wait("@postDataConnector");
+    cy.getDataCy("data-connector-edit-body").should(
+      "contain.text",
+      "The data connector test-2-group-v2/example-storage-without-credentials has been successfully added."
+    );
+    cy.getDataCy("data-connector-edit-close-button").click();
+    cy.wait("@listDataConnectors");
+  });
+
   it("resets validation state when content changes", () => {
     fixtures
       .getStorageSchema({ fixture: "cloudStorage/storage-schema-s3.json" })