Merge pull request #1191 from ORCID/update-workflow-dependency-versions

update dep versions
ORCID · May 21, 2024 · 9d850b1 · 9d850b1
2 parents e80822a + 7b42202
commit 9d850b1
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 21 deletions.
diff --git a/.github/workflows/cypress new ui.yml b/.github/workflows/cypress new ui.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: "Create creds json"
         id: create-creds-json
         uses: jsdaniell/[email protected]
@@ -31,17 +31,17 @@ jobs:
           json: '{"access_token":"${{secrets.CY_TOKEN_ACCESS}}","refresh_token":"${{secrets.CY_TOKEN_REFRESH}}","scope":"https://www.googleapis.com/auth/gmail.readonly https://www.googleapis.com/auth/gmail.send","token_type":"Bearer","expiry_date":${{secrets.CY_TOKEN_EXPIRY_DATE}}}'
           dir: "ui/cypress/plugins"
       - name: Cypress run
-        uses: cypress-io/github-action@v2
+        uses: cypress-io/github-action@v6
         with:
           install-command: npm install cypress --legacy-peer-deps
           working-directory: ui
           spec: cypress/e2e/retention/csv-add-affiliations.cy.js
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-screenshots
           path: ui/cypress/screenshots
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-videos
@@ -50,7 +50,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: "Create creds json"
         id: create-creds-json
         uses: jsdaniell/[email protected]
@@ -73,18 +73,18 @@ jobs:
           json: '{"access_token":"${{secrets.CY_TOKEN_ACCESS}}","refresh_token":"${{secrets.CY_TOKEN_REFRESH}}","scope":"https://www.googleapis.com/auth/gmail.readonly https://www.googleapis.com/auth/gmail.send","token_type":"Bearer","expiry_date":${{secrets.CY_TOKEN_EXPIRY_DATE}}}'
           dir: "ui/cypress/plugins"
       - name: Cypress run
-        uses: cypress-io/github-action@v2
+        uses: cypress-io/github-action@v6
         with:
           install-command: npm install cypress --legacy-peer-deps
           working-directory: ui
           spec: |
             cypress/e2e/retention/csv-edit-affiliations.cy.js
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-screenshots
           path: ui/cypress/screenshots
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-videos
@@ -93,7 +93,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: "Create creds json"
         id: create-creds-json
         uses: jsdaniell/[email protected]
@@ -116,18 +116,18 @@ jobs:
           json: '{"access_token":"${{secrets.CY_TOKEN_ACCESS}}","refresh_token":"${{secrets.CY_TOKEN_REFRESH}}","scope":"https://www.googleapis.com/auth/gmail.readonly https://www.googleapis.com/auth/gmail.send","token_type":"Bearer","expiry_date":${{secrets.CY_TOKEN_EXPIRY_DATE}}}'
           dir: "ui/cypress/plugins"
       - name: Cypress run
-        uses: cypress-io/github-action@v2
+        uses: cypress-io/github-action@v6
         with:
           install-command: npm install cypress --legacy-peer-deps
           working-directory: ui
           spec: |
             cypress/e2e/retention/add-affiliation.cy.js
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-screenshots
           path: ui/cypress/screenshots
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-videos
@@ -136,7 +136,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: "Create creds json"
         id: create-creds-json
         uses: jsdaniell/[email protected]
@@ -159,18 +159,18 @@ jobs:
           json: '{"access_token":"${{secrets.CY_TOKEN_ACCESS}}","refresh_token":"${{secrets.CY_TOKEN_REFRESH}}","scope":"https://www.googleapis.com/auth/gmail.readonly https://www.googleapis.com/auth/gmail.send","token_type":"Bearer","expiry_date":${{secrets.CY_TOKEN_EXPIRY_DATE}}}'
           dir: "ui/cypress/plugins"
       - name: Cypress run
-        uses: cypress-io/github-action@v2
+        uses: cypress-io/github-action@v6
         with:
           install-command: npm install cypress --legacy-peer-deps
           working-directory: ui
           spec: |
             cypress/e2e/retention/notifications.cy.js
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-screenshots
           path: ui/cypress/screenshots
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-videos
@@ -179,7 +179,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: "Create creds json"
         id: create-creds-json
         uses: jsdaniell/[email protected]
@@ -202,7 +202,7 @@ jobs:
           json: '{"access_token":"${{secrets.CY_TOKEN_ACCESS}}","refresh_token":"${{secrets.CY_TOKEN_REFRESH}}","scope":"https://www.googleapis.com/auth/gmail.readonly https://www.googleapis.com/auth/gmail.send","token_type":"Bearer","expiry_date":${{secrets.CY_TOKEN_EXPIRY_DATE}}}'
           dir: "ui/cypress/plugins"
       - name: Cypress run
