Improve project creation form

Author: janslifka

cypress/e2e/knowledge-models/deprecated.spec.js

@@ -27,7 +27,8 @@ describe('Deprecated KM', () => {
         cy.get('.badge.bg-danger').contains('deprecated').should('exist')
 
         // check it is not suggested
-        cy.visitApp('/projects/create/custom')
+        cy.visitApp('/projects/create')
+        cy.getCy('project_create_nav_custom').click()
         searchKM(kmId)
         cy.get('.TypeHintInput__TypeHints .empty').should('exist')
 
@@ -36,7 +37,7 @@ describe('Deprecated KM', () => {
         cy.clickDropdownAction('restore')
 
         // check it is suggested again
-        cy.visitApp('/projects/create/custom')
+        cy.visitApp('/projects/create')
         cy.fillFields({ th_packageId: kmName })
     })
 })

cypress/e2e/knowledge-models/latest.spec.js

@@ -27,10 +27,10 @@ describe('Latest version', () => {
 
     it('project create', () => {
         cy.loginAs('researcher')
-        cy.visitApp(`/projects/create/custom?selected=${orgId}:${kmId}:latest`)
+        cy.visitApp(`/projects/create?selectedKnowledgeModel=${orgId}:${kmId}:latest`)
 
         cy.fillFields({ name: 'My Project'})
-        cy.getCy('project_save-button').click()
+        cy.get('.btn-primary').contains('Create').click()
 
         project.openSettings()
         cy.getCy('typehint-item_package_version').contains(latest).should('exist')

cypress/e2e/projects/crud.spec.js

@@ -27,7 +27,6 @@ describe('Project CRUD', () => {
     it('create project', () => {
         cy.visitApp('/projects')
         cy.getCy('projects_create-button').click()
-        cy.get('.nav-link').contains('Custom').click()
         cy.fillFields({
             name: projectName,
             th_packageId: packageName

cypress/e2e/projects/detail/questionnaire/tags.spec.js

@@ -60,7 +60,6 @@ describe('Questionnaire Tags', () => {
         it('create questionnaire with correct questions', () => {
             cy.visitApp('/projects')
             cy.getCy('projects_create-button').click()
-            cy.get('.nav-link').contains('Custom').click()
 
             cy.fillFields({
                 name: projectName,

cypress/e2e/projects/template.spec.js

@@ -27,7 +27,6 @@ describe('Project Template', () => {
         cy.loginAs('datasteward')
         cy.visitApp('/projects')
         cy.getCy('projects_create-button').click()
-        cy.get('.nav-link').contains('Custom').click()
         cy.fillFields({
             name: templateProjectName,
             th_packageId: packageName
@@ -67,7 +66,7 @@ describe('Project Template', () => {
         cy.getCy('projects_create-button').click()
         cy.fillFields({
             name: projectName,
-            th_uuid: templateProjectName
+            th_templateId: templateProjectName
         })
         cy.clickBtn('Create')
         cy.url().should('contain', '/projects/')

cypress/e2e/settings/projects.spec.js

@@ -6,10 +6,21 @@ describe('Settings / Projects', () => {
     const packageId = 'dsw:test-km-1:1.0.0'
     const packageName = 'Test Knowledge Model 1'
 
+    const projectTemplateName = 'Test Project Template'
+
     const createProject = () => {
         project.create(projectName, packageName)
     }
 
+    const createProjectTemplate = () => {
+        project.create(projectTemplateName, packageName)
+        project.openSettings()
+        cy.checkToggle('isTemplate')
+        project.saveSettings()
+        project.setProjectVisibility(project.VisibleView)
+        cy.visitApp('/settings/projects')
+    }
+
     const createProjectAndOpenShare = () => {
         createProject()
         cy.getCy('project_detail_share-button').click()
@@ -139,7 +150,7 @@ describe('Settings / Projects', () => {
     const expectTemplateOnlyEnabled = () => {
         cy.getCy('project_create_nav_template').should('not.exist')
         cy.getCy('project_create_nav_custom').should('not.exist')
-        cy.get('#uuid').should('exist')
+        cy.get('#templateId').should('exist')
 
         expectCreateProjectButton(false)
     }
@@ -151,6 +162,8 @@ describe('Settings / Projects', () => {
 
     const creationTest = (projectCreation, role, expect, isDefault) => {
         it(`project creation ${projectCreation} for ${role}`, () => {
+            createProjectTemplate()
+
             if (!isDefault) {
                 cy.get(`#${projectCreation}`).check({ force: true })
                 cy.submitForm()

cypress/support/project-helpers.js

@@ -31,8 +31,8 @@ export function openAnonymous(projectId, projectName) {
 
 
 export function create(projectName, packageName) {
-    cy.visitApp('/projects/create/custom')
-    cy.get('.Questionnaires__Create').should('exist')
+    cy.visitApp('/projects/create')
+    cy.get('.Projects__Create').should('exist')
     cy.fillFields({
         name: projectName,
         th_packageId: packageName