intermediate commit to upgrade to latest coko libs

.gitignore

@@ -53,3 +53,5 @@ packages/server/scripts/local
 !**/.yarn/releases
 !**/.yarn/sdks
 !**/.yarn/versions
+
+.claude

.prettierrc.mjs

@@ -0,0 +1,3 @@
+import { prettier } from '@coko/lint'
+
+export default prettier

.stylelintrc.mjs

@@ -0,0 +1,17 @@
+import { stylelint } from '@coko/lint'
+
+// stylelint.ignoreFiles = [
+//   'packages/client/app/components/wax-collab/src/CustomWaxToolGroups/JatsSideMenuToolGroupService/JatsSideMenu.js',
+//   'packages/client/app/components/wax-collab/src/CustomWaxToolGroups/KotahiBlockDropDownToolGroupService/KotahiBlockDropDown.js',
+//   'packages/client/app/components/wax-collab/src/CustomWaxToolGroups/AnystyleService/AnyStyleToolGroupService/AnyStyle.js',
+//   'packages/client/app/components/wax-collab/src/CustomWaxToolGroups/JatsSideMenuToolGroupService/menugroups/AcknowledgementsGroup.js',
+//   'packages/client/app/components/wax-collab/src/CustomWaxToolGroups/JatsSideMenuToolGroupService/menugroups/AppendixGroup.js',
+//   'packages/client/app/components/wax-collab/src/CustomWaxToolGroups/JatsSideMenuToolGroupService/menugroups/CitationGroup.js',
+//   'packages/client/app/components/wax-collab/src/CustomWaxToolGroups/JatsSideMenuToolGroupService/menugroups/FrontMatterGroup.js',
+//   'packages/client/app/components/wax-collab/src/CustomWaxToolGroups/JatsSideMenuToolGroupService/menugroups/FundingGroup.js',
+//   'packages/client/app/components/wax-collab/src/CustomWaxToolGroups/JatsSideMenuToolGroupService/menugroups/GlossaryGroup.js',
+//   'packages/client/app/components/wax-collab/src/CustomWaxToolGroups/JatsSideMenuToolGroupService/menugroups/KeywordGroup.js',
+//   'packages/client/app/components/wax-collab/src/CustomWaxToolGroups/ListsService/ListToolGroupService/Lists.js',
+// ]
+
+export default stylelint

cypress.config.js

@@ -1,37 +1,16 @@
 const { defineConfig } = require('cypress')
-const path = require('path')
 
