@windward/core 0.9.0 → 0.9.1

package/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+### Hotfix [0.9.1] created - 2024-12-10
+
+
 ## Release [0.7.0] - 2024-08-29
 
 * Version bump to 0.7.0

package/components/Settings/TextEditorSettings.vue

@@ -8,9 +8,9 @@
                         <v-btn
                             elevation="0"
                             v-bind="attrs"
-                            v-on="on"
                             text
                             :disabled="render"
+                            v-on="on"
                         >
                             <v-icon>mdi-comment-text-multiple</v-icon>
                             {{
@@ -34,9 +34,9 @@
                         <v-btn
                             elevation="0"
                             v-bind="attrs"
-                            v-on="on"
                             text
                             :disabled="render"
+                            v-on="on"
                         >
                             <v-icon> mdi-text-long</v-icon>
                             {{
@@ -55,14 +55,14 @@
                     >
                 </v-tooltip>
 
-                <v-tooltip top v-if="settingSelector.includes(1)">
+                <v-tooltip v-if="settingSelector.includes(1)" top>
                     <template #activator="{ on, attrs }">
                         <v-btn
                             v-bind="attrs"
-                            v-on="on"
                             elevation="0"
                             text
                             :disabled="render"
+                            v-on="on"
                             @click="
                                 block.metadata.config.expand =
                                     !block.metadata.config.expand
@@ -94,7 +94,7 @@
         </v-card>
         <div v-show="settingSelector.includes(0)" class="pt-4">
             <br />
-            <v-card elevation="0" outlined v-if="verifiedTerms.length > 0">
+            <v-card v-if="verifiedTerms.length > 0" elevation="0" outlined>
                 <v-card-title outlined class="text-capitalize">
                     {{
                         $t(
@@ -113,11 +113,11 @@
                         :disabled="render"
                         @click:close="editTerm(verified)"
                     >
-                        {{ verified.term }}
+                        <TextViewer v-model="verified.term"></TextViewer>
                     </v-chip>
                 </v-card-text>
             </v-card>
-            <v-card elevation="0" outlined v-if="unVerifiedTerms.length > 0">
+            <v-card v-if="unVerifiedTerms.length > 0" elevation="0" outlined>
                 <v-card-title outlined class="text-capitalize">
                     {{
                         $t(
@@ -136,16 +136,16 @@
                         :disabled="render"
                         @click:close="addGlossaryTerm(unVerified)"
                     >
-                        {{ unVerified.term }}
+                        <TextViewer v-model="unVerified.term"></TextViewer>
                     </v-chip>
                 </v-card-text>
             </v-card>
             <v-card
-                elevation="0"
-                outlined
                 v-if="
                     verifiedTerms.length === 0 && unVerifiedTerms.length === 0
                 "
+                elevation="0"
+                outlined
                 ><v-card-text class="text-capitalize font-weight-bold">
                     {{
                         $t(
@@ -164,9 +164,9 @@
             allow-read
         ></TextEditor>
         <v-skeleton-loader
+            v-show="settingSelector.includes(1) && block.metadata.config.expand"
             v-bind="attrs"
             type=" table-row-divider, list-item, divider, list-item, divider, image,image"
-            v-show="settingSelector.includes(1) && block.metadata.config.expand"
         ></v-skeleton-loader>
         <DialogBox
             v-model="dialog"
@@ -196,20 +196,22 @@
 
 <script>
 import { mapGetters, mapMutations } from 'vuex'
-import DialogBox from '~/components/Core/DialogBox.vue'
 import GlossaryHelper from '../../helpers/GlossaryHelper'
+import CourseGlossaryForm from '../utils/glossary/CourseGlossaryForm.vue'
+import DialogBox from '~/components/Core/DialogBox.vue'
 import Course from '~/models/Course'
 import BaseContentSettings from '~/components/Content/Settings/BaseContentSettings.js'
 import TextEditor from '~/components/Text/TextEditor'
-import CourseGlossaryForm from '../utils/glossary/CourseGlossaryForm.vue'
+import TextViewer from '~/components/Text/TextViewer.vue'
 export default {
     name: 'TextEditorSettings',
-    extends: BaseContentSettings,
     components: {
         DialogBox,
         TextEditor,
         CourseGlossaryForm,
+        TextViewer,
     },
+    extends: BaseContentSettings,
     data() {
         return {
             dialog: false,
@@ -255,7 +257,7 @@ export default {
     },
     methods: {
         async save() {
-            let currentGlossary = _.cloneDeep(this.glossary)
+            const currentGlossary = _.cloneDeep(this.glossary)
             let currentItemIndex = -1
             currentGlossary.filter((item, index) => {
                 if (item.term === this.selectedTerm.term) {

package/components/utils/TinyMCEWrapper.vue

@@ -141,7 +141,7 @@ export default {
     },
     data() {
         return {
-            render: false,
+            render: true,
             text: '',
             seed: Crypto.id(),
             synthesizer: null,

package/components/utils/glossary/CourseGlossary.vue

@@ -158,15 +158,17 @@
 <script>
 import { mapGetters, mapMutations } from 'vuex'
 import _ from 'lodash'
+import { encode } from 'he'
+import CourseGlossaryForm from './CourseGlossaryForm'
 import DialogBox from '~/components/Core/DialogBox.vue'
 import Crypto from '~/helpers/Crypto'
 import Course from '~/models/Course'
 import SpeedDial from '~/components/Core/SpeedDial.vue'
+import TextViewer from '~/components/Text/TextViewer.vue'
 
-import CourseGlossaryForm from './CourseGlossaryForm'
 export default {
     name: 'CourseGlossary',
-    components: { DialogBox, CourseGlossaryForm, SpeedDial },
+    components: { DialogBox, CourseGlossaryForm, SpeedDial, TextViewer },
     layout: 'course',
     middleware: ['auth'],
     props: {},
@@ -278,7 +280,7 @@ export default {
             const updatedCourse = await course.save()
             this.$store.commit('course/set', updatedCourse)
             this.$toast.success(this.$t('shared.forms.saved'))
-            //force update on datatable
+            // force update on datatable
             this.tableKey = Crypto.id()
         },
         saveNew() {

package/components/utils/glossary/GlossaryToolTip.vue

@@ -10,7 +10,8 @@
             v-model="show"
             :open-on-hover="false"
             color="primary"
-            max-width="200px"
+            max-width="768px"
+            z-index="10"
         >
             <template #activator="{ on }">
                 <span v-on="on">

package/helpers/GlossaryHelper.ts

@@ -1,22 +1,24 @@
-import GlossaryTerm from '../helpers/GlossaryTerm'
 import * as _ from 'lodash'
+import { decode } from 'he'
+import GlossaryTerm from '../helpers/GlossaryTerm'
 
 export default class GlossaryHelper {
     private static glossaryRegex =
         /<span.*?.class="glossary-word".*?>(.*?)<\/span>/g
+
     public static makeToolTip(term: GlossaryTerm, text: String): string {
-        let word = _.isString(term.term)
+        const word = _.isString(term.term)
             ? '<template v-slot:term>' + text + '</template>'
             : ''
-        let definition = _.isString(term.definition)
+        const definition = _.isString(term.definition)
             ? '<template v-slot:definition>' + term.definition + '</template>'
             : ''
-        let alternate_forms = _.isString(term.alternate_forms)
+        const alternate_forms = _.isString(term.alternate_forms)
             ? '<template v-slot:alternate_forms>' +
               term.alternate_forms +
               '</template>'
             : ''
-        let related_terms = _.isString(term.related_term)
+        const related_terms = _.isString(term.related_term)
             ? '<template v-slot:related_terms>' +
               term.related_term +
               '</template>'
@@ -30,6 +32,7 @@ export default class GlossaryHelper {
             '</plugin-core-glossary-tool-tip>'
         )
     }
+
     public static containsGlossaryTerms(content: string): boolean {
         const regex = new RegExp(this.glossaryRegex)
 
@@ -50,7 +53,7 @@ export default class GlossaryHelper {
             if (match.index === regex.lastIndex) {
                 regex.lastIndex++
             }
-
+            match[1] = decode(match[1])
             // The result can be accessed through the `m`-variable.
             currentGlossary.forEach((term: any) => {
                 let addTerm = true
@@ -64,12 +67,15 @@ export default class GlossaryHelper {
                 })
 
                 if (
-                    ( _.trim(_.toLower(match[1])) ===
+                    (_.trim(_.toLower(match[1])) ===
                         _.trim(_.toLower(term.term)) ||
-                        term.alternate_forms && _.some(term.alternate_forms, alt => _.trim(_.toLower(alt)) === _.trim(_.toLower(match[1])))
-
-                    )
-                    &&
+                        (term.alternate_forms &&
+                            _.some(
+                                term.alternate_forms,
+                                (alt) =>
+                                    _.trim(_.toLower(alt)) ===
+                                    _.trim(_.toLower(match[1]))
+                            ))) &&
                     addTerm
                 ) {
                     verifiedTerms.push(new GlossaryTerm(term))
@@ -98,13 +104,20 @@ export default class GlossaryHelper {
                 regex.lastIndex++
             }
 
+            match[1] = decode(match[1])
             let inGlossary = []
 
             inGlossary = glossary.filter((item: any) => {
                 if (
-                    _.trim(_.toLower(item.term)) === _.trim(_.toLower(match[1]))
-                    ||
-                    item.alternate_forms && _.some(item.alternate_forms, alt => _.trim(_.toLower(alt)) === _.trim(_.toLower(match[1])))
+                    _.trim(_.toLower(item.term)) ===
+                        _.trim(_.toLower(match[1])) ||
+                    (item.alternate_forms &&
+                        _.some(
+                            item.alternate_forms,
+                            (alt) =>
+                                _.trim(_.toLower(alt)) ===
+                                _.trim(_.toLower(match[1]))
+                        ))
                 ) {
                     return item
                 }
@@ -131,6 +144,7 @@ export default class GlossaryHelper {
 
         return unVerifiedTerms
     }
+
     public static renderGlossaryWordsHtml(content: string, glossary: any) {
         const regex: any = new RegExp(this.glossaryRegex)
         const currentGlossary: any = glossary
@@ -143,13 +157,19 @@ export default class GlossaryHelper {
                 regex.lastIndex++
             }
 
+            match[1] = decode(match[1])
             // The result can be accessed through the `m`-variable.
             currentGlossary.forEach((term: any) => {
                 if (
-                    _.trim(_.toLower(match[1])) === _.trim(_.toLower(term.term))
-                    ||
-                    ( term.alternate_forms &&
-                        _.some(term.alternate_forms, alt => _.trim(_.toLower(alt)) === _.trim(_.toLower(match[1]))))
+                    _.trim(_.toLower(match[1])) ===
+                        _.trim(_.toLower(term.term)) ||
+                    (term.alternate_forms &&
+                        _.some(
+                            term.alternate_forms,
+                            (alt) =>
+                                _.trim(_.toLower(alt)) ===
+                                _.trim(_.toLower(match[1]))
+                        ))
                 ) {
                     content = content.replace(
                         match[0],

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@windward/core",
-    "version": "0.9.0",
+    "version": "0.9.1",
     "description": "Windward UI Core Plugins",
     "main": "plugin.js",
     "scripts": {

package/test/helpers/GlossaryHelper.spec.js

@@ -20,6 +20,8 @@ const glossaryWord4 =
     '<span class="glossary-word" aria-label="Glossary Term">architect</span>'
 const glossaryWord5 =
     '<span class="glossary-word" aria-label="Glossary Term">universe</span>'
+const accentedGlossaryTerm =
+    '<span class="glossary-word" aria-label="Glossary Term">valores perif&eacute;ricos</span>'
 const glossaryWordSpaceBefore =
     '<span class="glossary-word" aria-label="Glossary Term"> Crisis change</span>'
 const glossaryWordSpaceAfter =
@@ -54,6 +56,13 @@ const glossary = [
         alternate_forms: ['crisis', 'change'],
         related_term: null,
     },
+    {
+        term: 'valores periféricos',
+        definition:
+            'Valores que son importantes pero no esenciales para una organización.',
+        tags: 'valores periféricos',
+        alternate_forms: [],
+    },
 ]
 const glossaryRender =
     '<p>Voluptas est quis ut <strong>consequatur.</strong> ' +
@@ -147,6 +156,14 @@ describe('GlossaryHelper ', () => {
             )
         ).toEqual([term])
     })
+    test('can retrieve verified glossary terms from accented words encoded to htmlentitites', () => {
+        expect(
+            GlossaryHelper.getContentVerifiedGlossaryTerms(
+                accentedGlossaryTerm + contentHtml,
+                glossary
+            )
+        ).toEqual([new GlossaryTerm(glossary[4])])
+    })
     test('can retrieve un-verified glossary terms', () => {
         expect(
             GlossaryHelper.getContentUnVerifiedGlossaryTerms(