Merge branch 'main' of github.com:datacite/bracco into 805-schema4-5-doi

datacite · Nov 23, 2023 · a7d1ea0 · a7d1ea0
2 parents 6f9d5b0 + 46bc4b9
commit a7d1ea0
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 3 deletions.
diff --git a/.github/workflows/preview-app-label.yml b/.github/workflows/preview-app-label.yml
@@ -0,0 +1,31 @@
+name: Vercel preview apps on label
+on:
+ pull_request:
+ types: [labeled]
+jobs:
+ deploy:
+ if: ${{ github.event.label.name == 'create preview app' }}
+ runs-on: ubuntu-latest
+ env:
+ SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v3
+ - name: Vercel deploy
+ uses: amondnet/[email protected]
+ with:
+ vercel-token: ${{ secrets.VERCEL_TOKEN }}
+ vercel-org-id: ${{ secrets.ORG_ID}}
+ vercel-project-id: ${{ secrets.PROJECT_ID}}
+ vercel-args: ${{ vars.VERCEL_NOCACHE == 'true' && '--force' || '' }}
+ scope: ${{ secrets.TEAM_ID}}
+ vercel-project-name: 'bracco'
+ github-comment: true
+ github-token: ${{ secrets.GITHUB_TOKEN }}
+ github-deployment: true
+ - name: Remove label
+ uses: fastruby/pr-unlabeler@v1
+ with:
+ label-to-remove: "create preview app"
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/app/routes/index.js b/app/routes/index.js
@@ -31,6 +31,9 @@ export default Route.extend({
 
  let self = this;
  this.prefixes.available().then(function(value) {
+ if (self.get('flashMessages').isDestroying || self.get('flashMessages').isDestroyed) {
+ return;
+ }
  if (value <= 0) {
  self.get('flashMessages').danger(self.prefixes.msg_zero);
  } else if (value < self.prefixes.min) {

diff --git a/app/routes/providers/show.js b/app/routes/providers/show.js
@@ -33,6 +33,9 @@ export default Route.extend({
  if (this.get('currentUser.role_id') === 'staff_admin') {
  let self = this;
  this.prefixes.available().then(function(value) {
+ if (self.get('flashMessages').isDestroying || self.get('flashMessages').isDestroyed) {
+ return;
+ }
  if (value <= 0) {
  self.get('flashMessages').danger(self.prefixes.msg_zero);
  } else if (value < self.prefixes.min) {

diff --git a/cypress/e2e/organization_admin/info.test.ts b/cypress/e2e/organization_admin/info.test.ts
@@ -181,10 +181,13 @@ describe('ACCEPTANCE: ORGANIZATION_ADMIN | INFO', () => {
  it.only('can see info when using capitalized identifier URL subdirectory', () => {
  cy.visit('/providers/DATACITE');
  cy.url().should('include', '/providers/DATACITE').then(() => {
-
- cy.wait(waitTime3)
+ // Increase timeout because requests that return these totals can be slow.
+ cy.wait(waitTime3*2)
  // Info page should be populated with non-zero graph data.
- cy.get('.graphs > a').contains(/^0$/).should('not.exist')
+ // Iterate over each element to test.
+ cy.get('.graphs > a').each(($el, index, $list) => {
+ expect($el.text()).to.match(/^[0-9]+$/)
+ })
  });
  });
 });