squashme: minor fixes

SwissDataScienceCenter · Feb 4, 2025 · a5d23a6 · a5d23a6
1 parent 10baaf4
commit a5d23a6
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 42 deletions.
diff --git a/...nt/src/features/dataConnectorsV2/components/DataConnectorModal/DataConnectorModalBody.tsx b/...nt/src/features/dataConnectorsV2/components/DataConnectorModal/DataConnectorModalBody.tsx
@@ -315,18 +315,6 @@ export function DataConnectorMount({ project }: AddOrEditDataConnectorProps) {
             const fields: Partial<typeof field> = { ...field };
             delete fields?.ref;
             return (
-              //<DataConnectorNamespaceControl
-              //  {...fields}
-              //  projectId={projectId || ""}
-              //  className={cx(errors.namespace && "is-invalid")}
-              //  data-cy={"data-controller-namespace-input"}
-              //  id="namespace"
-              //  inputId="namespace-input"
-              //  onChange={(e) => {
-              //    field.onChange(e);
-              //    onFieldValueChange("namespace", e?.value || "");
-              //  }}
-              ///>
               <ProjectNamespaceControl
                 {...fields}
                 className={cx(errors.namespace && "is-invalid")}
@@ -338,9 +326,6 @@ export function DataConnectorMount({ project }: AddOrEditDataConnectorProps) {
                   onFieldValueChange("namespace", e?.slug ?? "");
                 }}
                 project={project}
-                value={
-                  project ? `${project.namespace}/${project.slug}` : undefined
-                }
               />
             );
           }}

diff --git a/client/src/features/dataConnectorsV2/components/DataConnectorModal/index.tsx b/client/src/features/dataConnectorsV2/components/DataConnectorModal/index.tsx
@@ -72,7 +72,7 @@ export function DataConnectorModalBodyAndFooter({
     if (dataConnector == null) {
       flattened = {
         ...flattened,
-        namespace,
+        namespace: project ? `${project.namespace}/${project.slug}` : namespace,
         visibility: project?.visibility ?? "private",
       };
     }
@@ -91,7 +91,7 @@ export function DataConnectorModalBodyAndFooter({
         schemata: schemata ?? [],
       })
     );
-  }, [dataConnector, dispatch, namespace, project?.visibility, schemata]);
+  }, [dataConnector, dispatch, namespace, project, schemata]);
 
   // Visual elements
   return (

diff --git a/client/src/features/project/components/cloudStorage/AddOrEditCloudStorage.tsx b/client/src/features/project/components/cloudStorage/AddOrEditCloudStorage.tsx
@@ -174,7 +174,6 @@ export interface AddStorageStepProps {
   storageSecrets: CloudStorageSecretGet[];
   isV2?: boolean;
   validationSucceeded: boolean;
-  projectId?: string;
 }
 
 const mapStepToElement: {
@@ -1039,7 +1038,6 @@ export function AddStorageMount({
   storage,
   state,
   validationSucceeded,
-  projectId,
 }: AddStorageStepProps) {
   const {
     control,

diff --git a/client/src/features/projectsV2/fields/ProjectNamespaceFormField.tsx b/client/src/features/projectsV2/fields/ProjectNamespaceFormField.tsx
@@ -138,7 +138,6 @@ interface NamespaceSelectorProps {
   namespaces: ResponseNamespaces;
   onChange?: (newValue: SingleValue<ResponseNamespace>) => void;
   onFetchMore?: () => void;
-  project?: Project;
 }
 
 function NamespaceSelector({
@@ -149,27 +148,10 @@ function NamespaceSelector({
   namespaces,
   onChange,
   onFetchMore,
-  project,
 }: NamespaceSelectorProps) {
-  const namespaceOptions = useMemo(() => {
-    if (!project) {
-      return namespaces;
-    }
-    return [
-      {
-        id: project.id,
-        name: project.name,
-        slug: `${project.namespace}/${project.slug}`,
-        created_by: project.created_by,
-        creation_date: project.creation_date,
-        namespace_kind: "project",
-      } as NamespaceResponse,
-      ...namespaces,
-    ];
-  }, [namespaces, project]);
   const currentValue = useMemo(
-    () => namespaceOptions.find(({ slug }) => slug === currentNamespace),
-    [namespaceOptions, currentNamespace]
+    () => namespaces.find(({ slug }) => slug === currentNamespace),
+    [namespaces, currentNamespace]
   );
 
   const components = useMemo(
@@ -183,7 +165,7 @@ function NamespaceSelector({
   return (
     <Select
       inputId={inputId}
-      options={namespaceOptions}
+      options={namespaces}
       value={currentValue}
       unstyled
       getOptionValue={(option) => option.id}
@@ -415,6 +397,23 @@ export function ProjectNamespaceControl({
     });
   }, [allNamespaces, specificNamespace, specificNamespaceRequestId]);
 
+  const allNamespacesWithProject = useMemo(() => {
+    if (!project) {
+      return allNamespaces || [];
+    }
+    return [
+      {
+        id: project.id,
+        slug: `${project.namespace}/${project.slug}`,
+        creation_date: project.creation_date,
+        created_by: project.created_by,
+        namespace_kind: "project",
+        name: `${project.namespace}/${project.slug}`,
+      } as NamespaceResponse,
+      ...(allNamespaces || []),
+    ];
+  }, [allNamespaces, project]);
+
   if (isFetching) {
     return (
       <div className={cx(className, "form-control")} id={id}>
@@ -441,10 +440,9 @@ export function ProjectNamespaceControl({
         hasMore={hasMore}
         inputId={inputId}
         isFetchingMore={namespacesPageResult.isFetching}
-        namespaces={allNamespaces}
+        namespaces={allNamespacesWithProject}
         onChange={onChange}
         onFetchMore={onFetchMore}
-        project={project}
       />
     </div>
   );