feat(auth-admin): View delegation and refactor access card

libs/api/domains/auth-admin/src/lib/delegationAdmin/delegation-admin.resolver.ts

@@ -91,6 +91,17 @@ export class DelegationAdminResolver {
     return identityLoader.load(customDelegation.toNationalId)
   }
 
+  @ResolveField('createdBy', () => Identity, { nullable: true })
+  resolveCreatedByIdentity(
+    @Loader(IdentityLoader) identityLoader: IdentityDataLoader,
+    @Parent() customDelegation: DelegationDTO,
+  ) {
+    if (!customDelegation.createdByNationalId) {
+      return null
+    }
+    return identityLoader.load(customDelegation.createdByNationalId)
+  }
+
   @ResolveField('validTo', () => Date, { nullable: true })
   resolveValidTo(@Parent() delegation: DelegationDTO): Date | undefined {
     if (!delegation.validTo) {

libs/api/domains/auth/src/lib/models/delegation.model.ts

@@ -51,6 +51,9 @@ export abstract class Delegation {
   @Field(() => Identity)
   to!: Identity
 
+  @Field(() => Identity, { nullable: true })
+  createdBy?: Identity
+
   @Field(() => AuthDelegationType)
   type!: AuthDelegationType
 

libs/api/domains/auth/src/lib/resolvers/delegation.resolver.ts

@@ -128,6 +128,17 @@ export class DelegationResolver {
     )
   }
 
+  @ResolveField('createdBy', () => Identity, { nullable: true })
+  async resolveCreatedBy(
+    @Parent() delegation: DelegationDTO,
+  ): Promise<Identity | null> {
+    if (!delegation.createdByNationalId) {
+      return null
+    }
+
+    return this.identityService.getIdentity(delegation.createdByNationalId)
+  }
+
   @ResolveField('validTo', () => Date, { nullable: true })
   resolveValidTo(@Parent() delegation: DelegationDTO): Date | undefined {
     if (!delegation.validTo) {

libs/api/mocks/src/domains/auth/factories.ts

@@ -44,6 +44,11 @@ export const customDelegation = factory<AuthCustomDelegation>({
     name: faker.name.findName(),
     type: 'Person',
   }),
+  createdBy: () => ({
+    nationalId: createNationalId('person'),
+    name: faker.name.findName(),
+    type: 'Person',
+  }),
   type: 'Custom',
   provider: 'delegationdb',
   scopes: () => delegationScope.list(5),

libs/auth-api-lib/src/lib/delegations/dto/delegation.dto.ts

@@ -68,6 +68,11 @@ export class DelegationDTO {
   @IsString()
   referenceId?: string | null
 
+  @IsOptional()
+  @IsString()
+  @ApiPropertyOptional({ nullable: true, type: String })
+  createdByNationalId?: string | null
+
   @IsOptional()
   @ApiPropertyOptional({ type: [DelegationScopeDTO] })
   @IsArray()

libs/auth-api-lib/src/lib/delegations/models/delegation.model.ts

@@ -141,6 +141,7 @@ export class Delegation extends Model<
       fromNationalId: this.fromNationalId,
       toNationalId: this.toNationalId,
       toName: this.toName,
+      createdByNationalId: this.createdByNationalId,
       validTo: this.validTo,
       scopes: this.delegationScopes
         ? this.delegationScopes.map((scope) => scope.toDTO())

libs/portals/admin/delegation-admin/src/components/DelegationList.tsx

@@ -20,21 +20,25 @@ const DelegationList = ({ delegationsList, direction }: DelegationProps) => {
         {delegationsList.map((delegation) => {
           return (
             <AccessCard
-              canModify={!!delegation.referenceId} // only allow deletion of paper delegations
-              direction={direction}
               key={delegation.id}
               delegation={delegation}
-              isAdminView={true}
-              onDelete={async () => {
-                const { data } = await deleteCustomDelegationAdminMutation({
-                  variables: {
-                    id: delegation.id as string,
-                  },
-                })
-                if (data) {
-                  revalidate()
-                }
-              }}
+              isAdminView
+              variant={direction}
+              onDelete={
+                delegation.referenceId
+                  ? async () => {
+                      const { data } =
+                        await deleteCustomDelegationAdminMutation({
+                          variables: {
+                            id: delegation.id as string,
+                          },
+                        })
+                      if (data) {
+                        revalidate()
+                      }
+                    }
+                  : undefined
+              }
             />
           )
         })}

libs/portals/admin/delegation-admin/src/lib/messages.ts

@@ -63,7 +63,7 @@ export const m = defineMessages({
   },
   noEndDate: {
     id: 'admin.delegationAdmin:noEndDate',
-    defaultMessage: 'Gildis tími óendanlegur',
+    defaultMessage: 'Gildistími óendanlegur',
   },
   validTo: {
     id: 'admin.delegationAdmin:validTo',

libs/portals/shared-modules/delegations/src/components/access/AccessCard.tsx

@@ -37,7 +37,9 @@ const getTags = (delegation: AuthCustomDelegation) =>
   sortBy(
     uniqBy(
       delegation.scopes?.map((scope) => ({
-        name: scope?.apiScope ? getTagName(scope?.apiScope) : scope.displayName,
+        name: scope?.apiScope
+          ? getTagName(scope?.apiScope as AuthApiScope)
+          : scope.displayName,
         isExpired: isDateExpired(scope.validTo),
       })),
       'name',
@@ -48,15 +50,12 @@ const getTags = (delegation: AuthCustomDelegation) =>
 interface AccessCardProps {
   delegation: AuthCustomDelegation
 
-  onDelete(delegation: AuthCustomDelegation): void
-
-  onView?(delegation: AuthCustomDelegation): void
+  onDelete?: (delegation: AuthCustomDelegation) => void
+  onEdit?: (delegation: AuthCustomDelegation) => void
+  onView?: (delegation: AuthCustomDelegation) => void
+  onRenew?: (delegation: AuthCustomDelegation) => void
 
   variant?: 'outgoing' | 'incoming'
-  direction?: 'incoming' | 'outgoing'
-
-  canModify?: boolean
-  href?: string
 
   isAdminView?: boolean
 }
@@ -65,15 +64,12 @@ export const AccessCard = ({
   delegation,
   onDelete,
   onView,
+  onEdit,
+  onRenew,
   variant = 'outgoing',
-  direction = 'outgoing',
-  canModify = true,
-  href,
   isAdminView = false,
 }: AccessCardProps) => {
   const { formatMessage } = useLocale()
-  const navigate = useNavigate()
-
   const tags = useMemo(() => getTags(delegation), [delegation])
 
   const hasTags = tags.length > 0
@@ -165,15 +161,7 @@ export const AccessCard = ({
     return <Tooltip placement="bottom" as="button" text={text} />
   }
 
-  const showActions =
-    canModify &&
-    (isOutgoing ||
-      delegation.type === AuthDelegationType.Custom ||
-      delegation.type === AuthDelegationType.GeneralMandate)
-
-  const canDelete =
-    isOutgoing || (!isOutgoing && delegation.type === AuthDelegationType.Custom)
-
+  const hasActions = onView || onEdit || onDelete
   return (
     <Box
       paddingY={[2, 3, 4]}
@@ -218,7 +206,7 @@ export const AccessCard = ({
           </Box>
           <VisuallyHidden>{formatMessage(m.accessHolder)}</VisuallyHidden>
           <Text variant="h3" as="h2" color={isExpired ? 'dark300' : 'dark400'}>
-            {direction === 'outgoing'
+            {isOutgoing
               ? (delegation as AuthCustomDelegationOutgoing)?.to?.name
               : (delegation as AuthCustomDelegationIncoming)?.from?.name}
           </Text>
@@ -242,7 +230,7 @@ export const AccessCard = ({
           )}
         </Inline>
       </Box>
-      <Box marginTop={hasTags && showActions ? 2 : 0}>
+      <Box marginTop={hasTags && hasActions ? 2 : 0}>
         <Box
           display="flex"
           justifyContent={hasTags ? 'spaceBetween' : 'flexEnd'}
@@ -266,57 +254,61 @@ export const AccessCard = ({
               </Inline>
             </Box>
           )}
-          {showActions && (
+          {hasActions && (
             <Box
               display="flex"
               alignItems="center"
               justifyContent={['spaceBetween', 'flexEnd']}
               marginTop={[2, 0]}
               marginLeft={[0, 3]}
             >
-              {canDelete && (
+              {onDelete && (
                 <Button
                   variant="text"
                   icon="trash"
                   iconType="outline"
                   size="small"
                   colorScheme="destructive"
-                  onClick={() => onDelete(delegation)}
+                  onClick={() => onDelete?.(delegation)}
                   nowrap
                 >
                   {formatMessage(coreMessages.buttonDestroy)}
                 </Button>
               )}
               <Box marginLeft={3}>
-                {!isOutgoing && onView ? (
+                {onView && (
                   <Button
                     size="small"
                     variant="utility"
                     onClick={() => onView(delegation)}
                   >
                     {formatMessage(coreMessages.view)}
                   </Button>
-                ) : !isExpired && href ? (
+                )}
+                {!isExpired && onEdit ? (
                   <Button
                     icon="pencil"
                     iconType="outline"
                     size="small"
                     variant="utility"
-                    onClick={() => navigate(href)}
+                    onClick={() => onEdit(delegation)}
                   >
                     {formatMessage(coreMessages.buttonEdit)}
                   </Button>
-                ) : href ? (
-                  <Button
-                    icon="reload"
-                    iconType="outline"
-                    size="small"
-                    variant="utility"
-                    onClick={() => navigate(href)}
-                  >
-                    {formatMessage(coreMessages.buttonRenew)}
-                  </Button>
-                ) : null}
+                ) : (
+                  isExpired &&
+                  onRenew && (
+                    <Button
+                      icon="reload"
+                      iconType="outline"
+                      size="small"
+                      variant="utility"
+                      onClick={() => onRenew?.(delegation)}
+                    >
+                      {formatMessage(coreMessages.buttonRenew)}
+                    </Button>
+                  )
+                )}
               </Box>
             </Box>
           )}