Merge branch 'main' into feat/657/allow-clientid-for-rolecheck

eclipse-tractusx · Sep 12, 2024 · a1460c1 · a1460c1
2 parents 670b9c3 + 18ec5e7
commit a1460c1
Show file tree

Hide file tree

Showing 8 changed files with 83 additions and 188 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,8 @@
 
 ### Bugfixes
 
+- fixed onClick of "Overview My Apps" button in App Release Process screen [#1022](https://github.com/eclipse-tractusx/portal-frontend/issues/1022)
+- fixed 400 Bad Request error in App Access Management -> Add Role search filter [#1057](https://github.com/eclipse-tractusx/portal-frontend/issues/1057)
 - **Connector Management**
   - fixed technical user selection
 - **IDP management**
@@ -40,56 +42,22 @@
 - **OSP Consent form**
   - Display invited company name in OSP consent form (Previously hard coded with 'BMW') [#1083](https://github.com/eclipse-tractusx/portal-frontend/pull/1083)
 
-## 2.2.0-RC3
+## 2.2.0
 
 ### Change
 
+- **Company Data Management**
+  - integrated /ready api to trigger once the new record is created [#958](https://github.com/eclipse-tractusx/portal-frontend/pull/958)
+  - enabled displaying of sharing state error details in the company overlay details page [#958](https://github.com/eclipse-tractusx/portal-frontend/pull/958)
 - **Technical User Management**
   - removed 'Inactive' filter in technical user management [#1046](https://github.com/eclipse-tractusx/portal-frontend/pull/1046)
   - updated filters view and logic [#1087](https://github.com/eclipse-tractusx/portal-frontend/pull/1087)
 - **Skipping of GX compliance service interface**
   - updated the status (skipped) in application requests and changed checkbox in connector management [#1019](https://github.com/eclipse-tractusx/portal-frontend/pull/1019)
-- **Company data**
-  - disabled csv upload [#1091](https://github.com/eclipse-tractusx/portal-frontend/pull/1091)
-
-### Bugfixes
-
-- **Company data**
-  - removed page notification on download csv template action [#1071](https://github.com/eclipse-tractusx/portal-frontend/pull/1071)
-  - fixed broken title and description in modal [#1070](https://github.com/eclipse-tractusx/portal-frontend/pull/1070)
-  - fixed translation error [#1070](https://github.com/eclipse-tractusx/portal-frontend/pull/1070)
-
-## 2.2.0-RC2
-
-### Feature
-
-- **Onboarding Service Provider Management**:
-  - created new page for onboarding service provider management [#1052](https://github.com/eclipse-tractusx/portal-frontend/pull/1052)
-- **Company data**
-  - disabled confirm button if input value is not matching with the regular expression [#1056](https://github.com/eclipse-tractusx/portal-frontend/pull/1056)
-  - fixed infinite loop issue in add New Address Modal
-  - added new csv bulk upload modal [#1056](https://github.com/eclipse-tractusx/portal-frontend/pull/1056)
-- **Service Subscription**
-  - updated auto setup api response data in the service subscription response overlay
-
-### Bugfixes
-
-- **Partner Network**
-  - changed interface of the partner network apis. add /members to the POST api and update the business logic accordingly [#1002](https://github.com/eclipse-tractusx/portal-frontend/pull/1002)
-- **Business Partner invite**
-  - fixed person name regex patter [#1040](https://github.com/eclipse-tractusx/portal-frontend/pull/1040)
-
-## 2.2.0-RC1
-
-### Change
-
+- **Connector Management**
+  - updated delete connector confirmation logic with technical user [#1076](https://github.com/eclipse-tractusx/portal-frontend/pull/1076)
 - **Page headers**
   - harmonized and standardized page headers: added consistent headers and removed unused code [#864](https://github.com/eclipse-tractusx/portal-frontend/pull/864)
-- **Company data Management**
-  - integrated /ready api to trigger once the new record is created [#958](https://github.com/eclipse-tractusx/portal-frontend/pull/958)
-  - enabled displaying of sharing state error details in the company overlay details page [#958](https://github.com/eclipse-tractusx/portal-frontend/pull/958)
-- **Business partner invite**
-  - updated first name and last name pattern to allow 2 characters in business partner invite application form [#1025](https://github.com/eclipse-tractusx/portal-frontend/pull/1025)
 
 ### Feature
 
@@ -98,6 +66,13 @@
 - **Technical User Management**
   - enhanced technical user table by adding StatusTag to the status column [#967](https://github.com/eclipse-tractusx/portal-frontend/pull/967)
   - enhanced technical user table status column by adding new status 'pending deletion' [#967](https://github.com/eclipse-tractusx/portal-frontend/pull/967)
+- **Onboarding Service Provider Management**:
+  - created new page for onboarding service provider management [#1052](https://github.com/eclipse-tractusx/portal-frontend/pull/1052)
+- **Company Data Management**
+  - added new csv bulk upload BUT it is currently not enabled: further enhancements will follow [#1056](https://github.com/eclipse-tractusx/portal-frontend/pull/1056), [#1091](https://github.com/eclipse-tractusx/portal-frontend/pull/1091)
+  - disabled confirm button if input value is not matching with the regular expression [#1056](https://github.com/eclipse-tractusx/portal-frontend/pull/1056)
+- **Service Subscription**
+  - updated auto setup api response data in the service subscription response overlay
 
 ### Technical Support
 
@@ -108,13 +83,33 @@
 
 ### Bugfixes
 
+- **Partner Network**
+  - changed BPDM interface integration so that partners are listed in the Partner Network: added /members to the POST api and updated the business logic accordingly [#1002](https://github.com/eclipse-tractusx/portal-frontend/pull/1002)
+- **Company Data Management**
+  - fixed infinite loop issue in add new address modal [#1048](https://github.com/eclipse-tractusx/portal-frontend/pull/1048)
+  - fixed broken title and description in modal [#1070](https://github.com/eclipse-tractusx/portal-frontend/pull/1070)
+  - fixed translation error [#1070](https://github.com/eclipse-tractusx/portal-frontend/pull/1070)
+- **Business Partner Invitation**
+  - updated first name and last name pattern to allow 2 characters in application form [#1025](https://github.com/eclipse-tractusx/portal-frontend/pull/1025)
+  - fixed person name regex pattern [#1040](https://github.com/eclipse-tractusx/portal-frontend/pull/1040)
 - fixed usage of scroll to top button from shared components [#868](https://github.com/eclipse-tractusx/portal-frontend/pull/868)
 - fixed naming consistency of constants: used camel case for all page paths and update corresponding usage in other files [#895](https://github.com/eclipse-tractusx/portal-frontend/pull/895)
 - removed unnecessary condition in semantic hub page's table [#979](https://github.com/eclipse-tractusx/portal-frontend/pull/979)
 - fixed unchanged text of button when user requests subscription [#985](https://github.com/eclipse-tractusx/portal-frontend/pull/985)
 - fixed height for "Admin Service Detail" page content [#1001](https://github.com/eclipse-tractusx/portal-frontend/pull/1001)
-- fixed onClick of "Overview My Apps" button in App Release Process screen [#1022](https://github.com/eclipse-tractusx/portal-frontend/issues/1022)
-- Fix 400 Bad Request error in App Access Management -> Add Role search filter [#1057](https://github.com/eclipse-tractusx/portal-frontend/issues/1057)
+
+### Known Knowns
+
+- Technical Issues and Limitations
+  - Technical User Accounts
+    - There is an issue where attempting to display details for inactive technical users results in a blank page due to a lack of necessary backend support.
+  - Long Description field in German (de) does not accept German special characters [#965](https://github.com/eclipse-tractusx/portal-frontend/pull/965).
+  - Role Upload does not work during App Release Process when using Firefox [#961](https://github.com/eclipse-tractusx/portal-frontend/pull/961).
+- Feature Support and Development
+  - Auto-setup Process Worker
+    - There is no frontend support for the extended auto-setup process worker, specifically in terms of error handling and status transparency.
+  - Registration Approval Process
+    - The frontend provides limited support for the registration approval process, particularly concerning the retriggering of jobs.
 
 ## 2.1.0
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@catena-x/portal-frontend",
-  "version": "v2.2.0-RC3",
+  "version": "v2.2.0",
   "description": "Catena-X Portal Frontend",
   "author": "Catena-X Contributors",
   "license": "Apache-2.0",

diff --git a/src/assets/locales/de/main.json b/src/assets/locales/de/main.json
@@ -675,7 +675,7 @@
       "deletemodal": {
         "title": "EDC-Connector Löschen",
         "description": "Möchten Sie den ausgewählten Connector wirklich löschen? Die Löschung kann nicht rückgängig gemacht werden.",
-        "techUserdescription": "Möchten Sie den Connector wirklich löschen? Mit der Löschung wird der Connector automatisch vom Endpunkt „Connector Discovery“ gelöscht und das Selbstbeschreibungsdokument auf inaktiv gesetzt.\n Bitte beachten Sie, dass mit dem Connector ein technischer Benutzer verbunden ist – der technische Benutzer wird ebenfalls sofort inaktiviert, wenn mit dem Löschen fortgefahren wird.",
+        "techUserdescription": "Möchten Sie den Connector wirklich löschen? Mit der Löschung wird der Connector automatisch vom Endpunkt „Connector Discovery“ gelöscht und das Selbstbeschreibungsdokument auf inaktiv gesetzt.\n Bitte beachten Sie, dass mit dem Connector ein technischer Benutzer verbunden ist. Der technische Benutzer kann gelöscht werden, wenn Sie das Kontrollkästchen unten aktivieren. Andernfalls wird nur die Zuordnung zwischen Connector und technischem Benutzer gelöscht.",
         "techUserCheckBoxLabel": "Ja, ich möchte den Connector deaktivieren, wodurch automatisch auch der erwähnte technische Benutzer gelöscht wird.",
         "techDetails": {
           "title": "Technical Details",

diff --git a/src/assets/locales/en/main.json b/src/assets/locales/en/main.json
@@ -680,7 +680,7 @@
       "deletemodal": {
         "title": "Delete Connector",
         "description": "Do you really want to delete the registered connector? Please note that the deletion is not reversable.",
-        "techUserdescription": "Do you really want to delete the connector? With the deletion the connector will be automatically deleted from the „connector discovery“ endpoint as well as the self-description document will be set to inactive.\n\n Please note, the connector has a technical user connected – the technical user will get inactived immediadetly as well when proceeding with the deletion.",
+        "techUserdescription": "Do you really want to delete the connector? With the deletion the connector will be automatically deleted from the „connector discovery“ endpoint as well as the self-description document will be set to inactive.\n\n Please note, the connector has a technical user connected - the technical user can be deleted if you select the checkbox below otherwise only the mapping between connector and technical user will be deleted.",
         "techUserCheckBoxLabel": "Yes, I want to deactivate the connector which will automatically also delete the mentioned technical user.",
         "techDetails": {
           "title": "Technical Details",

diff --git a/src/components/pages/EdcConnector/ConnectorDetailsOverlay.tsx b/src/components/pages/EdcConnector/ConnectorDetailsOverlay.tsx
@@ -32,7 +32,6 @@ import {
 } from '@catena-x/portal-shared-components'
 import {
   type ConnectorDetailsType,
-  useDeleteConnectorMutation,
   useUpdateConnectorUrlMutation,
   useFetchConnectorDetailsQuery,
   useFetchSdDocumentMutation,
@@ -66,10 +65,6 @@ const ConnectorDetailsOverlay = ({
     error: fetchError,
     refetch,
   } = useFetchConnectorDetailsQuery(overlayData?.id ?? '')
-  const [openDeleteConnector, setOpenDeleteConnector] = useState(false)
-  const [deleteConnectorSuccess, setDeleteConnectorSuccess] = useState(false)
-  const [deleteConnector] = useDeleteConnectorMutation()
-  const [deleteLoading, setDeleteLoading] = useState<boolean>(false)
   const [enableConnectorUrl, setEnableConnectorUrl] = useState(true)
   const [updateConnectorUrl] = useUpdateConnectorUrlMutation()
   const [confirmLoading, setConfirmLoading] = useState(false)
@@ -146,27 +141,6 @@ const ConnectorDetailsOverlay = ({
     }
   }
 
-  const handleDeleteConnector = async () => {
-    setDeleteLoading(true)
-    await deleteConnector(fetchConnectorDetails?.id ?? '')
-      .unwrap()
-      .then(() => {
-        setDeleteConnectorSuccess(true)
-        setDeleteLoading(false)
-      })
-      .catch((err) => {
-        setDeleteConnectorSuccess(false)
-        setDeleteLoading(false)
-        error(
-          err.status === 409
-            ? err.data.title
-            : t('content.edcconnector.details.errormessage'),
-          '',
-          err
-        )
-      })
-  }
-
   const handleUrlSubmit = async () => {
     setConfirmLoading(true)
 
@@ -300,86 +274,6 @@ const ConnectorDetailsOverlay = ({
         </Dialog>
       )}
 
-      {openDeleteConnector && (
-        <Dialog
-          open={openDeleteConnector}
-          sx={{
-            '.MuiDialog-paper': {
-              maxWidth: '45%',
-            },
-          }}
-        >
-          <DialogHeader
-            title={t('content.edcconnector.details.deleteConnector')}
-            intro={fetchConnectorDetails?.name ?? ''}
-          />
-          <DialogContent
-            sx={{
-              textAlign: 'center',
-              marginBottom: '25px',
-              padding: '0px 80px 20px 80px',
-            }}
-          >
-            <Typography variant="body2" sx={{ textAlign: 'center' }}>
-              {deleteConnectorSuccess
-                ? t('content.edcconnector.details.connectorDeletedSuccessfully')
-                : t('content.edcconnector.details.wantToDeleteConnector')}
-            </Typography>
-          </DialogContent>
-          <DialogActions>
-            {deleteConnectorSuccess ? (
-              <Button
-                variant="outlined"
-                onClick={(e) => {
-                  handleOverlayClose(e)
-                  setOpenDeleteConnector(false)
-                }}
-              >
-                {t('global.actions.close')}
-              </Button>
-            ) : (
-              <Button
-                variant="outlined"
-                onClick={() => {
-                  setOpenDeleteConnector(false)
-                }}
-              >
-                {t('global.actions.cancel')}
-              </Button>
-            )}
-
-            {deleteLoading ? (
-              <Box
-                sx={{
-                  width: '110px',
-                  display: 'flex',
-                  justifyContent: 'center',
-                }}
-              >
-                <CircleProgress
-                  size={40}
-                  step={1}
-                  interval={0.1}
-                  colorVariant={'primary'}
-                  variant={'indeterminate'}
-                  thickness={8}
-                />
-              </Box>
-            ) : (
-              !deleteConnectorSuccess && (
-                <Button
-                  variant="outlined"
-                  onClick={() => {
-                    handleDeleteConnector()
-                  }}
-                >
-                  {t('content.edcconnector.details.delete')}
-                </Button>
-              )
-            )}
-          </DialogActions>
-        </Dialog>
-      )}
       <Dialog
         open={openDialog}
         sx={{
@@ -619,17 +513,6 @@ const ConnectorDetailsOverlay = ({
                 </Grid>
               </Grid>
               <Divider sx={{ margin: '20px auto', color: 'black' }} />
-              <Button
-                variant="outlined"
-                onClick={() => {
-                  setOpenDeleteConnector(true)
-                }}
-                disabled={!userHasPortalRole(ROLES.DELETE_CONNECTORS)}
-                size="small"
-                sx={{ float: 'right' }}
-              >
-                {t('content.edcconnector.details.deleteConnector')}
-              </Button>
             </>
           )}
         </DialogContent>

diff --git a/src/components/pages/EdcConnector/DeleteConfirmationOverlay/DeleteConfirmationOverlay.tsx b/src/components/pages/EdcConnector/DeleteConfirmationOverlay/DeleteConfirmationOverlay.tsx
@@ -35,7 +35,7 @@ import Box from '@mui/material/Box'
 interface DeleteConfirmationOverlayProps {
   openDialog?: boolean
   handleOverlayClose: React.MouseEventHandler
-  handleConfirmClick: React.MouseEventHandler
+  handleConfirmClick: (status: boolean) => void
   loading?: boolean
   techUser?: {
     id: string
@@ -138,9 +138,8 @@ const DeleteConfirmationOverlay = ({
           {!loading && (
             <Button
               variant="contained"
-              disabled={techUser ? !checkBoxSelected : false}
-              onClick={(e) => {
-                handleConfirmClick(e)
+              onClick={() => {
+                handleConfirmClick(checkBoxSelected)
               }}
             >
               {t('global.actions.confirm')}