fcad-core-dragon 2.0.0-beta.1 → 2.0.0-beta.3

package/src/components/AppCompSettingsMenu.vue

@@ -1,171 +1,172 @@
-<template>
-  <b-sidebar
-    id="sidebar-settings"
-    title="Settings"
-    right
-    shadow
-    backdrop
-    no-header
-    @hidden="onClose"
-  >
-    <div class="pl-3 pr-3">
-      <b-form-group
-        v-slot="{ ariaDescribedby }"
-        :label="$t('user_settings.title')"
-      >
-        <b-form-checkbox
-          v-for="(setting, index) in Object.entries(settingsSelected)"
-          :key="index"
-          v-model="settingsSelected[setting[0]]"
-          :aria-describedby="ariaDescribedby"
-          :name="`parameter-${setting[0]}`"
-          :text-field="$t(`user_settings.${setting[0]}`)"
-          switch
-          stacked
-          size="lg"
-          @change="onSettingsChange"
-        >
-          <span>{{ $t(`user_settings.${setting[0]}`) }}</span>
-        </b-form-checkbox>
-      </b-form-group>
-      <app-base-button
-        v-b-toggle.sidebar-settings
-        class="float-right btn-primary"
-        :title="$t('user_settings.close')"
-      >
-        {{ $t('user_settings.close') }}
-      </app-base-button>
-    </div>
-  </b-sidebar>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import AppBaseButton from './AppBaseButton.vue'
-
-export default {
-  components: { AppBaseButton },
-  props: {},
-  data() {
-    return {
-      settingsSelected: {},
-      settingsNeedUpdate: false
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'getApplicationSettings',
-      'getModuleInfo',
-      'getUserInteraction',
-      'getConnectionInfo',
-      'onboardingEnabled'
-    ]),
-    settingsOptions() {
-      return this.$store.state.isDr
-        ? this.settingsOptionsEL
-        : this.settingsOptionsELPlus
-    }
-  },
-  watch: {
-    getApplicationSettings: {
-      immediate: true,
-      handler() {
-        this.getSettingsFromStore()
-      }
-    }
-  },
-  created() {
-    setTimeout(() => this.getSettingsFromStore(), 1700)
-
-    this.$bus.$on('save-settings', (settings) => {
-      this.saveSettings(settings)
-    })
-  },
-  methods: {
-    getSettingsFromStore() {
-      this.settingsSelected = { ...this.getApplicationSettings }
-    },
-
-    //Save user settings to the store
-    onSettingsChange() {
-      this.settingsNeedUpdate = true
-      this.saveSettingsToStore(this.settingsSelected)
-    },
-    saveSettingsToStore(settings) {
-      this.$store.dispatch('setApplicationSettings', settings)
-    },
-    /**
-     * @description Save the user preferred settings to vue store and LRS or local store:
-     * LRS: Send a XAPI Statement to the LRS
-     * IndexedDB: Set a new Key for preferred settings in the userInteraction in store
-     * Update current value of settings
-     * @param {Object} appSettings - group of application settings {autoplay, subtitles, onboarding}
-     *
-     */
-    saveSettings(appSettings) {
-      this.saveSettingsToStore(appSettings) //save to store
-
-      if (
-        this.getModuleInfo.packageType === 'xapi' &&
-        this.getConnectionInfo &&
-        this.getConnectionInfo.remote
-      ) {
-        let text
-        //Defining the text to display for stmt description and definition
-        switch (this.$i18n.locale) {
-          case 'fr':
-            if (this.getModuleInfo.courseID)
-              text = `Le ${this.getModuleInfo.id} de ${this.getModuleInfo.courseID}`
-            else text = `Le ${this.getModuleInfo.id}`
-            break
-          case 'en':
-            if (this.getModuleInfo.courseID)
-              text = `The ${this.getModuleInfo.id} of ${this.getModuleInfo.courseID}`
-            else text = `The ${this.getModuleInfo.id}`
-            break
-        }
-        //Creating custom statement
-        const stmt = {
-          id: (() => {
-            return this.getModuleInfo.courseID
-              ? this.getModuleInfo.courseID
-              : null
-          })(),
-          verb: 'preferred',
-          definition: text,
-          description: text,
-          extension: [
-            {
-              id: 'application-settings',
-              content: {
-                userSettings: { ...appSettings }
-              }
-            }
-          ]
-        }
-
-        setTimeout(() => {
-          this.$bus.$emit('send-xapi-statement', stmt) //send xapi statement
-        }, 1000)
-      } else {
-        this.$set(this.getUserInteraction, 'userSettings', appSettings) // adding the usersettings to user Interaction to save to save to the local DB
-        this.$store.dispatch('updateUserMetaData', this.getUserInteraction) //force update of the userInteraction to ensure saving of settings in local DB
-      }
-
-      //update sidebar data
-      this.getSettingsFromStore()
-    },
-
-    /**
-     * @description -Action to perform when the sidebar closed- will require saving when changing occurred
-     */
-    onClose() {
-      if (this.settingsNeedUpdate) {
-        this.saveSettingsToStore(this.settingsSelected)
-        this.saveSettings(this.getApplicationSettings)
-        this.settingsNeedUpdate = false
-      }
-    }
-  }
-}
-</script>
+<template>
+  <b-sidebar
+    id="sidebar-settings"
+    title="Settings"
+    right
+    shadow
+    backdrop
+    no-header
+    @hidden="onClose"
+  >
+    <div class="pl-3 pr-3">
+      <b-form-group :label="$t('user_settings.title')">
+        <b-form-checkbox
+          v-for="(setting, index) in Object.entries(settingsSelected)"
+          :key="index"
+          v-model="settingsSelected[setting[0]]"
+          :aria-describedby="ariaDescribedby"
+          :name="`parameter-${setting[0]}`"
+          :text-field="$t(`user_settings.${setting[0]}`)"
+          switch
+          stacked
+          size="lg"
+          @change="onSettingsChange"
+        >
+          <span>{{ $t(`user_settings.${setting[0]}`) }}</span>
+        </b-form-checkbox>
+      </b-form-group>
+      <app-base-button
+        v-b-toggle.sidebar-settings
+        class="float-right btn-primary"
+        :title="$t('user_settings.close')"
+      >
+        {{ $t('user_settings.close') }}
+      </app-base-button>
+    </div>
+  </b-sidebar>
+</template>
+
+<script>
+import { mapState, mapActions } from 'pinia'
+import { useAppStore } from '../module/stores/appStore'
+import AppBaseButton from './AppBaseButton.vue'
+
+export default {
+  components: { AppBaseButton },
+  props: {},
+  data() {
+    return {
+      settingsSelected: {},
+      settingsNeedUpdate: false
+    }
+  },
+  computed: {
+    ...mapState(useAppStore, [
+      'getApplicationSettings',
+      'getModuleInfo',
+      'getUserInteraction',
+      'getConnectionInfo',
+      'onboardingEnabled'
+    ]),
+    settingsOptions() {
+      return this.settingsOptionsELPlus
+    }
+  },
+  watch: {
+    getApplicationSettings: {
+      immediate: true,
+      deep: true,
+      handler() {
+        this.getAppSettingsInStore()
+      }
+    }
+  },
+  created() {
+    setTimeout(() => this.getAppSettingsInStore(), 1700)
+
+    this.$bus.$on('save-settings', (settings) => {
+      this.saveSettings(settings)
+    })
+  },
+  methods: {
+    ...mapActions(useAppStore, [
+      'setApplicationSettings',
+      'updateUserMetaData'
+    ]),
+    getAppSettingsInStore() {
+      this.settingsSelected = { ...this.getApplicationSettings }
+    },
+
+    //Save user settings to the store
+    onSettingsChange() {
+      this.settingsNeedUpdate = true
+      this.saveSettingsToStore(this.settingsSelected)
+    },
+    saveSettingsToStore(settings) {
+      this.setApplicationSettings(settings)
+    },
+    /**
+     * @description Save the user preferred settings to vue store and LRS or local store:
+     * LRS: Send a XAPI Statement to the LRS
+     * IndexedDB: Set a new Key for preferred settings in the userInteraction in store
+     * Update current value of settings
+     * @param {Object} appSettings - group of application settings {autoplay, subtitles, onboarding}
+     *
+     */
+    saveSettings(appSettings) {
+      this.saveSettingsToStore(appSettings) //save to store
+
+      if (
+        this.getModuleInfo.packageType === 'xapi' &&
+        this.getConnectionInfo &&
+        this.getConnectionInfo.remote
+      ) {
+        let text
+        //Defining the text to display for stmt description and definition
+        switch (this.$i18n.locale) {
+          case 'fr':
+            if (this.getModuleInfo.courseID)
+              text = `Le ${this.getModuleInfo.id} de ${this.getModuleInfo.courseID}`
+            else text = `Le ${this.getModuleInfo.id}`
+            break
+          case 'en':
+            if (this.getModuleInfo.courseID)
+              text = `The ${this.getModuleInfo.id} of ${this.getModuleInfo.courseID}`
+            else text = `The ${this.getModuleInfo.id}`
+            break
+        }
+        //Creating custom statement
+        const stmt = {
+          id: (() => {
+            return this.getModuleInfo.courseID
+              ? this.getModuleInfo.courseID
+              : null
+          })(),
+          verb: 'preferred',
+          definition: text,
+          description: text,
+          extensions: [
+            {
+              id: 'application-settings',
+              content: {
+                userSettings: { ...appSettings }
+              }
+            }
+          ]
+        }
+
+        setTimeout(() => {
+          this.$bus.$emit('send-xapi-statement', stmt) //send xapi statement
+        }, 1000)
+      } else {
+        this.$set(this.getUserInteraction, 'userSettings', appSettings) // adding the usersettings to user Interaction to save to save to the local DB
+        this.updateUserMetaData(this.getUserInteraction) //force update of the userInteraction to ensure saving of settings in local DB
+      }
+
+      //update sidebar data
+      this.getAppSettingsInStore()
+    },
+
+    /**
+     * @description -Action to perform when the sidebar closed- will require saving when changing occurred
+     */
+    onClose() {
+      if (this.settingsNeedUpdate) {
+        this.saveSettingsToStore(this.settingsSelected)
+        this.saveSettings(this.getApplicationSettings)
+        this.settingsNeedUpdate = false
+      }
+    }
+  }
+}
+</script>