Merge branch 'rename-template-components' into 'master'

rename Select,Create TemplateModal to Template Selection,Creation

Closes #872

See merge request !1141

test/Process/CreateTemplateModal.js → test/Process/TemplateCreation.js

@@ -4,13 +4,13 @@ import Vuex from 'vuex'
 import { createLocalVue, mount } from '@vue/test-utils'
 import store from '~/test/store'
 import { FakeAxios } from '~/test/testhelpers'
-import CreateTemplateModal from '~/vue/Process/CreateTemplateModal'
+import TemplateCreation from '~/vue/Process/TemplateCreation'
 import { templateSample } from '~/test/samples'
 
 const localVue = createLocalVue()
 localVue.use(Vuex)
 
-describe('Process/CreateTemplateModal.vue', () => {
+describe('Process/TemplateCreation.vue', () => {
   let mock
 
   before('Setting up Axios mock', () => {
@@ -25,7 +25,7 @@ describe('Process/CreateTemplateModal.vue', () => {
   it('creates a new template with given name', async () => {
     mock.onPost('/process/process_id/template/', { name: 'test_template' }).reply(201, templateSample)
 
-    const wrapper = mount(CreateTemplateModal, {
+    const wrapper = mount(TemplateCreation, {
       store,
       localVue,
       propsData: {
@@ -55,7 +55,7 @@ describe('Process/CreateTemplateModal.vue', () => {
   })
 
   it('does not create anything when button is disabled', async () => {
-    const wrapper = mount(CreateTemplateModal, {
+    const wrapper = mount(TemplateCreation, {
       store,
       localVue,
       propsData: {

test/Process/SelectTemplateModal.js → test/Process/TemplateSelection.js

@@ -4,13 +4,13 @@ import Vuex from 'vuex'
 import { createLocalVue, mount } from '@vue/test-utils'
 import store from '~/test/store'
 import { FakeAxios } from '~/test/testhelpers'
-import SelectTemplateModal from '~/vue/Process/SelectTemplateModal'
+import TemplateSelection from '~/vue/Process/TemplateSelection'
 import { processSample, templateSample, workerRunsSample } from '~/test/samples'
 
 const localVue = createLocalVue()
 localVue.use(Vuex)
 
-describe('Process/SelectTemplateModal.vue', () => {
+describe('Process/TemplateSelection.vue', () => {
   let mock
 
   before('Setting up Axios mock', () => {
@@ -49,7 +49,7 @@ describe('Process/SelectTemplateModal.vue', () => {
       })
       .reply(200, replyListTemplates)
 
-    const wrapper = mount(SelectTemplateModal, {
+    const wrapper = mount(TemplateSelection, {
       store,
       localVue,
       propsData: {

vue/Process/Configure.vue

@@ -16,7 +16,7 @@
           </button>
         </p>
         <p class="control">
-          <CreateTemplateModal
+          <TemplateCreation
             :process-id="process.id"
             v-if="hasWorkerRuns"
             :disabled="thumbnails"
@@ -24,7 +24,7 @@
           />
         </p>
         <p class="control">
-          <SelectTemplateModal
+          <TemplateSelection
             :process-id="process.id"
             :disabled="thumbnails"
             :title="thumbnails ? 'No template can be selected with the thumbnails option turned on' : 'Apply a template to your process'"
@@ -179,8 +179,8 @@ import Modal from '~/vue/Modal'
 import Workers from './Workers/List'
 import WorkerRunWithParents from './Workers/WorkerRunWithParents'
 import { ensureArray, errorParser } from '~/js/helpers'
-import CreateTemplateModal from './CreateTemplateModal'
-import SelectTemplateModal from './SelectTemplateModal'
+import TemplateCreation from './TemplateCreation'
+import TemplateSelection from './TemplateSelection'
 
 export default {
   props: {
@@ -193,8 +193,8 @@ export default {
     Modal,
     Workers,
     WorkerRunWithParents,
-    CreateTemplateModal,
-    SelectTemplateModal
+    TemplateCreation,
+    TemplateSelection
   },
   data: () => ({
     selectionModal: false,

vue/Process/Status/Main.vue

@@ -67,7 +67,7 @@
                 Workers activity
               </router-link>
             </p>
-            <CreateTemplateModal
+            <TemplateCreation
               :process-id="process.id"
               v-if="process.state === 'completed'"
             />
@@ -99,7 +99,7 @@ import { corporaMixin } from '~/js/mixins'
 import { errorParser } from '~/js/helpers'
 import NameField from './NameField'
 import Workflow from './Workflow'
-import CreateTemplateModal from '../CreateTemplateModal'
+import TemplateCreation from '../TemplateCreation'
 
 export default {
   mixins: [
@@ -118,7 +118,7 @@ export default {
   components: {
     NameField,
     Workflow,
-    CreateTemplateModal
+    TemplateCreation
   },
   data: () => ({
     PENDING_ACTIVITY_STATE: 'pending',