Merge branch 'dev' into hotfix/PIN-7381_resolve-bug-multiple-agreements-management-in-eservice-page

Author: borgesis95

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "interop-dashboard-frontend",
-  "version": "1.6.0",
+  "version": "1.6.3",
   "type": "module",
   "scripts": {
     "dev": "vite",

package.json

@@ -22,4 +22,5 @@ window.pagopa_env = {
   FEATURE_FLAG_NOTIFICATION_CONFIG: 'true',
   FEATURE_FLAG_ESERVICE_PERSONAL_DATA: 'true',
   FEATURE_FLAG_USE_SIGNED_DOCUMENT: 'true',
+  AVATAR_BASEPATH: 'https://selc-u-checkout-cdn-endpoint.azureedge.net',
 }

public/env.js

@@ -27,6 +27,7 @@ export const testConfigs = {
   FEATURE_FLAG_NOTIFICATION_CONFIG: 'true',
   FEATURE_FLAG_ESERVICE_PERSONAL_DATA: 'true',
   FEATURE_FLAG_USE_SIGNED_DOCUMENT: 'true',
+  AVATAR_BASEPATH: 'http://selc-u-checkout-cdn-endpoint.azureedge.net',
 }
 
 // runs a cleanup after each test case (e.g. clearing jsdom)

setupTests.ts

@@ -15,13 +15,27 @@ import { MaintenanceBanner } from './components/shared/banners/MaintenanceBanner
 import { FirstLoadingSpinner } from './components/shared/FirstLoadingSpinner'
 import { queryClient } from './config/query-client'
 import type { EnvironmentBannerProps } from '@pagopa/mui-italia'
+
 import { AuthQueries } from './api/auth'
+import i18n from './config/react-i18next'
+
+// --- Init application ----
+
+const urlParams = new URLSearchParams(window.location.search)
+const redirectUrl = urlParams.get('redirectUrl')
 
-queryClient.prefetchQuery(AuthQueries.getSessionToken())
+if (redirectUrl) {
+  const selfCareIdentityToken = window.location.hash.replace('#id=', '')
+  const url = `/ui/${i18n.language}${redirectUrl}#id=${selfCareIdentityToken}`
+  window.location.replace(url)
+} else {
+  queryClient.prefetchQuery(AuthQueries.getSessionToken())
+}
+
+// end init ---
 
 function App() {
   const { t } = useTranslation('shared-components')
-
   let envBannerProps: EnvironmentBannerProps | undefined = undefined
 
   if (STAGE === 'UAT') {

src/App.tsx

@@ -623,7 +623,7 @@ export interface CatalogEService {
   id: string
   name: string
   description: string
-  producer: CompactOrganization
+  producer: CatalogTenant
   isMine: boolean
   activeDescriptor?: CompactDescriptor
   /** Indicates if there are unread notifications for this e-service */
@@ -827,6 +827,16 @@ export interface CompactOrganization {
   hasUnreadNotifications?: boolean
 }
 
+export interface CatalogTenant {
+  /** @format uuid */
+  id: string
+  name: string
+  /** Indicates if there are unread notifications for this organization */
+  hasUnreadNotifications?: boolean
+  /** @format uuid */
+  selfcareId?: string
+}
+
 export type TenantKind = 'PA' | 'PRIVATE' | 'GSP' | 'SCP'
 
 export type TargetTenantKind = 'PA' | 'PRIVATE'
@@ -1162,7 +1172,7 @@ export interface CatalogPurposeTemplate {
   targetTenantKind: TargetTenantKind
   purposeTitle: string
   purposeDescription: string
-  creator: CompactOrganization
+  creator: CatalogTenant
 }
 
 export interface CatalogPurposeTemplates {
@@ -2169,7 +2179,7 @@ export interface CatalogEServiceTemplate {
   id: string
   name: string
   description: string
-  creator: CompactOrganization
+  creator: CatalogTenant
   publishedVersion: CompactEServiceTemplateVersion
 }
 
@@ -2228,7 +2238,7 @@ export interface Problem {
    */
   detail?: string
   /** @minItems 1 */
-  errors: ProblemError[]
+  errors?: ProblemError[]
 }
 
 export interface UpdateEServiceTemplateVersionSeed {
@@ -3272,6 +3282,15 @@ export interface MarkNotificationsAsUnreadPayload {
   ids: string[]
 }
 
+export interface GetNotificationDeeplinkParams {
+  /** The selfcare ID for the institution (optional, falls back to generic URL if not provided) */
+  selfcareId?: string
+  /** The type of the notification */
+  notificationType: string
+  /** The id of the entity */
+  entityId: string
+}
+
 export namespace Consumers {
   /**
    * @description retrieves a list of consumer agreements
@@ -8562,6 +8581,7 @@ export namespace InAppNotifications {
    * @name GetNotifications
    * @summary Retrieves a list of notifications
    * @request GET:/inAppNotifications
+   * @secure
    */
   export namespace GetNotifications {
     export type RequestParams = {}
@@ -8727,6 +8747,7 @@ export namespace TenantNotificationConfigs {
    * @name GetTenantNotificationConfig
    * @summary Retrieve the tenant's notification configuration
    * @request GET:/tenantNotificationConfigs
+   * @secure
    */
   export namespace GetTenantNotificationConfig {
     export type RequestParams = {}
@@ -8741,6 +8762,7 @@ export namespace TenantNotificationConfigs {
    * @name UpdateTenantNotificationConfig
    * @summary Update the tenant's notification configuration
    * @request POST:/tenantNotificationConfigs
+   * @secure
    */
   export namespace UpdateTenantNotificationConfig {
     export type RequestParams = {}
@@ -8758,6 +8780,7 @@ export namespace UserNotificationConfigs {
    * @name GetUserNotificationConfig
    * @summary Retrieve the user's notification configuration
    * @request GET:/userNotificationConfigs
+   * @secure
    */
   export namespace GetUserNotificationConfig {
     export type RequestParams = {}
@@ -8772,6 +8795,7 @@ export namespace UserNotificationConfigs {
    * @name UpdateUserNotificationConfig
    * @summary Update the user's notification configuration
    * @request POST:/userNotificationConfigs
+   * @secure
    */
   export namespace UpdateUserNotificationConfig {
     export type RequestParams = {}
@@ -8789,6 +8813,7 @@ export namespace EmailDeepLink {
    * @name GetNotificationDeeplink
    * @summary Redirect the user to the correct deepLink based on notification type and entity id
    * @request GET:/emailDeepLink/{notificationType}/{entityId}
+   * @secure
    */
   export namespace GetNotificationDeeplink {
     export type RequestParams = {
@@ -8797,7 +8822,10 @@ export namespace EmailDeepLink {
       /** The id of the entity */
       entityId: string
     }
-    export type RequestQuery = {}
+    export type RequestQuery = {
+      /** The selfcare ID for the institution (optional, falls back to generic URL if not provided) */
+      selfcareId?: string
+    }
     export type RequestBody = never
     export type RequestHeaders = {}
     export type ResponseBody = any

src/api/api.generatedTypes.ts

@@ -1,5 +1,5 @@
 import { INTEROP_RESOURCES_BASE_URL, APP_MODE } from '@/config/env'
-import { BannerData } from '@/hooks/bannerHooks/utils'
+import type { BannerData } from '@/hooks/bannerHooks/utils'
 import axios from 'axios'
 
 async function getMaintenanceJson() {

src/api/maintenance/maintenance.services.ts

@@ -1,4 +1,5 @@
 import axiosInstance from '@/config/axios'
+import axios from 'axios'
 import {
   APP_MODE,
   BACKEND_FOR_FRONTEND_URL,
@@ -82,7 +83,7 @@ async function getNotificationsBannerConfigJson() {
     } as BannerData
   }
 
-  const response = await axiosInstance.get<BannerData>(
+  const response = await axios.get<BannerData>(
     `${INTEROP_RESOURCES_BASE_URL}/notifications-window/data.json`
   )
   return response.data

src/api/notification/notification.services.ts

@@ -21,6 +21,11 @@ vi.mock('react-i18next', () => ({
       t: (key: string) => {
         if (ns === 'mutations-feedback' && keyPrefix === 'purposeTemplate.downloadDocument') {
           return `mutations-feedback:purposeTemplate.downloadDocument.${key}`
+        } else if (
+          ns === 'mutations-feedback' &&
+          keyPrefix === 'purposeTemplate.downloadRiskAnalysis'
+        ) {
+          return `mutations-feedback:purposeTemplate.downloadRiskAnalysis.${key}`
         }
         return key
       },
@@ -84,4 +89,29 @@ describe('PurposeTemplateDownloads', () => {
       expect(result).toBe(mockDownloadFn)
     })
   })
+
+  describe('useDownloadSignedRiskAnalysis', () => {
+    it('should call useDownloadFile with correct service and labels', () => {
+      const mockUseDownloadFile = vi.fn().mockReturnValue(vi.fn())
+      vi.mocked(useDownloadFile).mockImplementation(mockUseDownloadFile)
+
+      PurposeTemplateDownloads.useDownloadSignedRiskAnalysis()
+
+      expect(useDownloadFile).toHaveBeenCalledWith(
+        PurposeTemplateServices.downloadSignedRiskAnalysis,
+        {
+          errorToastLabel: 'mutations-feedback:purposeTemplate.downloadRiskAnalysis.outcome.error',
+          loadingLabel: 'mutations-feedback:purposeTemplate.downloadRiskAnalysis.loading',
+        }
+      )
+    })
+
+    it('should return the function from useDownloadSignedRiskAnalysis', () => {
+      const mockDownloadFn = vi.fn()
+      vi.mocked(useDownloadFile).mockReturnValue(mockDownloadFn)
+
+      const result = PurposeTemplateDownloads.useDownloadSignedRiskAnalysis()
+      expect(result).toBe(mockDownloadFn)
+    })
+  })
 })

src/api/purposeTemplate/__test__/purposeTemplate.downloads.test.ts

@@ -354,15 +354,6 @@ describe('PurposeTemplateServices', () => {
         `${BACKEND_FOR_FRONTEND_URL}/purposeTemplates/test-id/archive`
       )
     })
-
-    // TODO: Update this test when real API calls are implemented
-    // it('should make correct API call to archive purpose template', async () => {
-    //   await PurposeTemplateServices.archivePurposeTemplate({ id: TEST_ID })
-    //
-    //   expect(axiosInstance.post).toHaveBeenCalledWith(
-    //     `${BACKEND_FOR_FRONTEND_URL}/purposeTemplates/test-id/archive`
-    //   )
-    // })
   })
 
   describe('updateDocumentPrettyNameForAnnotation', () => {
@@ -382,4 +373,17 @@ describe('PurposeTemplateServices', () => {
       )
     })
   })
+
+  describe('downloadSignedRiskAnalysis', () => {
+    it('should make correct API call with purpose template id', async () => {
+      const purposeTemplateId = 'template-id'
+
+      await PurposeTemplateServices.downloadSignedRiskAnalysis({ purposeTemplateId })
+
+      expect(axiosInstance.get).toHaveBeenCalledWith(
+        `${BACKEND_FOR_FRONTEND_URL}/purposeTemplates/${purposeTemplateId}/riskAnalysisDocument/signed`,
+        { responseType: 'arraybuffer' }
+      )
+    })
+  })
 })