wip: Upgrade to Quasar 2 / Vue 3 #393

kalisio · Aug 22, 2022 · 0e42442 · 0e42442
1 parent 2c29fbd
commit 0e42442
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 28 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -101,4 +101,4 @@ jobs:
     before_script:
     - export -f travis_fold
     script:
-    - bash .travis.ios.sh
+    - travis_wait 30 bash .travis.ios.sh
diff --git a/src/components/EventEditor.vue b/src/components/EventEditor.vue
@@ -176,7 +176,7 @@ export default {
     },
     getBaseQuery (object) {
       // Overriden to handle notification messages
-      const query = editorMixin.methods.getBaseQuery.call(this)
+      const query = kdkCoreMixins.baseEditor.methods.getBaseQuery.call(this)
 
       // const notification = _.get(object, 'notification', true)
       // if (notification) {
@@ -196,6 +196,10 @@ export default {
           delete this.object.workflow
         }
       }
+    },
+    async apply () {
+      await kdkCoreMixins.baseEditor.methods.apply.call(this)
+      this.closeModal()
     }
   },
   async created () {

diff --git a/src/components/PlanEditor.vue b/src/components/PlanEditor.vue
@@ -1,7 +1,7 @@
 <template>
   <KModal
     :title="editorTitle"
-    :buttons="getButtons()"
+    :buttons="buttons"
     v-model="isModalOpened"
   >
     <KForm
@@ -31,13 +31,15 @@ export default {
       default: ''
     }
   },
-  methods: {
-    getButtons () {
+  computed: {
+    buttons() {
       return [
         { id: 'close-button', label: 'CANCEL', renderer: 'form-button', outline: true, handler: () => this.closeModal() },
         { id: 'apply-button', label: this.applyButton, renderer: 'form-button', handler: () => this.apply() }
       ]
-    },
+    }
+  },
+  methods: {
     async loadObject () {
       // When a template is provided use it as reference for object
       if (this.templateId) {
@@ -53,6 +55,10 @@ export default {
         // Otherwise proceed as usual to load the event object
         return kdkCoreMixins.objectProxy.methods.loadObject.call(this)
       }
+    },
+    async apply () {
+      await kdkCoreMixins.baseEditor.methods.apply.call(this)
+      this.closeModal()
     }
   },
   async created () {

diff --git a/src/components/PlanObjectivesEditor.vue b/src/components/PlanObjectivesEditor.vue
@@ -20,22 +20,19 @@
         />
       </q-card-section>
       <q-card-section id="plan-objective-add" v-if="mode === 'add'">
-        <div class="colum q-gutter-y-md">
-          <KForm 
-            :ref="onAddFormReferenceCreated" 
-            :schema="objectiveSchema" 
-            style="min-width: 300px" 
-          />
-        </div>
+        <KForm 
+          :ref="onAddFormReferenceCreated" 
+          :schema="objectiveSchema" 
+          style="min-width: 300px" 
+        />
       </q-card-section>
       <q-card-section id="plan-objective-edit" v-if="mode === 'edit'">
-        <div class="colum q-gutter-y-md">
-          <KForm 
-            :ref="onEditFormReferenceCreated"
-            :schema="objectiveSchema" 
-            style="min-width: 300px" 
-          />
-        </div>
+        <KForm 
+          :ref="onEditFormReferenceCreated"
+          :schema="objectiveSchema" 
+          style="min-width: 300px" 
+          @form-ready="onEditFormReady"
+        />
       </q-card-section>
     </div>
   </KModal>
@@ -160,11 +157,9 @@ export default {
       let objectivesStore = _.get(this.object, 'objectives', [])
       // Jump from array to map for in memory service
       objectivesStore = _.keyBy(objectivesStore, 'name')
-      console.log(objectivesStore)
       const service = this.$api.getService('plan-objectives')
       // Update store with a fresh object otherwise it causes a weird bug in navigator
-      console.log(service)
-      //service.store = Object.assign({}, objectivesStore)
+      // TODO: validate if still needed service.store = Object.assign({}, objectivesStore)
       service.store = objectivesStore
     },
     async updatePlanObjectives (objectives) {
@@ -219,11 +214,9 @@ export default {
         await this.updatePlanObjectives(objectives)
       }
     },
-    async editPlanObjective (objective) {
+    editPlanObjective (objective) {
+      this.editedObjective = objective      
       this.mode = 'edit'
-      this.editedObjective = objective
-      await this.editForm.build()
-      this.editForm.fill(objective)
     },
     async removePlanObjective (objective) {
       // Update objectives in-memory and in DB
@@ -245,11 +238,13 @@ export default {
       if (reference) {
         this.editForm = reference
       }
+    },
+    onEditFormReady () {
+      this.editForm.fill(this.editedObjective)
     }
   },
   async created () {
     await this.loadObject()
-    console.log(this.object)
     // Extract objectives as we will map it using an in-memory service
     // so that we can use standard collection/form components
     this.updatePlanObjectivesServiceStore()