fix(delegations): Fix delete for GeneralMandate delegations (#16212)

* Fix delete * fix hardcoded value * fix pr comments --------- Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
island-is · Oct 2, 2024 · 1968918 · 1968918
1 parent cd5f908
commit 1968918
Showing 1 changed file with 26 additions and 13 deletions.
diff --git a/.../shared-modules/delegations/src/components/access/AccessDeleteModal/AccessDeleteModal.tsx b/.../shared-modules/delegations/src/components/access/AccessDeleteModal/AccessDeleteModal.tsx
@@ -1,11 +1,14 @@
+import { useEffect, useState } from 'react'
+
 import { useAuth } from '@island.is/auth/react'
 import { Box, toast, useBreakpoint } from '@island.is/island-ui/core'
 import { useLocale } from '@island.is/localization'
 import { formatNationalId } from '@island.is/portals/core'
 import { Problem } from '@island.is/react-spa/shared'
-import { useEffect, useState } from 'react'
-import { DelegationsFormFooter } from '../../delegations/DelegationsFormFooter'
 import { Modal, ModalProps } from '@island.is/react/components'
+import { AuthDelegationType } from '@island.is/shared/types'
+
+import { DelegationsFormFooter } from '../../delegations/DelegationsFormFooter'
 import { IdentityCard } from '../../IdentityCard/IdentityCard'
 import { AccessListContainer } from '../AccessList/AccessListContainer/AccessListContainer'
 import { useAuthScopeTreeLazyQuery } from '../AccessList/AccessListContainer/AccessListContainer.generated'
@@ -37,7 +40,7 @@ export const AccessDeleteModal = ({
     useAuthScopeTreeLazyQuery()
 
   useEffect(() => {
-    if (delegation) {
+    if (delegation && delegation.domain?.name) {
       getAuthScopeTree({
         variables: {
           input: {
@@ -132,20 +135,30 @@ export const AccessDeleteModal = ({
             />
           )}
         </Box>
-        {delegation?.domain && (
+        {delegation?.type === AuthDelegationType.GeneralMandate ? (
           <IdentityCard
             label={formatMessage(m.domain)}
-            title={delegation.domain.displayName}
-            imgSrc={delegation.domain.organisationLogoUrl}
+            title={formatMessage(m.delegationTypeGeneralMandate)}
+            imgSrc="./assets/images/skjaldarmerki.svg"
           />
+        ) : (
+          <>
+            {delegation?.domain && (
+              <IdentityCard
+                label={formatMessage(m.domain)}
+                title={delegation?.domain.displayName ?? ''}
+                imgSrc={delegation?.domain.organisationLogoUrl}
+              />
+            )}
+            <AccessListContainer
+              delegation={delegation}
+              scopes={delegation?.scopes}
+              scopeTree={authScopeTree}
+              loading={scopeTreeLoading}
+              listMarginBottom={[0, 0, 10]}
+            />
+          </>
         )}
-        <AccessListContainer
-          delegation={delegation}
-          scopes={delegation?.scopes}
-          scopeTree={authScopeTree}
-          loading={scopeTreeLoading}
-          listMarginBottom={[0, 0, 10]}
-        />
         <div {...pxProps} />
       </Box>
       <Box position="sticky" bottom={0}>