fix: add new route structure (#559)

* fix: add new route structure

* test: update tests to route changes

* refactor: update internal routes to new routing pattern

* test: update cypress links to new routing pattern

* test: add checkjobtype test

* chore: rename checkjobtype to jobvieworedit

* fix: ensure queues can not be named add

cypress/integration/add-route/back-to-all-jobs/index.js

@@ -1,7 +1,7 @@
 import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps'
 
 Given('the user navigated to the add job page', () => {
-    cy.visit('/#/add')
+    cy.visit('/#/job/add')
     cy.findByRole('heading', { name: 'New Job' }).should('exist')
 })
 

cypress/integration/add-route/create-parameter-jobs/index.js

@@ -23,7 +23,7 @@ const saveAndExpect = (expected) => {
  */
 
 Given('the user navigated to the add job page', () => {
-    cy.visit('/#/add')
+    cy.visit('/#/job/add')
     cy.findByRole('heading', { name: 'New Job' }).should('exist')
 })
 

cypress/integration/add-route/create-parameterless-jobs/index.js

@@ -23,7 +23,7 @@ const saveAndExpect = (expected) => {
  */
 
 Given('the user navigated to the add job page', () => {
-    cy.visit('/#/add')
+    cy.visit('/#/job/add')
     cy.findByRole('heading', { name: 'New Job' }).should('exist')
 })
 

cypress/integration/add-route/cron-presets/index.js

@@ -1,7 +1,7 @@
 import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps'
 
 Given('the user navigated to the add job page', () => {
-    cy.visit('/#/add')
+    cy.visit('/#/job/add')
     cy.findByRole('heading', { name: 'New Job' }).should('exist')
 })
 

cypress/integration/add-route/info-link/index.js

@@ -4,7 +4,7 @@ const infoHref =
     'https://docs.dhis2.org/en/use/user-guides/dhis-core-version-236/maintaining-the-system/scheduling.html'
 
 Given('the user navigated to the add job page', () => {
-    cy.visit('/#/add')
+    cy.visit('/#/job/add')
     cy.findByRole('heading', { name: 'New Job' }).should('exist')
 })
 

cypress/integration/add-sequence/back-to-all-jobs/index.js

@@ -1,7 +1,7 @@
 import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps'
 
 Given('the user navigated to the add sequence page', () => {
-    cy.visit('/#/add-sequence')
+    cy.visit('/#/queue/add')
     cy.findByRole('heading', { name: 'New Sequence' }).should('exist')
 })
 

cypress/integration/add-sequence/create-sequence/index.js

@@ -28,7 +28,7 @@ Given('two unqueued jobs exist', () => {
 })
 
 Given('the user navigated to the add sequence page', () => {
-    cy.visit('/#/add-sequence')
+    cy.visit('/#/queue/add')
     cy.findByRole('heading', { name: 'New Sequence' }).should('exist')
 })
 

cypress/integration/edit-route/back-to-all-jobs/index.js

@@ -8,7 +8,7 @@ Given('a single user job exists', () => {
 })
 
 Given('the user navigated to the edit job page', () => {
-    cy.visit('/#/edit/lnWRZN67iDU')
+    cy.visit('/#/job/lnWRZN67iDU')
     cy.findByRole('heading', { name: 'Job: Job 1' }).should('exist')
 })
 

cypress/integration/edit-route/cron-presets/index.js

@@ -8,7 +8,7 @@ Given('a single cron scheduled user job exists', () => {
 })
 
 Given('the user navigated to the edit job page', () => {
-    cy.visit('/#/edit/lnWRZN67iDU')
+    cy.visit('/#/job/lnWRZN67iDU')
     cy.findByRole('heading', { name: 'Job: Job 1' }).should('exist')
 })
 

cypress/integration/edit-route/delete-button/index.js

@@ -8,7 +8,7 @@ Given('a single user job exists', () => {
 })
 
 Given('the user navigated to the edit job page', () => {
-    cy.visit('/#/edit/lnWRZN67iDU')
+    cy.visit('/#/job/lnWRZN67iDU')
     cy.findByRole('heading', { name: 'Job: Job 1' }).should('exist')
 })
 

cypress/integration/edit-route/display-jobs/index.js

@@ -12,7 +12,7 @@ Given('the user navigated to the edit job page', () => {
     const now = new Date(2021, 3, 10).getTime()
     cy.clock(now)
 
-    cy.visit('/#/edit/lnWRZN67iDU')
+    cy.visit('/#/job/lnWRZN67iDU')
     cy.findByRole('heading', { name: 'Job: Job 1' }).should('exist')
 })
 

cypress/integration/edit-route/edit-parameter-jobs/index.js

@@ -41,7 +41,7 @@ Given('a single user job exists', () => {
 })
 
 Given('the user navigated to the edit job page', () => {
-    cy.visit('/#/edit/lnWRZN67iDU')
+    cy.visit('/#/job/lnWRZN67iDU')
     cy.findByRole('heading', { name: 'Job: Job 1' }).should('exist')
 })
 

cypress/integration/edit-route/edit-parameterless-jobs/index.js

@@ -41,7 +41,7 @@ Given('a single user job with parameters exists', () => {
 })
 
 Given('the user navigated to the edit job page', () => {
-    cy.visit('/#/edit/lnWRZN67iDU')
+    cy.visit('/#/job/lnWRZN67iDU')
     cy.findByRole('heading', { name: 'Job: Job 1' }).should('exist')
 })
 

cypress/integration/edit-route/info-link/index.js

@@ -11,7 +11,7 @@ Given('a single user job exists', () => {
 })
 
 Given('the user navigated to the edit job page', () => {
-    cy.visit('/#/edit/lnWRZN67iDU')
+    cy.visit('/#/job/lnWRZN67iDU')
     cy.findByRole('heading', { name: 'Job: Job 1' }).should('exist')
 })
 

cypress/integration/edit-sequence/back-to-all-jobs/index.js

@@ -8,7 +8,7 @@ Given('a sequence exists', () => {
 })
 
 Given('the user navigates to the edit sequence page', () => {
-    cy.visit('/#/edit-sequence/RWcaltWoKuN')
+    cy.visit('/#/queue/RWcaltWoKuN')
     cy.findByRole('heading', { name: 'Sequence: one' }).should('exist')
 })
 

cypress/integration/edit-sequence/edit-sequence/index.js

@@ -35,7 +35,7 @@ Given('two unqueued jobs exist', () => {
 })
 
 Given('the user navigates to the edit sequence page', () => {
-    cy.visit('/#/edit-sequence/RWcaltWoKuN')
+    cy.visit('/#/queue/RWcaltWoKuN')
     cy.findByRole('heading', { name: 'Sequence: one' }).should('exist')
 })
 

cypress/integration/list-route/new-job/index.js

@@ -8,5 +8,5 @@ Given('the user navigated to the job list page', () => {
 Then('there is a link to the new job page', () => {
     cy.findByRole('link', { name: 'New job' })
         .should('exist')
-        .should('have.attr', 'href', '#/add')
+        .should('have.attr', 'href', '#/job/add')
 })

cypress/integration/view-route/back-to-all-jobs/index.js

@@ -8,7 +8,7 @@ Given('a single system job exists', () => {
 })
 
 Given('the user navigated to the view job page', () => {
-    cy.visit('/#/view/sHMedQF7VYa')
+    cy.visit('/#/job/sHMedQF7VYa')
     cy.findByRole('heading', { name: 'System job: System Job 1' }).should(
         'exist'
     )

cypress/integration/view-route/display-jobs/index.js

@@ -12,7 +12,7 @@ Given('the user navigated to the view job page', () => {
     const now = new Date(2021, 3, 10).getTime()
     cy.clock(now)
 
-    cy.visit('/#/view/sHMedQF7VYa')
+    cy.visit('/#/job/sHMedQF7VYa')
     cy.findByRole('heading', { name: 'System job: System Job 1' }).should(
         'exist'
     )

cypress/integration/view-route/info-link/index.js

@@ -11,7 +11,7 @@ Given('a single system job exists', () => {
 })
 
 Given('the user navigated to the view job page', () => {
-    cy.visit('/#/view/sHMedQF7VYa')
+    cy.visit('/#/job/sHMedQF7VYa')
     cy.findByRole('heading', { name: 'System job: System Job 1' }).should(
         'exist'
     )

i18n/en.pot

@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2023-08-03T07:44:07.705Z\n"
-"PO-Revision-Date: 2023-08-03T07:44:07.705Z\n"
+"POT-Creation-Date: 2023-08-15T13:43:45.474Z\n"
+"PO-Revision-Date: 2023-08-15T13:43:45.474Z\n"
 
 msgid "Something went wrong"
 msgstr "Something went wrong"
@@ -231,6 +231,16 @@ msgstr "Are you sure you want to run this job?"
 msgid "Run"
 msgstr "Run"
 
+msgid "Could not load requested job"
+msgstr "Could not load requested job"
+
+msgid ""
+"Something went wrong whilst loading the requested job. Make sure it has not "
+"been deleted and try refreshing the page."
+msgstr ""
+"Something went wrong whilst loading the requested job. Make sure it has not "
+"been deleted and try refreshing the page."
+
 msgid "Toggle job"
 msgstr "Toggle job"
 
@@ -243,16 +253,6 @@ msgstr "Configuration"
 msgid "About job configuration"
 msgstr "About job configuration"
 
-msgid "Could not load requested job"
-msgstr "Could not load requested job"
-
-msgid ""
-"Something went wrong whilst loading the requested job. Make sure it has not "
-"been deleted and try refreshing the page."
-msgstr ""
-"Something went wrong whilst loading the requested job. Make sure it has not "
-"been deleted and try refreshing the page."
-
 msgid "Job: {{ name }}"
 msgstr "Job: {{ name }}"
 

src/components/FormFields/NameField.js

@@ -6,23 +6,50 @@ import {
     hasValue,
     string,
 } from '@dhis2/ui'
+import PropTypes from 'prop-types'
 import i18n from '@dhis2/d2-i18n'
 
 const { Field } = ReactFinalForm
 
 // The key under which this field will be sent to the backend
 const FIELD_NAME = 'name'
-const VALIDATOR = composeValidators(string, hasValue)
-
-const NameField = () => (
-    <Field
-        name={FIELD_NAME}
-        component={InputFieldFF}
-        validate={VALIDATOR}
-        label={i18n.t('Name')}
-        type="text"
-        required
-    />
-)
+
+// Validation
+const restrictedNames = (value) => {
+    if (typeof value !== 'string') {
+        return
+    }
+
+    return value.toLowerCase() === 'add'
+        ? i18n.t('Queues can\'t be named "Add" or "add"')
+        : undefined
+}
+const defaultValidators = [string, hasValue]
+const queueValidators = [...defaultValidators, restrictedNames]
+
+const NameField = ({ isQueue }) => {
+    const validators = isQueue ? queueValidators : defaultValidators
+
+    return (
+        <Field
+            name={FIELD_NAME}
+            component={InputFieldFF}
+            validate={composeValidators(...validators)}
+            label={i18n.t('Name')}
+            type="text"
+            required
+        />
+    )
+}
+
+NameField.defaultProps = {
+    isQueue: false,
+}
+
+const { bool } = PropTypes
+
+NameField.propTypes = {
+    isQueue: bool,
+}
 
 export default NameField

src/components/FormFields/NameField.test.js

@@ -27,4 +27,56 @@ describe('<NameField>', () => {
 
         expect(actual).toEqual(expect.stringMatching(expected))
     })
+
+    it('does not allow naming a queue "Add"', () => {
+        const expected = 'Queues can\'t be named "Add" or "add"'
+        const wrapper = mount(
+            <Form onSubmit={() => {}}>
+                {({ handleSubmit }) => (
+                    <form onSubmit={handleSubmit}>
+                        <NameField isQueue />
+                    </form>
+                )}
+            </Form>
+        )
+
+        wrapper
+            .find('input[name="name"]')
+            .simulate('change', { target: { value: 'Add' } })
+
+        // Trigger validation
+        wrapper.find('form').simulate('submit')
+
+        const actual = wrapper
+            .find({ 'data-test': 'dhis2-uiwidgets-inputfield-validation' })
+            .text()
+
+        expect(actual).toEqual(expect.stringMatching(expected))
+    })
+
+    it('does not allow naming a queue "add"', () => {
+        const expected = 'Queues can\'t be named "Add" or "add"'
+        const wrapper = mount(
+            <Form onSubmit={() => {}}>
+                {({ handleSubmit }) => (
+                    <form onSubmit={handleSubmit}>
+                        <NameField isQueue />
+                    </form>
+                )}
+            </Form>
+        )
+
+        wrapper
+            .find('input[name="name"]')
+            .simulate('change', { target: { value: 'add' } })
+
+        // Trigger validation
+        wrapper.find('form').simulate('submit')
+
+        const actual = wrapper
+            .find({ 'data-test': 'dhis2-uiwidgets-inputfield-validation' })
+            .text()
+
+        expect(actual).toEqual(expect.stringMatching(expected))
+    })
 })

src/components/Forms/SequenceAddForm.js

@@ -20,7 +20,7 @@ const SequenceAddForm = ({
     return (
         <form onSubmit={handleSubmit}>
             <Box maxWidth="600px">
-                <NameField />
+                <NameField isQueue />
             </Box>
             <Box marginTop="16px" maxWidth="400px">
                 <CronField />

src/components/Forms/SequenceEditForm.js

@@ -23,7 +23,7 @@ const SequenceEditForm = ({
     return (
         <form onSubmit={handleSubmit}>
             <Box maxWidth="600px">
-                <NameField />
+                <NameField isQueue />
             </Box>
             <Box marginTop="16px" maxWidth="400px">
                 <CronField />

src/components/Forms/SequenceEditForm.test.js

@@ -18,6 +18,7 @@ describe('<SequenceEditForm>', () => {
     it('shows submit errors if there are any', () => {
         const message = 'Generic submit error'
         const props = {
+            name: 'name',
             handleSubmit: () => {},
             pristine: false,
             submitting: false,
@@ -41,6 +42,7 @@ describe('<SequenceEditForm>', () => {
 
     it('shows a spinner when submitting', () => {
         const props = {
+            name: 'name',
             handleSubmit: () => {},
             pristine: false,
             submitting: true,
@@ -71,6 +73,7 @@ describe('<SequenceEditForm>', () => {
 
     it('disables the submit button when pristine', () => {
         const props = {
+            name: 'name',
             handleSubmit: () => {},
             pristine: true,
             submitting: false,
@@ -96,6 +99,7 @@ describe('<SequenceEditForm>', () => {
 
     it('disables the submit button when submitting', () => {
         const props = {
+            name: 'name',
             handleSubmit: () => {},
             pristine: false,
             submitting: true,