-require('dotenv').config({ path: path.join(__dirname, './.env') })
-
-const serverUrl = process.env.SERVER_URL
+const serverUrl = process.env.SERVER_URL || 'http://localhost:3000'
 const e2eApiUrl = `${serverUrl}/api/e2e`
 const restoreUrl = `${e2eApiUrl}/restore`
 const seedUrl = `${e2eApiUrl}/seed`
 const createTokenUrl = `${e2eApiUrl}/createToken`
 const seedFormsUrl = `${e2eApiUrl}/seedForms`
 
 module.exports = defineConfig({
-  defaultCommandTimeout: 20000,
   viewportWidth: 1200,
   e2e: {
     baseUrl: 'http://localhost:4000',
-
-    // 🛠 Correct place for on() and task handlers
-    // setupNodeEvents(on, config) {
-    //   on('task', {
-    //     restore(name) {
-    //       if (name === 'email_notification') {
-    //         console.log('Restoring email_notification test data...')
-    //         // Your custom logic here
-    //         return null // or a promise, or true/false
-    //       }
-
-    //       return null
-    //     },
-    //   })
-
-    //   return config
-    // },
   },
   screenshotOnRunFailure: false,
   video: false,

cypress/e2e/a-journal/000-login_spec.cy.js

@@ -1,4 +1,5 @@
-/* eslint-disable jest/expect-expect */
+/* eslint-disable promise/always-return */
+
 import { DashboardPage } from '../../page-object/dashboard-page'
 import { Menu } from '../../page-object/page-component/menu'
 import { dashboard } from '../../support/routes'
@@ -12,7 +13,7 @@ describe('Login test', () => {
     cy.request('POST', `${seedUrl}/new_user`)
 
     // login as admin and validate admin is logged in
-    // eslint-disable-next-line jest/valid-expect-in-promise
+
     cy.fixture('role_names').then(name => {
       cy.login(name.role.admin, dashboard)
       // enter email

cypress/e2e/a-journal/001-docx_submission_spec.cy.js

@@ -1,12 +1,10 @@
-/* eslint-disable jest/no-commented-out-tests */
-/* eslint-disable jest/expect-expect */
+/* eslint-disable promise/always-return */
 
 import { DashboardPage } from '../../page-object/dashboard-page'
 import { SubmissionFormPage } from '../../page-object/submission-form-page'
 import { dashboard } from '../../support/routes'
 
 describe('Create a new submission', () => {
-  // eslint-disable-next-line jest/no-disabled-tests
   before(() => {
     const restoreUrl = Cypress.config('restoreUrl')
     cy.request('POST', `${restoreUrl}/commons.bootstrap`)
@@ -19,6 +17,7 @@ describe('Create a new submission', () => {
     })
 
     DashboardPage.clickSubmissionButton() // Click on new submission
+    cy.url().should('include', 'newSubmission')
   })
 
   it('can upload a manuscript and add a title', () => {

cypress/e2e/a-journal/002-assign_reviewers_spec.cy.js

@@ -1,6 +1,5 @@
-/* eslint-disable jest/expect-expect */
+/* eslint-disable promise/always-return */
 
-import { seniorEditor } from '../../fixtures/role_names'
 import { ControlPage } from '../../page-object/control-page'
 import { DashboardPage } from '../../page-object/dashboard-page'
 import { Menu } from '../../page-object/page-component/menu'
@@ -16,15 +15,7 @@ describe('Editor assigning reviewers', () => {
   })
 
   it('can assign 6 reviewers', () => {
-    // login as seniorEditor
-    cy.login(seniorEditor, dashboard)
-    cy.url().should('eq', `${Cypress.config().baseUrl}/journal/dashboard`)
-    cy.reload()
-    cy.awaitDisappearSpinner()
-
-    // eslint-disable-next-line jest/valid-expect-in-promise
     cy.fixture('role_names').then(name => {
-      // login as seniorEditor
       cy.login(name.role.seniorEditor, dashboard)
       cy.reload()
       DashboardPage.clickDashboardTab(2)
@@ -33,7 +24,7 @@ describe('Editor assigning reviewers', () => {
 
       // Invite all the reviewers
       cy.reload()
-      name.role.reviewers.forEach((reviewer, index) => {
+      name.role.reviewers.forEach(reviewer => {
         ControlPage.clickInviteReviewerDropdown()
         ControlPage.inviteReviewer(reviewer)
         // Ensure modal closes before continuing
@@ -49,6 +40,6 @@ describe('Editor assigning reviewers', () => {
 
     // Go to dashboard and verify number of invited reviewer
     Menu.clickDashboard()
-    cy.get('.ReviewStatusDonut__CenterLabel-sc-76zxfe-1').contains('6')
+    cy.getByDataTestId('donut-center-label').contains('6')
   })
 })

cypress/e2e/a-journal/003-review_spec.cy.js

@@ -1,5 +1,5 @@
-/* eslint-disable jest/valid-expect-in-promise */
-/* eslint-disable jest/expect-expect */
+/* eslint-disable promise/always-return */
+
 import { DashboardPage } from '../../page-object/dashboard-page'
 import { ReviewPage } from '../../page-object/review-page'
 import { dashboard } from '../../support/routes'
@@ -63,14 +63,14 @@ describe('Completing reviews', () => {
       cy.get('[data-testid="control-panel-team"]').click()
       cy.awaitDisappearSpinner()
       cy.get(
-        '[class*=KanbanBoard__Kanban] > :nth-child(1) > [class*=KanbanBoard__CardsWrapper] > [class*=KanbanCard]',
+        '[data-testid=kanban] > :nth-child(1) > [data-testid=kanban-cards-wrapper] > [data-testid=kanban-card]',
       ).should('contain', name.role.reviewers[5])
       // ControlPage.getInvitedReviewer
       cy.get(
-        '[class*=KanbanBoard__Kanban] > :nth-child(2) > [class*=KanbanBoard__CardsWrapper] > [class*=KanbanCard]',
+        '[data-testid=kanban] > :nth-child(2) > [data-testid=kanban-cards-wrapper] > [data-testid=kanban-card]',
       ).should('contain', name.role.reviewers[3])
       cy.get(
-        '[class*=KanbanBoard__Kanban] > :nth-child(4) > [class*=KanbanBoard__CardsWrapper] > [class*=KanbanCard]',
+        '[data-testid=kanban] > :nth-child(4) > [data-testid=kanban-cards-wrapper] > [data-testid=kanban-card]',
       ).should('contain', name.role.reviewers[1])
 
       cy.contains('See Declined (1)').should('exist')
@@ -96,7 +96,7 @@ const doReview = (name, reviewData) => {
       DashboardPage.clickDoReview()
       cy.awaitDisappearSpinner()
       cy.contains('Type of Research Object').should('exist')
-      cy.get('[class*=TabsContainer]').contains('Review').click()
+      cy.get('[data-testid=tab-container]').contains('Review').click()
       ReviewPage.getReviewCommentField().focus().type('comment', { delay: 200 })
       ReviewPage.getReviewCommentField().fillInput(reviewData.comment)
       if (reviewData.radioButton === 'accept')
@@ -106,9 +106,6 @@ const doReview = (name, reviewData) => {
       if (reviewData.radioButton === 'revise')
         ReviewPage.clickReviseRadioButton()
 
-      // eslint-disable-next-line cypress/no-unnecessary-waiting
-      cy.wait(1000)
-
       // Submit the review
       ReviewPage.clickSubmitButton()
       cy.contains('Confirm your review').should('exist')

cypress/e2e/a-journal/004-assigning_editor_spec.cy.js

@@ -1,6 +1,5 @@
-/* eslint-disable no-unused-vars */
-/* eslint-disable jest/valid-expect-in-promise */
-/* eslint-disable jest/expect-expect */
+/* eslint-disable promise/always-return */
+
 import { Menu } from '../../page-object/page-component/menu'
 import { ManuscriptsPage } from '../../page-object/manuscripts-page'
 import { ControlPage } from '../../page-object/control-page'
@@ -16,17 +15,12 @@ describe('Assigning editors and decision reject', () => {
 
     cy.fixture('submission_form_data').then(data => {
       cy.fixture('role_names').then(name => {
-        // login as admin
         cy.login(name.role.admin, dashboard)
 
-        // select Control on the Manuscripts page
         Menu.clickManuscripts()
 
         ManuscriptsPage.selectOptionWithText('Control')
-        cy.reload()
-        // added a reload here because tests were failing on an unhandled promise.
 
-        // assign seniorEditor
         ControlPage.clickAssignSeniorEditorDropdown()
         ControlPage.selectDropdownOptionByName(name.role.seniorEditor)
 
@@ -37,15 +31,23 @@ describe('Assigning editors and decision reject', () => {
         ControlPage.selectDropdownOptionByName(name.role.admin)
 
         // reject submission
-        cy.log('Admin rejects a submission.')
-        ControlPage.clickDecisionTab(1)
+        ControlPage.clickDecisionTab()
+
+        cy.intercept('POST', '/graphql').as('autoSaveEditor')
         ControlPage.fillInDecision(data.rejectedDecision)
+        cy.wait('@autoSaveEditor')
+
+        cy.intercept('POST', '/graphql').as('autoSaveReject')
         ControlPage.clickReject()
+        cy.wait('@autoSaveReject')
+
+        /* eslint-disable-next-line cypress/no-unnecessary-waiting */
+        cy.wait(1000)
         ControlPage.clickSubmit()
         ControlPage.checkSvgExists()
       })
     })
 
-    cy.contains('Dashboard').click()
+    // cy.contains('Dashboard').click()
   })
 })