type cleanup

SwissDataScienceCenter · Sep 12, 2024 · ee4ca4f · ee4ca4f
1 parent 5e2c504
commit ee4ca4f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 33 deletions.
diff --git a/client/src/features/dataConnectorsV2/components/DataConnectorModal.tsx b/client/src/features/dataConnectorsV2/components/DataConnectorModal.tsx
@@ -26,7 +26,6 @@ import { Button, Modal, ModalBody, ModalFooter, ModalHeader } from "reactstrap";
 import { RtkOrNotebooksError } from "../../../components/errors/RtkErrorAlert";
 import { usePostStoragesV2ByStorageIdSecretsMutation } from "../../projectsV2/api/projectV2.enhanced-api";
 import {
-  CloudStorageGetRead,
   CloudStorageGetV2Read,
   CloudStoragePatch,
   PostStoragesV2ApiArg,
@@ -49,7 +48,6 @@ import {
 import {
   AddCloudStorageForProjectParams,
   AddCloudStorageState,
-  CloudStorage,
   CloudStorageDetails,
   CloudStorageDetailsOptions,
   CredentialSaveStatus,
@@ -74,11 +72,7 @@ import styles from "../../project/components/cloudStorage/CloudStorage.module.sc
 import DataConnectorModalBody from "./DataConnectorModalBody";
 
 interface DataConnectorModalProps {
-  currentStorage?:
-    | CloudStorage
-    | CloudStorageGetRead
-    | CloudStorageGetV2Read
-    | null;
+  currentStorage?: CloudStorageGetV2Read | null;
   isOpen: boolean;
   toggle: () => void;
   projectId: string;
@@ -256,7 +250,6 @@ export default function DataConnectorModal({
   const addOrEditStorage = useCallback(() => {
     const storageParameters:
       | AddCloudStorageForProjectParams
-      | CloudStorage
       | CloudStoragePatch = {
       name: storageDetails.name as string,
       readonly: storageDetails.readOnly ?? true,

diff --git a/client/src/features/dataConnectorsV2/components/DataConnectorModalBody.tsx b/client/src/features/dataConnectorsV2/components/DataConnectorModalBody.tsx
@@ -53,6 +53,10 @@ interface AddOrEditCloudStoragePropsV2 extends AddOrEditCloudStorageProps {
   validationSucceeded: boolean;
 }
 
+interface DataConnectorModalBodyProps extends AddCloudStorageBodyContentProps {
+  storageSecrets: CloudStorageSecretGet[];
+}
+
 export default function DataConnectorModalBody({
   addResultStorageName,
   credentialSaveStatus,
@@ -68,7 +72,7 @@ export default function DataConnectorModalBody({
   storageSecrets,
   success,
   validationSucceeded,
-}: AddCloudStorageBodyContentProps) {
+}: DataConnectorModalBodyProps) {
   if (redraw) return <Loader />;
   if (success) {
     return (

diff --git a/client/src/features/project/components/cloudStorage/CloudStorageModal.tsx b/client/src/features/project/components/cloudStorage/CloudStorageModal.tsx
@@ -24,11 +24,6 @@ import { ArrowCounterclockwise } from "react-bootstrap-icons";
 import { Button, Modal, ModalBody, ModalFooter, ModalHeader } from "reactstrap";
 
 import { RtkOrNotebooksError } from "../../../../components/errors/RtkErrorAlert";
-import {
-  CloudStorageGetRead,
-  CloudStorageGetV2Read,
-  CloudStoragePatch,
-} from "../../../projectsV2/api/storagesV2.api";
 
 import {
   findSensitive,
@@ -70,11 +65,7 @@ import {
 import styles from "./CloudStorage.module.scss";
 
 interface CloudStorageModalProps {
-  currentStorage?:
-    | CloudStorage
-    | CloudStorageGetRead
-    | CloudStorageGetV2Read
-    | null;
+  currentStorage?: CloudStorage | null;
   isOpen: boolean;
   toggle: () => void;
   projectId: string;
@@ -247,10 +238,7 @@ export default function CloudStorageModal({
   }, [storageDetails, validateCloudStorageConnection]);
 
   const addOrEditStorage = useCallback(() => {
-    const storageParameters:
-      | AddCloudStorageForProjectParams
-      | CloudStorage
-      | CloudStoragePatch = {
+    const storageParameters: AddCloudStorageForProjectParams | CloudStorage = {
       name: storageDetails.name as string,
       readonly: storageDetails.readOnly ?? true,
       project_id: `${projectId}`,
@@ -382,12 +370,6 @@ export default function CloudStorageModal({
     : "Please go back and select a provider";
   const isResultLoading = isAddResultLoading || isModifyResultLoading;
 
-  const storageSecrets =
-    currentStorage != null && "secrets" in currentStorage
-      ? currentStorage.secrets ?? []
-      : [];
-  const hasStoredCredentialsInConfig = storageSecrets.length > 0;
-
   return (
     <Modal
       backdrop="static"
@@ -419,7 +401,6 @@ export default function CloudStorageModal({
           setStorageDetailsSafe={setStorageDetailsSafe}
           state={state}
           storageDetails={storageDetails}
-          storageSecrets={storageSecrets}
           storageId={storageId}
           success={success}
           validationSucceeded={validationSucceeded}
@@ -463,7 +444,7 @@ export default function CloudStorageModal({
             addOrEditStorage={addOrEditStorage}
             disableAddButton={disableAddButton}
             disableContinueButton={disableContinueButton}
-            hasStoredCredentialsInConfig={hasStoredCredentialsInConfig}
+            hasStoredCredentialsInConfig={false}
             isResultLoading={isResultLoading}
             setStateSafe={setStateSafe}
             setValidationSucceeded={setValidationSucceeded}

diff --git a/client/src/features/project/components/cloudStorage/cloudStorageModalComponents.tsx b/client/src/features/project/components/cloudStorage/cloudStorageModalComponents.tsx
@@ -42,7 +42,6 @@ import {
   CloudStorageSchema,
   CredentialSaveStatus,
 } from "./projectCloudStorage.types";
-import type { CloudStorageSecretGet } from "../../../../features/projectsV2/api/storagesV2.api";
 
 import { SerializedError } from "@reduxjs/toolkit";
 
@@ -107,7 +106,6 @@ export interface AddCloudStorageBodyContentProps
   ) => void;
   state: AddCloudStorageState;
   storageDetails: CloudStorageDetails;
-  storageSecrets: CloudStorageSecretGet[];
   success: boolean;
   validationSucceeded: boolean;
 }