Merge branch 'refs/heads/main' into next

# Conflicts: # .github/workflows/ci_integration_test.yml # package.json # src/pages/commisionalBundles/addEditCommissionBundle/components/AddEditCommissionBundleForm.tsx # src/pages/commisionalBundles/addEditCommissionBundle/components/__tests__/AddEditCommissionBundleForm.test.tsx # src/pages/commisionalBundles/detail/components/CommissionBundleDetailConfiguration.tsx # src/pages/commisionalBundles/detail/components/__tests__/CommissionBundleDetailConfiguration.test.tsx # src/services/__mocks__/channelService.ts
pagopa · Jul 15, 2024 · ae6f7b7 · ae6f7b7
2 parents 0a8e85f + 9b42c5d
commit ae6f7b7
Show file tree

Hide file tree

Showing 4 changed files with 721 additions and 724 deletions.
diff --git a/.github/workflows/ci_integration_test.yml b/.github/workflows/ci_integration_test.yml
@@ -103,14 +103,14 @@ jobs:
           npx playwright test --workers=1 --max-failures=1 --project=chromium
 
       - name: Setup Pages
-        uses: actions/configure-pages@v5
+        uses: actions/configure-pages@983d7736d9b0ae728b81ab479565c72886d7745b # v5
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v3
+        uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa # v3
         with:
           path: './e2e/playwright-report/'
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v4
+        uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e # v4
 
   print_debug:
     runs-on: ubuntu-latest

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pagopa-selfcare-backoffice-frontend",
-  "version": "1.26.4-3-next",
+  "version": "1.27.0",
   "homepage": "ui",
   "private": true,
   "scripts": {
@@ -28,7 +28,7 @@
     "clean:api-portal": "rimraf src/api/generated/portal && rimraf openApi/generated",
     "generate:api-portal": "wget https://raw.githubusercontent.com/pagopa/pagopa-selfcare-ms-backoffice-backend/main/openapi/openapi.json -O ./openApi/portal-api-docs.json && npm run generate:client",
     "generate:api-portal-next": "wget https://raw.githubusercontent.com/pagopa/pagopa-selfcare-ms-backoffice-backend/next/openapi/openapi.json -O ./openApi/portal-api-docs.json && npm run generate:client",
-    "generate:api-portal-pr": "wget https://raw.githubusercontent.com/pagopa/pagopa-selfcare-ms-backoffice-backend/VAS-1146-cart-bool-bundle/openapi/openapi.json -O ./openApi/portal-api-docs.json && npm run generate:client",
+    "generate:api-portal-pr": "wget https://raw.githubusercontent.com/pagopa/pagopa-selfcare-ms-backoffice-backend/next/openapi/openapi.json -O ./openApi/portal-api-docs.json && npm run generate:client",
     "generate:api-portal-local": "npm run generate:client",
     "generate:client": "jq 'walk(if type == \"object\" and has(\"parameters\") then .parameters |= map(select(.name != \"X-Request-Id\")) else . end)' ./openApi/portal-api-docs.json > ./openApi/portal-api-docs.json.temp && mv ./openApi/portal-api-docs.json.temp ./openApi/portal-api-docs.json && yarn run clean:api-portal && mkdirp openApi/generated && gen-api-models --api-spec openApi/portal-api-docs.json --out-dir src/api/generated/portal --no-strict --request-types --response-decoders --client && node openApi/scripts/api-portal_fixPostGen.js"
   },