feat(serviceResource): add delegable flag to service resource to determine whether the resource itself is delegable (#3826)

Author: seanes

packages/bff-types-generated/queries/serviceResources.graphql

@@ -1,21 +1,12 @@
-query getServiceResources(
-  $ids: [String!]
-  $resourceType: [String]
-  $org: [String]
-  $onlySelfIdentifiedUserEnabled: Boolean
-) {
-  serviceResources(
-    resourceType: $resourceType
-    ids: $ids
-    org: $org
-    onlySelfIdentifiedUserEnabled: $onlySelfIdentifiedUserEnabled
-  ) {
+query getServiceResources($ids: [String!], $resourceType: [String], $org: [String]) {
+  serviceResources(resourceType: $resourceType, ids: $ids, org: $org) {
     id
     title {
       nb
       nn
       en
     }
     org
+    delegable
   }
 }

packages/bff/src/graphql/types/serviceResources/serviceResources.ts

@@ -1,5 +1,5 @@
 import { logger } from '@altinn/dialogporten-node-logger';
-import { booleanArg, extendType, list, objectType, stringArg } from 'nexus';
+import { extendType, list, objectType, stringArg } from 'nexus';
 import config from '../../../config.js';
 import type { LocalizedText, Resource } from './resourceRegistry.ts';
 import { getEnvironmentConfig } from './serviceResourcesConfig.js';
@@ -9,10 +9,10 @@ interface TransformedServiceResource {
   title: LocalizedText;
   org: string;
   resourceType: string;
-  selfIdentifiedUserEnabled: boolean;
+  delegable: boolean;
 }
 
-const serviceResourcesRedisKey = 'arbeidsflate-service-resources:v3';
+const serviceResourcesRedisKey = 'arbeidsflate-service-resources:v4';
 let refreshTimer: NodeJS.Timeout | null = null;
 
 async function fetchServiceResources(): Promise<Resource[]> {
@@ -48,8 +48,6 @@ export interface ResourceFilters {
   excludeOrgCodes?: string[];
   /** Filter by resource IDs - exclude these specific resource IDs */
   excludeIds?: string[];
-  /** Only include resources that are enabled for self-identified users */
-  onlySelfIdentifiedUserEnabled?: boolean;
   /** Only include resources that are visible */
   onlyVisible?: boolean;
   /** Only include resources that are delegable */
@@ -103,13 +101,6 @@ export async function storeServiceResourcesInRedis(filters?: ResourceFilters): P
           }
         }
 
-        // Filter by self-identified user enabled
-        if (filters.onlySelfIdentifiedUserEnabled === true) {
-          if (!resource.selfIdentifiedUserEnabled) {
-            return false;
-          }
-        }
-
         // Filter by visible resources only
         if (filters.onlyVisible === true) {
           if (!resource.visible) {
@@ -165,7 +156,7 @@ export async function storeServiceResourcesInRedis(filters?: ResourceFilters): P
         ''
       ).toLowerCase(),
       resourceType: resource.resourceType,
-      selfIdentifiedUserEnabled: resource.selfIdentifiedUserEnabled || false,
+      delegable: resource.delegable,
     }));
 
     await redisClient.set(serviceResourcesRedisKey, JSON.stringify(transformedResources), 'EX', 60 * 60 * 24); // Store for 24 hours
@@ -182,7 +173,6 @@ export async function getServiceResourcesFromRedis(filters?: {
   resourceType?: string[];
   ids?: string[];
   org?: string[];
-  onlySelfIdentifiedUserEnabled?: boolean;
 }): Promise<TransformedServiceResource[]> {
   try {
     const { default: redisClient } = await import('../../../redisClient.ts');
@@ -210,9 +200,6 @@ export async function getServiceResourcesFromRedis(filters?: {
           filters.org!.some((org) => org.toLowerCase() === resource.org.toLowerCase()),
         );
       }
-      if (filters.onlySelfIdentifiedUserEnabled === true) {
-        resources = resources.filter((resource) => resource.selfIdentifiedUserEnabled);
-      }
     }
 
     return resources;
@@ -307,6 +294,13 @@ export const ServiceResource = objectType({
         return resource.title;
       },
     });
+    t.field('delegable', {
+      type: 'Boolean',
+      description: 'Whether the service resource is delegable',
+      resolve: (resource) => {
+        return resource.delegable;
+      },
+    });
     t.string('org', {
       description: 'Organization (=service owner) code for the service resource',
       resolve: (resource) => {
@@ -344,17 +338,12 @@ export const ServiceResourceQuery = extendType({
             description: 'Filter by organization codes',
           }),
         ),
-        onlySelfIdentifiedUserEnabled: booleanArg({
-          description: 'Show only resources enabled for self-identified users',
-          default: false,
-        }),
       },
       resolve: async (_, args) => {
         const filters: {
           resourceType?: string[];
           ids?: string[];
           org?: string[];
-          onlySelfIdentifiedUserEnabled?: boolean;
         } = {};
 
         if (args.resourceType) {
@@ -375,10 +364,6 @@ export const ServiceResourceQuery = extendType({
           );
         }
 
-        if (args.onlySelfIdentifiedUserEnabled) {
-          filters.onlySelfIdentifiedUserEnabled = true;
-        }
-
         return await getServiceResourcesFromRedis(Object.keys(filters).length > 0 ? filters : undefined);
       },
     });

packages/frontend/src/api/hooks/useServiceResource.ts

@@ -19,26 +19,26 @@ interface UseServiceResourceProps {
 
 export const useServiceResource = (props: UseServiceResourceProps = {}): UseServiceResourceOutput => {
   const { resourceType, ids } = props;
-  const { isSelfIdentifiedUser, selectedParties } = useParties();
+  const { selectedParties } = useParties();
   const isServiceFilterEnabled = useFeatureFlag<boolean>('filters.enableServiceFilter');
 
   const normalizedIds = useMemo(() => (ids?.length ? [...ids].sort((a, b) => a.localeCompare(b)) : undefined), [ids]);
 
-  const variables = useMemo(() => {
-    const v: GetServiceResourcesQueryVariables = {};
-    if (isSelfIdentifiedUser) v.onlySelfIdentifiedUserEnabled = true;
-    if (resourceType) v.resourceType = resourceType;
-    if (normalizedIds?.length) v.ids = normalizedIds;
-    return Object.keys(v).length ? v : undefined;
-  }, [isSelfIdentifiedUser, resourceType, normalizedIds]);
+  const variables = useMemo<GetServiceResourcesQueryVariables | undefined>(() => {
+    if (!resourceType && !normalizedIds?.length) {
+      return undefined;
+    }
+
+    return {
+      ...(resourceType && { resourceType }),
+      ...(normalizedIds?.length && { ids: normalizedIds }),
+    };
+  }, [resourceType, normalizedIds]);
 
   const enabled = isServiceFilterEnabled && selectedParties.length > 0;
 
   const { data, isLoading, isSuccess } = useAuthenticatedQuery<GetServiceResourcesQuery>({
-    queryKey: [
-      QUERY_KEYS.SERVICE_RESOURCES,
-      { resourceType: resourceType ?? null, ids: normalizedIds ?? null, self: isSelfIdentifiedUser },
-    ],
+    queryKey: [QUERY_KEYS.SERVICE_RESOURCES, { resourceType: resourceType ?? null, ids: normalizedIds ?? null }],
     queryFn: () => fetchServiceResources(variables),
     retry: 3,
     staleTime: 1000 * 60 * 20,