-        uses: cypress-io/github-action@v2
+        uses: cypress-io/github-action@v6
         with:
           install-command: npm install cypress --legacy-peer-deps
           working-directory: ui
@@ -221,12 +221,12 @@ jobs:
             cypress/e2e/retention/ui-homepage.cy.js
             cypress/e2e/retention/ui-homepage-edit.cy.js
             cypress/e2e/retention/ui-reports.cy.js
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-screenshots
           path: ui/cypress/screenshots
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-videos

diff --git a/ui/.gitignore b/ui/.gitignore
@@ -46,6 +46,6 @@ Thumbs.db
 /cypress/plugins/token_qa.json
 /cypress/fixtures/credentials.json
 /cypress/fixtures/downloadedAffiliations.csv
-/cypress/fixtures/editAffiliations.csv
+# /cypress/fixtures/editAffiliations.csv
 /cypress/videos
 /cypress/screenshots
diff --git a/ui/cypress/fixtures/editAffiliations.csv b/ui/cypress/fixtures/editAffiliations.csv
@@ -0,0 +1,8 @@
+email,affiliation-section,department-name,role-title,start-date,end-date,org-name,org-country,org-city,org-region,disambiguation-source,disambiguated-organization-identifier,external-id,external-id-type,external-id-url,url,id
+[email protected],INVITED_POSITION,"  !@#$%^&*()-=_  斯的 2024-05-20t16-45-52  ","  !@#$%^&*()-=_  斯的 2024-05-20t16-45-52  ",,,"  !@#$%^&*()-=_  斯的 2024-05-20t16-45-52  ",AL,"  !@#$%^&*()-=_  斯的 2024-05-20t16-45-52  ",,ROR,https://ror.org/04z60tq39,,,,,626bcaacadbe1d00081abab3
+[email protected],DISTINCTION,"  !@#$%^&*()-=_  斯的 2024-05-20t16-45-52  ","  !@#$%^&*()-=_  斯的 2024-05-20t16-45-52  ",,,"  !@#$%^&*()-=_  斯的 2024-05-20t16-45-52  ",AL,"  !@#$%^&*()-=_  斯的 2024-05-20t16-45-52  ",,ROR,https://ror.org/04z60tq39,,,,,626bcadbadbe1d00081abab4
+[email protected],MEMBERSHIP,"  !@#$%^&*()-=_  斯的 2024-05-20t16-45-52  ","  !@#$%^&*()-=_  斯的 2024-05-20t16-45-52  ",,,"  !@#$%^&*()-=_  斯的 2024-05-20t16-45-52  ",AL,"  !@#$%^&*()-=_  斯的 2024-05-20t16-45-52  ",,ROR,https://ror.org/04z60tq39,,,,,626bcaf3adbe1d00081abab5
+[email protected],SERVICE,"  !@#$%^&*()-=_  斯的 2024-05-20t16-45-52  ","  !@#$%^&*()-=_  斯的 2024-05-20t16-45-52  ",,,"  !@#$%^&*()-=_  斯的 2024-05-20t16-45-52  ",AL,"  !@#$%^&*()-=_  斯的 2024-05-20t16-45-52  ",,ROR,https://ror.org/04z60tq39,,,,,626bcb07adbe1d00081abab6
+[email protected],QUALIFICATION,"  !@#$%^&*()-=_  斯的 2024-05-20t16-45-52  ","  !@#$%^&*()-=_  斯的 2024-05-20t16-45-52  ",,,"  !@#$%^&*()-=_  斯的 2024-05-20t16-45-52  ",AL,"  !@#$%^&*()-=_  斯的 2024-05-20t16-45-52  ",,ROR,https://ror.org/04z60tq39,,,,,626bcb67adbe1d00081abab7
+[email protected],EMPLOYMENT,"  !@#$%^&*()-=_  斯的 2024-05-20t16-45-52  ","  !@#$%^&*()-=_  斯的 2024-05-20t16-45-52  ",,,"  !@#$%^&*()-=_  斯的 2024-05-20t16-45-52  ",AL,"  !@#$%^&*()-=_  斯的 2024-05-20t16-45-52  ",,ROR,https://ror.org/04z60tq39,,,,,626bcb7dadbe1d00081abab8
+[email protected],EDUCATION,"  !@#$%^&*()-=_  斯的 2024-05-20t16-45-52  ","  !@#$%^&*()-=_  斯的 2024-05-20t16-45-52  ",,,"  !@#$%^&*()-=_  斯的 2024-05-20t16-45-52  ",AL,"  !@#$%^&*()-=_  斯的 2024-05-20t16-45-52  ",,ROR,https://ror.org/04z60tq39,,,,,626bc955adbe1d00081abaaf