From d081e8457ec8880e1bb34b08020dc391978a2d8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eva=20Mill=C3=A1n?= Date: Tue, 20 Feb 2024 16:14:41 +0100 Subject: [PATCH] [ui] Add support for Node.js 18-20 and drop 14-16 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Drops the support for unmantained versions 14 to 16 and adds versions 18 to 20 of Node.js. Signed-off-by: Eva Millán --- .github/workflows/docker-image.yml | 4 +- .github/workflows/release.yml | 6 +- .github/workflows/tests.yml | 10 +- ui/package.json | 7 +- .../unit/__snapshots__/mutations.spec.js.snap | 24 +- .../unit/__snapshots__/queries.spec.js.snap | 94 +- .../unit/__snapshots__/storybook.spec.js.snap | 24 +- ui/tests/unit/search.spec.js | 2 +- ui/yarn.lock | 6932 ++++++++--------- 9 files changed, 3444 insertions(+), 3659 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index c427a688..c5a066fc 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -19,7 +19,7 @@ jobs: matrix: node-version: [16.x] steps: - - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # 3.3.0 + - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # 4.0.0 - name: Setup Node ${{ matrix.node-version }} uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # 3.6.0 with: @@ -41,7 +41,7 @@ jobs: needs: [build-package] environment: docker-release steps: - - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # 3.3.0 + - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # 4.0.0 - name: Download distribution artifact uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index debeb930..ae2e4c02 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,9 +12,9 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [16.x] + node-version: [20.x] steps: - - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # 3.1.0 + - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # 4.0.0 - name: Setup Node ${{ matrix.node-version }} uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # 3.6.0 with: @@ -49,7 +49,7 @@ jobs: python-version: [3.8, 3.9] steps: - - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # 3.1.0 + - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # 4.0.0 - name: Download distribution artifact uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 257c587e..fbdf0244 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -31,7 +31,7 @@ jobs: name: Python ${{ matrix.python-version }} steps: - name: Checkout - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # 3.1.0 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # 4.0.0 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@13ae5bb136fac2878aff31522b9efb785519f984 # v4.3.0 with: @@ -62,12 +62,12 @@ jobs: strategy: matrix: - node-version: [16.x] + node-version: [18.x, 20.x] runs-on: ubuntu-latest name: Node ${{ matrix.node-version }} steps: - - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # 3.1.0 + - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # 4.0.0 - name: Setup Node ${{ matrix.node-version }} uses: actions/setup-node@v3 with: @@ -95,14 +95,14 @@ jobs: strategy: matrix: - node-version: [16.x] + node-version: [18.x, 20.x] python-version: [3.8, 3.9] runs-on: ubuntu-latest name: Node ${{ matrix.node-version }} Python ${{ matrix.python-version }} steps: - name: Checkout - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # 3.1.0 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # 4.0.0 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@13ae5bb136fac2878aff31522b9efb785519f984 # v4.3.0 with: diff --git a/ui/package.json b/ui/package.json index 5944aaf9..058de6d3 100644 --- a/ui/package.json +++ b/ui/package.json @@ -59,12 +59,11 @@ "eslint-plugin-cypress": "^2.12.1", "eslint-plugin-prettier": "^4.0.0", "eslint-plugin-vue": "^8.0.3", - "fibers": "^5.0.0", "jest": "^27.1.0", "jest-vue-preprocessor": "^1.7.1", "prettier": "^2.4.1", - "sass": "^1.26.5", - "sass-loader": "^10.2.0", + "sass": "1.26.5", + "sass-loader": "^10.4.1", "vue-cli-plugin-vuetify": "~2.5.8", "vue-loader": "^15.10.1", "vue-template-compiler": "^2.7.14", @@ -75,6 +74,6 @@ "@vue/cli-service/cli-highlight/mz/thenify-all/thenify": "3.3.1" }, "engines": { - "node": ">=14 <=16" + "node": ">=18 <=20" } } diff --git a/ui/tests/unit/__snapshots__/mutations.spec.js.snap b/ui/tests/unit/__snapshots__/mutations.spec.js.snap index 75bd3677..8f2b5d8c 100644 --- a/ui/tests/unit/__snapshots__/mutations.spec.js.snap +++ b/ui/tests/unit/__snapshots__/mutations.spec.js.snap @@ -142,6 +142,7 @@ exports[`IndividualsTable Mock query for deleteIdentity 1`] = ` customsort="[Function]" expanded="" expandicon="$expand" + filtermode="intersection" groupby="" groupdesc="" headers="[object Object],[object Object],[object Object],[object Object]" @@ -151,6 +152,7 @@ exports[`IndividualsTable Mock query for deleteIdentity 1`] = ` itemkey="uuid" items="" itemsperpage="10" + itemstyle="" loaderheight="4" loadingtext="$vuetify.dataIterator.loadingText" locale="en-US" @@ -442,6 +444,7 @@ exports[`IndividualsTable Mock query for merge 1`] = ` customsort="[Function]" expanded="" expandicon="$expand" + filtermode="intersection" groupby="" groupdesc="" headers="[object Object],[object Object],[object Object],[object Object]" @@ -451,6 +454,7 @@ exports[`IndividualsTable Mock query for merge 1`] = ` itemkey="uuid" items="" itemsperpage="10" + itemstyle="" loaderheight="4" loadingtext="$vuetify.dataIterator.loadingText" locale="en-US" @@ -742,6 +746,7 @@ exports[`IndividualsTable Mock query for moveIdentity 1`] = ` customsort="[Function]" expanded="" expandicon="$expand" + filtermode="intersection" groupby="" groupdesc="" headers="[object Object],[object Object],[object Object],[object Object]" @@ -751,6 +756,7 @@ exports[`IndividualsTable Mock query for moveIdentity 1`] = ` itemkey="uuid" items="" itemsperpage="10" + itemstyle="" loaderheight="4" loadingtext="$vuetify.dataIterator.loadingText" locale="en-US" @@ -1042,6 +1048,7 @@ exports[`IndividualsTable Mock query for unmerge 1`] = ` customsort="[Function]" expanded="" expandicon="$expand" + filtermode="intersection" groupby="" groupdesc="" headers="[object Object],[object Object],[object Object],[object Object]" @@ -1051,6 +1058,7 @@ exports[`IndividualsTable Mock query for unmerge 1`] = ` itemkey="uuid" items="" itemsperpage="10" + itemstyle="" loaderheight="4" loadingtext="$vuetify.dataIterator.loadingText" locale="en-US" @@ -1342,6 +1350,7 @@ exports[`IndividualsTable Mock query for updateEnrollment 1`] = ` customsort="[Function]" expanded="" expandicon="$expand" + filtermode="intersection" groupby="" groupdesc="" headers="[object Object],[object Object],[object Object],[object Object]" @@ -1351,6 +1360,7 @@ exports[`IndividualsTable Mock query for updateEnrollment 1`] = ` itemkey="uuid" items="" itemsperpage="10" + itemstyle="" loaderheight="4" loadingtext="$vuetify.dataIterator.loadingText" locale="en-US" @@ -1642,6 +1652,7 @@ exports[`IndividualsTable Mock query for withdraw 1`] = ` customsort="[Function]" expanded="" expandicon="$expand" + filtermode="intersection" groupby="" groupdesc="" headers="[object Object],[object Object],[object Object],[object Object]" @@ -1651,6 +1662,7 @@ exports[`IndividualsTable Mock query for withdraw 1`] = ` itemkey="uuid" items="" itemsperpage="10" + itemstyle="" loaderheight="4" loadingtext="$vuetify.dataIterator.loadingText" locale="en-US" @@ -2022,6 +2034,7 @@ exports[`OrganizationsTable Mock mutation for addDomain 1`] = ` customsort="[Function]" expanded="" expandicon="$expand" + filtermode="intersection" groupby="" groupdesc="" headers="[object Object],[object Object],[object Object]" @@ -2031,6 +2044,7 @@ exports[`OrganizationsTable Mock mutation for addDomain 1`] = ` itemkey="id" items="" itemsperpage="10" + itemstyle="" loaderheight="4" loading="true" loadingtext="$vuetify.dataIterator.loadingText" @@ -2221,6 +2235,7 @@ exports[`OrganizationsTable Mock mutation for addOrganization 1`] = ` customsort="[Function]" expanded="" expandicon="$expand" + filtermode="intersection" groupby="" groupdesc="" headers="[object Object],[object Object],[object Object]" @@ -2230,6 +2245,7 @@ exports[`OrganizationsTable Mock mutation for addOrganization 1`] = ` itemkey="id" items="" itemsperpage="10" + itemstyle="" loaderheight="4" loading="true" loadingtext="$vuetify.dataIterator.loadingText" @@ -2420,6 +2436,7 @@ exports[`OrganizationsTable Mock mutation for deleteDomain 1`] = ` customsort="[Function]" expanded="" expandicon="$expand" + filtermode="intersection" groupby="" groupdesc="" headers="[object Object],[object Object],[object Object]" @@ -2429,6 +2446,7 @@ exports[`OrganizationsTable Mock mutation for deleteDomain 1`] = ` itemkey="id" items="" itemsperpage="10" + itemstyle="" loaderheight="4" loading="true" loadingtext="$vuetify.dataIterator.loadingText" @@ -2619,6 +2637,7 @@ exports[`OrganizationsTable Mock mutation for deleteOrganization 1`] = ` customsort="[Function]" expanded="" expandicon="$expand" + filtermode="intersection" groupby="" groupdesc="" headers="[object Object],[object Object],[object Object]" @@ -2628,6 +2647,7 @@ exports[`OrganizationsTable Mock mutation for deleteOrganization 1`] = ` itemkey="id" items="" itemsperpage="10" + itemstyle="" loaderheight="4" loading="true" loadingtext="$vuetify.dataIterator.loadingText" @@ -2818,6 +2838,7 @@ exports[`OrganizationsTable Mock mutation for enroll 1`] = ` customsort="[Function]" expanded="" expandicon="$expand" + filtermode="intersection" groupby="" groupdesc="" headers="[object Object],[object Object],[object Object]" @@ -2827,6 +2848,7 @@ exports[`OrganizationsTable Mock mutation for enroll 1`] = ` itemkey="id" items="" itemsperpage="10" + itemstyle="" loaderheight="4" loading="true" loadingtext="$vuetify.dataIterator.loadingText" @@ -3104,7 +3126,6 @@ exports[`ProfileModal Mock mutation for addIdentity 1`] = ` tag="div" > - + + + + + Job ID + + + + Type + + + + Date + + + + Status + + + + + + + + + + + 41f813e5-6701-41d2-bfac-ac13e04d4858 + + + + + + unify + + + + Invalid Date + + + + + + queued + + + + + +