fix(connector management): fixed customer link selection and fixed re…

…setting values

CHANGELOG.md

@@ -6,6 +6,7 @@
 
 - **Connector Management**
   - fixed technical user selection
+  - fixed customer link selection and fixed resetting values
 
 ## 2.2.0-RC2
 

src/components/pages/EdcConnector/AddConnectorOverlay/components/ConnectorInsertForm.tsx

@@ -33,7 +33,10 @@ import {
 } from '@catena-x/portal-shared-components'
 import HelpOutlineIcon from '@mui/icons-material/HelpOutline'
 import Patterns from 'types/Patterns'
-import { ConnectType } from 'features/connector/connectorApiSlice'
+import {
+  ConnectType,
+  type EdcSubscriptionsType,
+} from 'features/connector/connectorApiSlice'
 import { Dropzone } from '../../../../shared/basic/Dropzone'
 import { useEffect, useState } from 'react'
 import './EdcComponentStyles.scss'
@@ -259,6 +262,7 @@ any) => {
   const [selectedValue, setSelectedValue] = useState<string>()
   const [serviceAccountUsers, setServiceAccountUsers] = useState([])
   const [selectedTechnicalUser, setSelectedTechnicalUser] = useState('')
+  const [selectedCustomerLink, setSelectedCustomerLink] = useState('')
 
   useEffect(() => {
     if (fetchServiceAccountUsers)
@@ -278,6 +282,16 @@ any) => {
     }
   }, [serviceAccountUsers])
 
+  useEffect(() => {
+    const selectedCustomer: EdcSubscriptionsType[] = subscriptions?.filter(
+      (item: { subscriptionId: string }) =>
+        item.subscriptionId === getValues().ConnectorSubscriptionId
+    )
+    if (selectedCustomer.length > 0) {
+      setSelectedCustomerLink(selectedCustomer[0].name ?? '')
+    }
+  }, [subscriptions])
+
   const handleTechnicalUserSubmit = () => {
     if (
       selectedValue === t('content.edcconnector.modal.createNewTechnicalUser')
@@ -612,7 +626,7 @@ any) => {
                   'content.edcconnector.modal.insertform.subscription.error'
                 ),
                 items: subscriptions,
-                defaultSelectValue: {},
+                defaultSelectValue: selectedCustomerLink ?? {},
                 keyTitle: 'name',
               }}
             />

src/components/pages/EdcConnector/AddConnectorOverlay/index.tsx

@@ -120,8 +120,10 @@ const AddConnectorOverlay = ({
   const [selected, setSelected] = useState<ConnectorType>({})
 
   useEffect(() => {
-    if (openDialog) reset(formFields)
-  }, [openDialog, reset])
+    if (openDialog || connectorStep === 0) {
+      reset(formFields)
+    }
+  }, [openDialog, reset, connectorStep])
 
   useEffect(() => {
     if (serviceAccounts && serviceAccounts?.meta?.totalPages > page) {