From a9b1e77550eef3c8287cca5e96ba70e74b37bdd3 Mon Sep 17 00:00:00 2001 From: Erwin Gronek Date: Tue, 10 Dec 2024 12:20:09 +0100 Subject: [PATCH 1/3] [ZARS-670][ADD]node 22 --- components.d.ts | 2 -- deploy/azure-pipelines.yml | 4 ++-- package.json | 4 ++-- src/print-module/components.d.ts | 6 +++++- tsconfig.node.json | 2 +- yarn.lock | 30 ++++++++++++++++++++++-------- 6 files changed, 32 insertions(+), 16 deletions(-) diff --git a/components.d.ts b/components.d.ts index 097cf4e..b18255f 100644 --- a/components.d.ts +++ b/components.d.ts @@ -77,7 +77,6 @@ declare module 'vue' { FdpgMemberDashboard: typeof import('./src/components/Dashboard/FdpgMemberDashboard.vue')['default'] FdpgMemberDetails: typeof import('./src/components/Proposals/Details/FdpgMemberDetails.vue')['default'] FdpgMessageBox: typeof import('./src/components/FdpgMessageBox.vue')['default'] - FdpgNote: typeof import('./src/components/FdpgNote.vue')['default'] FdpgNumberInput: typeof import('./src/components/FdpgNumberInput.vue')['default'] FdpgProposalCard: typeof import('./src/components/FdpgProposalCardPanel/FdpgProposalCard/FdpgProposalCard.vue')['default'] FdpgProposalCardPanel: typeof import('./src/components/FdpgProposalCardPanel/FdpgProposalCardPanel.vue')['default'] @@ -124,7 +123,6 @@ declare module 'vue' { ResearcherDetails: typeof import('./src/components/Proposals/Details/ResearcherDetails.vue')['default'] ReviewLabel: typeof import('./src/components/ReviewLabel.vue')['default'] RoleDialog: typeof import('./src/components/RoleDialog.vue')['default'] - RoleModal: typeof import('./src/components/RoleModal.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] RouterView: typeof import('vue-router')['RouterView'] SignDialog: typeof import('./src/components/SignDialog.vue')['default'] diff --git a/deploy/azure-pipelines.yml b/deploy/azure-pipelines.yml index ed19668..01bd300 100644 --- a/deploy/azure-pipelines.yml +++ b/deploy/azure-pipelines.yml @@ -34,8 +34,8 @@ steps: - task: NodeTool@0 inputs: - versionSpec: '20.x' - displayName: 'Install Node.js v20' + versionSpec: '22.x' + displayName: 'Install Node.js v22' - template: unit-test.template.yml parameters: diff --git a/package.json b/package.json index 8f89d3a..6cb1848 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "@pinia/testing": "^0.1.7", "@playwright/test": "^1.49.0", "@rushstack/eslint-patch": "^1.10.4", - "@tsconfig/node20": "^20.1.4", + "@tsconfig/node22": "^22.0.0", "@types/jsdom": "^21.1.7", "@types/lodash-es": "^4.17.12", "@types/node": "^22.10.1", @@ -64,6 +64,6 @@ "vue-tsc": "^2.1.10" }, "engines": { - "node": ">=20" + "node": ">=22" } } diff --git a/src/print-module/components.d.ts b/src/print-module/components.d.ts index 7fa6b1b..92f0648 100644 --- a/src/print-module/components.d.ts +++ b/src/print-module/components.d.ts @@ -1,12 +1,16 @@ /* eslint-disable */ -/* prettier-ignore */ // @ts-nocheck // Generated by unplugin-vue-components // Read more: https://github.com/vuejs/core/pull/3399 export {} +/* prettier-ignore */ declare module 'vue' { export interface GlobalComponents { + ElButton: typeof import('element-plus/es')['ElButton'] + ElCard: typeof import('element-plus/es')['ElCard'] + ElCol: typeof import('element-plus/es')['ElCol'] + ElRow: typeof import('element-plus/es')['ElRow'] RouterLink: typeof import('vue-router')['RouterLink'] RouterView: typeof import('vue-router')['RouterView'] } diff --git a/tsconfig.node.json b/tsconfig.node.json index d965d0e..9377375 100644 --- a/tsconfig.node.json +++ b/tsconfig.node.json @@ -1,5 +1,5 @@ { - "extends": "@tsconfig/node20/tsconfig.json", + "extends": "@tsconfig/node22/tsconfig.json", "include": ["vite.config.*", "vitest.config.*", "cypress.config.*", "playwright.config.*"], "compilerOptions": { "composite": true, diff --git a/yarn.lock b/yarn.lock index 02f0b33..f5e8cf8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -796,10 +796,10 @@ dependencies: "@tanstack/virtual-core" "3.5.0" -"@tsconfig/node20@^20.1.4": - version "20.1.4" - resolved "https://registry.yarnpkg.com/@tsconfig/node20/-/node20-20.1.4.tgz#3457d42eddf12d3bde3976186ab0cd22b85df928" - integrity sha512-sqgsT69YFeLWf5NtJ4Xq/xAF8p4ZQHlmGW74Nu2tD4+g5fAsposc4ZfaaPixVu4y01BEiDCWLRDCvDM5JOsRxg== +"@tsconfig/node22@^22.0.0": + version "22.0.0" + resolved "https://registry.yarnpkg.com/@tsconfig/node22/-/node22-22.0.0.tgz#0bdaf702f2b7594383d24d7b2b8d557dcfdca1ed" + integrity sha512-twLQ77zevtxobBOD4ToAtVmuYrpeYUh3qh+TEp+08IWhpsrIflVHqQ1F1CiPxQGL7doCdBIOOCF+1Tm833faNg== "@types/estree@1.0.6", "@types/estree@^1.0.6": version "1.0.6" @@ -3639,8 +3639,16 @@ std-env@^3.8.0: resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.8.0.tgz#b56ffc1baf1a29dcc80a3bdf11d7fca7c315e7d5" integrity sha512-Bc3YwwCB+OzldMxOXJIIvC6cPRWr/LxOp48CdQTOkPyk/t4JWWJbrilwBd7RJzKV8QW7tJkcgAmeuLLJugl5/w== -"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0: - name string-width-cjs +"string-width-cjs@npm:string-width@^4.2.0": + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +string-width@^4.1.0: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -3694,8 +3702,14 @@ string.prototype.trimstart@^1.0.6: define-properties "^1.1.4" es-abstract "^1.20.4" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: - name strip-ansi-cjs +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== From 20293e0d46f8605b12633f828c89ff30f3d9171b Mon Sep 17 00:00:00 2001 From: Erwin Gronek Date: Wed, 11 Dec 2024 09:06:12 +0100 Subject: [PATCH 2/3] [ZARS-670][ADD]update nvmrc --- .nvmrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.nvmrc b/.nvmrc index 3c03207..2bd5a0a 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -18 +22 From f77cb321f2e09cdfe663dc828f811c9e6219c0d5 Mon Sep 17 00:00:00 2001 From: Erwin Gronek Date: Wed, 11 Dec 2024 11:30:31 +0100 Subject: [PATCH 3/3] [ZARS-685][ADD]rename proposal draft download filename --- src/composables/use-draft-download.ts | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/composables/use-draft-download.ts b/src/composables/use-draft-download.ts index 5125a4b..44c1150 100644 --- a/src/composables/use-draft-download.ts +++ b/src/composables/use-draft-download.ts @@ -12,13 +12,15 @@ export default (proposalId: Ref, errorCb?: (...args) => void) => { try { const file = await proposalStore.getProposalPdfFile(proposalId.value) const link = document.createElement('a') + + const baseFileName = proposalStore.currentProposal?.projectAbbreviation + ? proposalStore.currentProposal.projectAbbreviation + : 'proposalExport.pdf' + + const fileName = baseFileName.split('.pdf')[0].concat('_proposal.pdf') + link.href = window.URL.createObjectURL(new Blob([file], { type: 'application/pdf' })) - link.setAttribute( - 'download', - proposalStore.currentProposal?.projectAbbreviation - ? proposalStore.currentProposal.projectAbbreviation - : 'proposalExport.pdf', - ) + link.setAttribute('download', fileName) link.click() URL.revokeObjectURL(link.href) } catch (error) {