fcad-core-dragon 2.0.0-beta.4 → 2.0.0-beta.5

package/src/router/index.js

@@ -21,10 +21,15 @@ const router = createRouter({
 })
 
 router.beforeResolve((to, from, next) => {
-  const appStore = useAppStore()
   const app = inject('app')
+  const appStore = useAppStore()
+  const { getWidgetOpen, getPopupIsOpen, getSidebarIsOpen } = appStore
   const noNavigationToMenu = appStore.getSettingsFromStore('no_menu')
 
+  if (getWidgetOpen) app.config.globalProperties.$bus.$emit('close-widget') //close opened widget
+  if (getPopupIsOpen) app.config.globalProperties.$bus.$emit('close-popup') //close the popup
+  if (getSidebarIsOpen) app.config.globalProperties.$bus.$emit('close-sidebar') //close the sidebar
+
   app.config.globalProperties.$bus.$emit('update-route-history', from)
   app.config.globalProperties.$bus.$emit('update-content', to, from, next)
 

package/src/shared/validators.js

@@ -11,7 +11,7 @@ const validatefileContent = (fName, fData, requiredArgs = {}) => {
       case 'menuSettings': {
         const {
           keys4Lesson,
-          keys4ActivityMando,
+          keys4ActivityMandatory,
           keys4ActivityOpt,
           keys4Anchors
         } = requiredArgs
@@ -19,17 +19,26 @@ const validatefileContent = (fName, fData, requiredArgs = {}) => {
         //*validate that data is an {Object}. if Not send error message
         if (fData.constructor !== Object)
           err = '💥Invalid file provided for menu settings'
-
-        if (Object.entries(fData).length > 0) {
-          const content = Object.entries(fData)
+        if (Object.keys(fData).length > 0) {
+          const content = Object.keys(fData)
+          //Check if lessonTitle exists
+          if (typeof fData.lessonTitle === 'undefined') {
+            err = `!!!! 💥 Missing 👉 lessonTitle 👈 variable in ➡ menu.setting.js \n  🚩 This variable is mandatory.`
+            break
+          }
+          //Check if lessonNumber exists
+          if (typeof fData.lessonNumber === 'undefined') {
+            err = `!!!! 💥 Missing 👉 lessonNumber 👈 variable in ➡ menu.setting.js \n  🚩 This variable is mandatory.`
+            break
+          }
           if (content.length != keys4Lesson.length) {
             err = `!!!! 💥 Missing activity in➡ menu.setting.js \n  🚩Must declare all activity  in menu.setting.js`
             break
           } else {
-            for (let [index, el] of content.entries()) {
+            for (let el of content) {
               //validate that the content of each entry is valide
-              if (el[0] !== keys4Lesson[index]) {
-                err = `!!!! 💥 invalid data provided for key 👉 ${el[0]} 👈 in ➡ menu.setting.js \n  🚩 All activity must be listed and you must have a lesson title`
+              if (!keys4Lesson.includes(el)) {
+                err = `!!!! 💥 invalid data provided for key 👉 ${el} 👈 in ➡ menu.setting.js \n  🚩 All activity must be listed and you must have a lesson title`
                 break
               }
             }
@@ -37,30 +46,32 @@ const validatefileContent = (fName, fData, requiredArgs = {}) => {
 
           // Validate that each entry has the required key
           if (!err) {
-            // remove key lessonTitle
-            content.shift()
-            for (let el of content) {
-              const entry = el[1]
-              const tabEntrykey = Object.keys(entry)
+            const reg = /^A[0-9]{2}$/ // target only activities
+            const contentActivities = content.filter((data) => data.match(reg)) //Get only the activities
 
+            for (let el of contentActivities) {
+              const entry = fData[el]
+
+              const tabEntrykey = Object.keys(entry)
               //Validate that entry has optional key
-              if (!tabEntrykey.includes(keys4ActivityOpt[0])) {
-                if (!tabEntrykey.includes(keys4ActivityOpt[1])) {
-                  err = `💥 Missing 👉 ${keys4ActivityOpt[0]} or ${keys4ActivityOpt[1]} 👈 in ${el[0]} in ➡ menu.setting.js \n  🚩One of thess two keys are mandatory : 👉 ${keys4ActivityOpt}`
-                  break
-                }
+              if (
+                !tabEntrykey.includes(keys4ActivityOpt[0]) ||
+                !tabEntrykey.includes(keys4ActivityOpt[1])
+              ) {
+                err = `💥 Missing 👉 ${keys4ActivityOpt[0]} or ${keys4ActivityOpt[1]} 👈 in ${el} in ➡ menu.setting.js \n  🚩One of thess two keys are mandatory : 👉 ${keys4ActivityOpt}`
+                break
               }
 
               //Validate that entry has mandatory key
-              for (let m of keys4ActivityMando) {
+              for (let m of keys4ActivityMandatory) {
                 if (!tabEntrykey.includes(m)) {
-                  err = `💥 Missing 👉 ${m} 👈 in ${el[0]} in ➡ menu.setting.js \n  🚩All this key are mandatory : 👉 ${keys4ActivityMando}`
+                  err = `💥 Missing 👉 ${m} 👈 in ${el} in ➡ menu.setting.js \n  🚩All this key are mandatory : 👉 ${keys4ActivityMandatory}`
                   break
                 } else {
                   switch (m) {
                     case 'anchors':
                       if (entry[m].constructor !== Array)
-                        err = `💥 Invalid anchors declaration for 👉 ${el[0]} 👈 in ➡ menu.setting.j \n  🚩Must be of type {Array}`
+                        err = `💥 Invalid anchors declaration for 👉 ${el} 👈 in ➡ menu.setting.j \n  🚩Must be of type {Array}`
                       else {
                         const anchors = entry.anchors
 
@@ -68,15 +79,15 @@ const validatefileContent = (fName, fData, requiredArgs = {}) => {
                           //trow error if numbers of keys are not the same as required
                           const a_numb = anchors.indexOf(a) + 1
                           if (Object.keys(a).length !== keys4Anchors.length) {
-                            err = `💥 Invalid declaration in 👉anchor ${a_numb}👈  for ➡ ${el[0]} in ➡ menu.setting.js \n  🚩 Allowed indexes are: 👉 ${keys4Anchors}`
+                            err = `💥 Invalid declaration in 👉anchor ${a_numb}👈  for ➡ ${el} in ➡ menu.setting.js \n  🚩 Allowed indexes are: 👉 ${keys4Anchors}`
                             break
                           }
                           // Validated that required keys condition and type is met
                           for (let k of keys4Anchors) {
                             if (!a[k]) {
-                              err = `💥 Missing 👉 ${k} 👈 for anchor ${a_numb} ➡ ${el[0]} ➡ menu.setting.js \n 🚩 Allowed indexes are: 👉 ${keys4Anchors}`
+                              err = `💥 Missing 👉 ${k} 👈 for anchor ${a_numb} ➡ ${el} ➡ menu.setting.js \n 🚩 Allowed indexes are: 👉 ${keys4Anchors}`
                             } else if (a[k].constructor !== String) {
-                              err = `💥 Invalid 👉 ${k} 👈 declaration for anchor ${a_numb} ➡ ${el[0]} ➡ menu.setting.js \n  🚩 Must be of type {String}`
+                              err = `💥 Invalid 👉 ${k} 👈 declaration for anchor ${a_numb} ➡ ${el} ➡ menu.setting.js \n  🚩 Must be of type {String}`
                             }
                             if (err) break
                           }
@@ -87,7 +98,7 @@ const validatefileContent = (fName, fData, requiredArgs = {}) => {
                       break
                     default:
                       if (entry[m].constructor !== String)
-                        err = `Invalid 👉 ${m} 👈 declaration for ➡ ${el[0]} in ➡ menu.setting.js \n  🚩 Must be of type {String}`
+                        err = `Invalid 👉 ${m} 👈 declaration for ➡ ${el} in ➡ menu.setting.js \n  🚩 Must be of type {String}`
                       break
                   }
                 }
@@ -459,161 +470,6 @@ const validateAudioData = (data) => {
         errorList.push(errString)
       }
     }
-    /*if (process.env.NODE_ENV === 'development') {
-    let errStringInConsole = null
-    let errString = null
-    const expectedKeys = ['mSources', 'mSubtitles', 'mPoster', 'mTranscript']
-
-    if (!data || data.constructor !== Object || Object.keys(data).length < 1) {
-      errStringInConsole = `\n 💥 Invalid declaration for video element`
-      console.warn(
-        `%c  WARNING!>>> VIDEO: ${errStringInConsole}`,
-        'background: orange; color: white; display: block; border-radius:5px; margin:5px;'
-      )
-      errString = `Declaration invalide pour Objet video.`
-      errorList.push(errString)
-    }
-
-    if (!data['mSources']) {
-      errStringInConsole = ` Missing 👉 mSources 👈 declaration for video element`
-
-      errString = `l'Attribut 👉 mSources 👈 pour l'Objet video n'est pas defini. `
-      console.warn(
-        `%c  WARNING!>>> ${errStringInConsole}`,
-        'background: orange; color: white; display: block; border-radius:5px; margin:5px;'
-      )
-      errorList.push(errString)
-    }
-
-    //Start validation of keys in data
-    if (!errString) {
-      expectedKeys.forEach((k) => {
-        if (!data[k] && k !== 'mSources') return
-
-        switch (k) {
-          case 'mSources':
-            if (
-              data['mSources'].constructor !== Array ||
-              data['mSources'].length < 1
-            ) {
-              errStringInConsole =
-                '\n 💥 Invalid type declaration for mSources.\n  🚩 Must be of type Array'
-
-              errString = `l'Attribut 👉 mSources 👈  pour le media doit être de type Array`
-
-              errorList.push(errString)
-              console.warn(
-                `%c  WARNING!>>> ${errStringInConsole}`,
-                'background: orange; color: white; display: block; border-radius:5px; margin:5px;'
-              )
-            }
-            break
-
-          case 'mSubtitles':
-            {
-              //Validate required keys in Subtitle definition
-              let expectedKeys = ['label', 'src', 'srclang']
-              //we only accept one subtitle and must be defined as an Object with 3 keys
-              if (
-                data['mSubtitles'].constructor !== Array ||
-                !data['mSubtitles'].length
-              ) {
-                errStringInConsole = `\n 💥 Invalid type declaration for mSubtitles.\n  🚩 Must be of type Array with at list one Object defined with: ${expectedKeys}`
-
-                errString = `l'Attribut 👉 mSubtitles 👈 doit être de type Array avec au moins un Objet: {${expectedKeys}} `
-
-                console.warn(
-                  `%c  WARNING!>>> ${errStringInConsole}`,
-                  'background: orange; color: white; display: block; border-radius:5px; margin:5px;'
-                )
-
-                return errorList.push(errString)
-              }
-              //Validate definition for each Subtitle Object
-              for (const obj of data['mSubtitles']) {
-                const objIndex = data['mSubtitles'].indexOf(obj)
-                expectedKeys.forEach((expected) => {
-                  if (!obj[expected]) {
-                    errStringInConsole = `\n 💥 Missing key 👉 ${expected} 👈 for mSubtitles No.${objIndex +
-                      1}.\n  🚩 required keys are: ${expectedKeys} `
-
-                    errString = `l'Attribut 👉 ${expected} 👈  pour le sous-titre  No.${objIndex +
-                      1} n'est pas défini`
-
-                    console.warn(
-                      `%c  WARNING!>>> ${errStringInConsole}`,
-                      'background: orange; color: white; display: block; border-radius:5px; margin:5px;'
-                    )
-                    return errorList.push(errString)
-                  }
-
-                  // Only none empty String type Accepted
-                  if (
-                    obj[expected].constructor === String &&
-                    obj[expected].trim().length
-                  )
-                    return
-
-                  errStringInConsole = `\n 💥 Invalid type declaration for 👉${expected}👈 in mSubtitles No.${objIndex +
-                    1}.\n  🚩 Must be none-empty String `
-
-                  errString = `l'Attribut 👉${expected}👈 du sous-titre No.${objIndex +
-                    1} doit être de type String et ne peut pas être vide. `
-
-                  console.warn(
-                    `%c  WARNING!>>> ${errStringInConsole}`,
-                    'background: orange; color: white; display: block; border-radius:5px; margin:5px;'
-                  )
-
-                  errorList.push(errString)
-                })
-              }
-            }
-            break
-          case 'mPoster':
-            //Only type String allowed and must not be empty
-            if (
-              data['mPoster'] &&
-              data['mPoster'].constructor == String &&
-              data['mPoster'].trim().length
-            )
-              return
-
-            errStringInConsole = `\n 💥 Invalid type declaration for 👉 mPoster 👈.\n  🚩 Must be none-empty String `
-
-            errString = `l'Attribut 👉 mPoster 👈 doit être de type String et ne peut pas être vide. `
-
-            errorList.push(errString)
-            console.warn(
-              `%c  WARNING!>>> VIDEO: ${errStringInConsole}`,
-              'background: orange; color: white; display: block; border-radius:5px; margin:5px;'
-            )
-
-            break
-          case 'mTranscript':
-            //Only type String allowed and must not be empty
-            if (
-              data['mTranscript'] &&
-              data['mTranscript'].constructor == String &&
-              data['mTranscript'].trim().length
-            )
-              return
-
-            errStringInConsole = `\n 💥 Invalid type declaration for 👉 mTranscript 👈 .\n  🚩 Must be none-empty String `
-
-            errString = `l'Attribut 👉 mTranscript 👈 doit être de type String et ne peut pas être vide. `
-
-            console.warn(
-              `%c  WARNING!>>> VIDEO: ${errStringInConsole}`,
-              'background: orange; color: white; display: block; border-radius:5px; margin:5px;'
-            )
-            errorList.push(errString)
-
-            break
-        }
-      })
-    }
-  }*/
   }
   return errorList
 }
@@ -1061,6 +917,7 @@ const validateSvgDefinition = (SVGData) => {
 }
 
 export {
+  validateObjType,
   validateVideoData,
   validateAudioData,
   validatefileContent,

package/vitest.config.js

@@ -0,0 +1,19 @@
+/**
+ * @vitest-environment jsdom
+ */
+import { fileURLToPath, URL } from 'node:url'
+import { mergeConfig, defineConfig, configDefaults } from 'vitest/config'
+import vue from '@vitejs/plugin-vue'
+import viteConfig from './vitest.config'
+
+export default mergeConfig(
+  viteConfig,
+  defineConfig({
+    test: {
+      environment: 'jsdom',
+      exclude: [...configDefaults.exclude, 'e2e/**'],
+      root: fileURLToPath(new URL('./', import.meta.url))
+    },
+    plugins: [vue()]
+  })
+)