wip: Upgrade to Quasar 2 / Vue 3 : updated CI scripts #393

kalisio · Aug 22, 2022 · 2c29fbd · 2c29fbd
1 parent 57c1aea
commit 2c29fbd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/.travis.ios.sh b/.travis.ios.sh
@@ -61,7 +61,7 @@ check_code $EXIT_CODE 1 "Building the app"
 
 # Backup the ios build to S3
 rclone copy src-cordova/platforms/ios/build scw:kalisio-builds/${BUILD_BUCKET}/ios > /dev/null
-check_code $? 1 "Copying the artefact to s3"
+check_code $? 0 "Copying the artefact to s3"
 
 travis_fold end "build"
 

diff --git a/src-cordova/config.xml.tpl b/src-cordova/config.xml.tpl
@@ -126,14 +126,15 @@
   <plugin name="cordova-custom-config" spec="~5.1.0"/>
   <plugin name="cordova-plugin-statusbar" spec="~3.0.0"/>
   <plugin name="cordova-plugin-android-permissions" spec="~1.1.3"/>
+  <plugin name="cordova-plugin-androidx-adapter" spec="~1.1.3"/>
   <plugin name="cordova-plugin-device" spec="~2.1.0"/>
   <plugin name="cordova-plugin-geolocation" spec="~4.1.0"/>
   <plugin name="cordova-plugin-camera" spec="~6.0.0"/>
   <plugin name="cordova-plugin-sim" spec="~1.3.3"/>
   <plugin name="cordova-plugin-whitelist" spec="~1.3.5"/>
   <plugin name="cordova-plugin-inappbrowser" spec="~5.0.0"/>
   <plugin name="cordova-plugin-file" spec="~7.0.0"/>
-  <!--plugin name="cordova-plugin-file-opener2" spec="~3.0.5"/-->
+  <plugin name="cordova-plugin-file-opener2" spec="~3.0.5"/>
   <plugin name="uk.co.workingedge.phonegap.plugin.launchnavigator" source="npm">
     <variable name="GOOGLE_API_KEY_FOR_ANDROID" value="$GOOGLE_API_KEY_FOR_ANDROID"/>
   </plugin>

diff --git a/src/components/PlanObjectivesEditor.vue b/src/components/PlanObjectivesEditor.vue
@@ -73,12 +73,12 @@ export default {
       } else if (this.mode === 'add') {
         return [
           { id: 'close-button', label: 'CANCEL', renderer: 'form-button', outline: true, handler: () => { this.mode = 'list' } },
-          { id: 'add-plan-objective-button', label: 'CREATE', renderer: 'form-button', disabled: !addForm, handler: () => this.onCreatePlanObjective() }
+          { id: 'add-plan-objective-button', label: 'CREATE', renderer: 'form-button', handler: () => this.onCreatePlanObjective() }
         ]
       } else {
         return [
           { id: 'close-button', label: 'CANCEL', renderer: 'form-button', outline: true, handler: () => { this.mode = 'list' } },
-          { id: 'add-plan-objective-button', label: 'UPDATE', renderer: 'form-button', disabled: !editForm, handler: () => this.onEditPlanObjective() }
+          { id: 'add-plan-objective-button', label: 'UPDATE', renderer: 'form-button', handler: () => this.onEditPlanObjective() }
         ]
       }
     }
@@ -160,12 +160,15 @@ 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
-      service.store = Object.assign({}, objectivesStore)
+      console.log(service)
+      //service.store = Object.assign({}, objectivesStore)
+      service.store = objectivesStore
     },
     async updatePlanObjectives (objectives) {
-      /*_.set(this.object, 'objectives', objectives)
+      _.set(this.object, 'objectives', objectives)
       this.updatePlanObjectivesServiceStore()
       this.savingObjective = true
       try {
@@ -178,7 +181,7 @@ export default {
       // After create or edit jump to the list mode
       if (this.mode !== 'list') this.mode = 'list'
       // Force the list to be refreshed
-      if (this.list) this.list.refreshCollection()*/
+      if (this.list) this.list.refreshCollection()
     },
     async onCreatePlanObjective () {
       if (!this.addForm) throw new Error('Cannot create plan objectives with a non-ready form')
@@ -246,6 +249,7 @@ export default {
   },
   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()