Skip to content

Commit 2c98d58

Browse files
committed
Merge branch 'dev' into chore/PIN-8822_interface-upload-id
2 parents 31e4c53 + b05c363 commit 2c98d58

File tree

48 files changed

+898
-272
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+898
-272
lines changed

__mocks__/data/purpose.mocks.ts

Lines changed: 91 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,4 +116,94 @@ const createMockRiskAnalysisFormConfig = createMockFactory<RiskAnalysisFormConfi
116116
],
117117
})
118118

119-
export { createMockPurpose, createMockRiskAnalysisFormConfig }
119+
const createMockPurposeUsesPersonalDataAnswerNo = createMockFactory<Purpose>({
120+
id: 'purpose-id',
121+
title: 'Test Purpose',
122+
consumer: { id: 'consumer-id', name: 'Consumer Name' },
123+
eservice: {
124+
id: 'eservice-id',
125+
name: 'Test Eservice',
126+
mode: 'DELIVER',
127+
producer: { id: 'producer-id', name: 'Producer Name' },
128+
personalData: true,
129+
descriptor: {
130+
id: 'descriptor-id',
131+
state: 'PUBLISHED',
132+
version: '1',
133+
audience: ['test'],
134+
},
135+
},
136+
agreement: { id: 'agreement-id', state: 'ACTIVE', canBeUpgraded: false },
137+
riskAnalysisForm: {
138+
answers: { usesPersonalData: ['NO'] },
139+
version: '3.1',
140+
riskAnalysisId: 'risk-analysis-id',
141+
},
142+
versions: [],
143+
clients: [],
144+
description: '',
145+
isFreeOfCharge: false,
146+
dailyCallsPerConsumer: 0,
147+
dailyCallsTotal: 0,
148+
hasUnreadNotifications: false,
149+
isDocumentReady: false,
150+
})
151+
152+
const createMockPurposeUsesPersonalDataAnswerYes = createMockFactory<Purpose>({
153+
id: 'purpose-id',
154+
title: 'Test Purpose',
155+
consumer: { id: 'consumer-id', name: 'Consumer Name' },
156+
eservice: {
157+
id: 'eservice-id',
158+
name: 'Test Eservice',
159+
mode: 'DELIVER',
160+
producer: { id: 'producer-id', name: 'Producer Name' },
161+
personalData: false,
162+
descriptor: {
163+
id: 'descriptor-id',
164+
state: 'PUBLISHED',
165+
version: '1',
166+
audience: ['test'],
167+
},
168+
},
169+
agreement: { id: 'agreement-id', state: 'ACTIVE', canBeUpgraded: false },
170+
riskAnalysisForm: {
171+
answers: { usesPersonalData: ['YES'] },
172+
version: '3.1',
173+
riskAnalysisId: 'risk-analysis-id',
174+
},
175+
versions: [],
176+
clients: [],
177+
description: '',
178+
isFreeOfCharge: false,
179+
dailyCallsPerConsumer: 0,
180+
dailyCallsTotal: 0,
181+
hasUnreadNotifications: false,
182+
isDocumentReady: false,
183+
rulesetExpiration: '2030-01-01T00:00:00Z',
184+
})
185+
186+
const createMockPurposeCompatiblePersonalDataYes = createMockFactory<Purpose>({
187+
...createMockPurposeUsesPersonalDataAnswerNo(),
188+
riskAnalysisForm: {
189+
...createMockPurposeUsesPersonalDataAnswerNo().riskAnalysisForm!,
190+
answers: { usesPersonalData: ['YES'] },
191+
},
192+
})
193+
194+
const createMockPurposeCompatiblePersonalDataNo = createMockFactory<Purpose>({
195+
...createMockPurposeUsesPersonalDataAnswerYes(),
196+
riskAnalysisForm: {
197+
...createMockPurposeUsesPersonalDataAnswerYes().riskAnalysisForm!,
198+
answers: { usesPersonalData: ['NO'] },
199+
},
200+
})
201+
202+
export {
203+
createMockPurpose,
204+
createMockRiskAnalysisFormConfig,
205+
createMockPurposeUsesPersonalDataAnswerNo,
206+
createMockPurposeUsesPersonalDataAnswerYes,
207+
createMockPurposeCompatiblePersonalDataYes,
208+
createMockPurposeCompatiblePersonalDataNo,
209+
}

package-lock.json

Lines changed: 13 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "interop-dashboard-frontend",
3-
"version": "1.6.0-RC5",
3+
"version": "1.6.3",
44
"type": "module",
55
"scripts": {
66
"dev": "vite",

src/App.tsx

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,27 @@ import { MaintenanceBanner } from './components/shared/banners/MaintenanceBanner
1515
import { FirstLoadingSpinner } from './components/shared/FirstLoadingSpinner'
1616
import { queryClient } from './config/query-client'
1717
import type { EnvironmentBannerProps } from '@pagopa/mui-italia'
18+
1819
import { AuthQueries } from './api/auth'
20+
import i18n from './config/react-i18next'
21+
22+
// --- Init application ----
23+
24+
const urlParams = new URLSearchParams(window.location.search)
25+
const redirectUrl = urlParams.get('redirectUrl')
1926

20-
queryClient.prefetchQuery(AuthQueries.getSessionToken())
27+
if (redirectUrl) {
28+
const selfCareIdentityToken = window.location.hash.replace('#id=', '')
29+
const url = `/ui/${i18n.language}${redirectUrl}#id=${selfCareIdentityToken}`
30+
window.location.replace(url)
31+
} else {
32+
queryClient.prefetchQuery(AuthQueries.getSessionToken())
33+
}
34+
35+
// end init ---
2136

2237
function App() {
2338
const { t } = useTranslation('shared-components')
24-
2539
let envBannerProps: EnvironmentBannerProps | undefined = undefined
2640

2741
if (STAGE === 'UAT') {

0 commit comments

Comments
 (0)