@windward/core 0.7.0 → 0.8.0

package/components/Settings/UserUploadSettings.vue

@@ -1,18 +1,20 @@
 <template>
     <div>
         <v-text-field
+            id="block-settings-title"
             v-model="block.metadata.config.title"
             outlined
-            :rules="validation.titleRules"
-            :counter="50"
+            :rules="$Validation.getRule('block.title')"
+            :counter="$Validation.getLimit('block.title')"
             :autofocus="true"
             :label="$t('components.content.settings.base.title')"
             :disabled="render"
         ></v-text-field>
         <v-textarea
+            id="block-settings-instructions"
             v-model="block.metadata.config.instructions"
-            :rules="validation.instructionRule"
-            :counter="255"
+            :rules="$Validation.getRule('block.instructions')"
+            :counter="$Validation.getLimit('block.instructions')"
             outlined
             :label="$t('components.content.settings.base.instructions')"
             :disabled="render"
@@ -129,32 +131,6 @@ export default {
                 boilerplate: true,
                 elevation: 0,
             },
-            validation: {
-                titleRules: [
-                    (v) => {
-                        if (v && v.length >= 50) {
-                            return this.$t(
-                                'windward.core.shared.settings.errors.input_limitations',
-                                [50]
-                            )
-                        } else {
-                            return true
-                        }
-                    },
-                ],
-                instructionRule: [
-                    (v) => {
-                        if (v && v.length >= 255) {
-                            return this.$t(
-                                'windward.core.shared.settings.errors.input_limitations',
-                                [255]
-                            )
-                        } else {
-                            return true
-                        }
-                    },
-                ],
-            },
         }
     },
     mounted() {},

package/components/Settings/VideoSettings/SourcePicker.vue

@@ -84,6 +84,7 @@
             :assets="assets"
             mimes="text/vtt,text/xml"
             allow-url
+            outlined
             class="mb-4"
             :disabled="disabled || sourceInherit || !source"
             @input="$emit('update:track', $event)"

package/components/Settings/VideoSettings.vue

@@ -3,19 +3,21 @@
         <v-row>
             <v-col cols="12">
                 <v-text-field
+                    id="block-settings-title"
                     v-model="block.metadata.config.title"
-                    :counter="50"
+                    :rules="$Validation.getRule('block.title')"
+                    :counter="$Validation.getLimit('block.title')"
                     outlined
-                    :rules="validation.shortInputRules"
                     :label="$t('windward.core.components.settings.video.title')"
                     :disabled="render"
                 ></v-text-field>
                 <v-textarea
+                    id="block-settings-instructions"
                     v-model="block.metadata.config.description"
                     outlined
                     auto-grow
-                    :rules="validation.instructionRule"
-                    :counter="255"
+                    :rules="$Validation.getRule('block.instructions')"
+                    :counter="$Validation.getLimit('block.instructions')"
                     :label="
                         $t(
                             'components.content.settings.base.description_optional'
@@ -426,44 +428,6 @@ export default {
                     },
                 },
             },
-            validation: {
-                shortInputRules: [
-                    (v) => {
-                        if (v && v.length >= 50) {
-                            return this.$t(
-                                'windward.core.shared.settings.errors.input_limitations',
-                                [50]
-                            )
-                        } else {
-                            return true
-                        }
-                    },
-                ],
-                instructionRule: [
-                    (v) => {
-                        if (v && v.length >= 255) {
-                            return this.$t(
-                                'windward.core.shared.settings.errors.input_limitations',
-                                [255]
-                            )
-                        } else {
-                            return true
-                        }
-                    },
-                ],
-                clueRule: [
-                    (v) => {
-                        if (v && v.length >= 155) {
-                            return this.$t(
-                                'windward.core.shared.settings.errors.input_limitations',
-                                [155]
-                            )
-                        } else {
-                            return true
-                        }
-                    },
-                ],
-            },
             showPreRoll: false,
             showPostRoll: false,
         }

package/components/utils/TinyMCEWrapper.vue

@@ -7,8 +7,9 @@
             "
             :data-cy="dataCy"
         >
-            <label v-if="label" class="editor-label">{{ label }}</label>
-
+            <slot name="label" :render="render">
+                <label v-if="label" class="editor-label">{{ label }}</label>
+            </slot>
             <Editor
                 :id="id"
                 :key="seed + (isDarkTheme ? '-theme-dark' : '-theme-light')"
@@ -26,7 +27,9 @@
             >
             </Editor>
 
-            <label v-if="hint" class="editor-hint">{{ hint }}</label>
+            <slot name="hint" :render="render">
+                <label v-if="hint" class="editor-hint">{{ hint }}</label>
+            </slot>
         </div>
 
         <v-btn-toggle dense multiple class="pt-1 d-flex justify-end">

package/helpers/GlossaryHelper.ts

@@ -62,9 +62,14 @@ export default class GlossaryHelper {
                         addTerm = false
                     }
                 })
+
                 if (
-                    _.trim(_.toLower(match[1])) ===
-                        _.trim(_.toLower(term.term)) &&
+                    ( _.trim(_.toLower(match[1])) ===
+                        _.trim(_.toLower(term.term)) ||
+                        term.alternate_forms && _.some(term.alternate_forms, alt => _.trim(_.toLower(alt)) === _.trim(_.toLower(match[1])))
+
+                    )
+                    &&
                     addTerm
                 ) {
                     verifiedTerms.push(new GlossaryTerm(term))
@@ -98,6 +103,8 @@ export default class GlossaryHelper {
             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])))
                 ) {
                     return item
                 }
@@ -140,6 +147,9 @@ export default class GlossaryHelper {
             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]))))
                 ) {
                     content = content.replace(
                         match[0],

package/i18n/en-US/components/settings/open_response_collate.ts

@@ -1,6 +1,6 @@
 export default {
     instructions:
-        'Check off open responses to collate. Drag the prompts to set the order you want the responses collated',
+        'Check off open response items to collate into a document.',
     include_prompts: 'Include Prompts',
     filename: 'Filename (Blank for current page name)',
 }

package/i18n/en-US/components/settings/scenario_choice.ts

@@ -3,8 +3,8 @@ export default {
     description: 'Description',
     over_item_limit: 'Cannot add more items',
     no_title: 'No Title',
-    item_title: 'Item Title',
-    item_text: 'Item Text',
+    item_title: 'Choice Text',
+    item_text: 'Explanation of This Choice',
     correct_choice: 'Is Correct Choice',
     show_reset: 'Allow Retries',
     display_style: 'Display Style',
@@ -16,4 +16,5 @@ export default {
         letter: 'Letters',
         number: 'Numbers',
     },
+    add_choice: 'Add Choice',
 }

package/i18n/en-US/components/settings/video.ts

@@ -42,7 +42,7 @@ export default {
         postroll: 'Postroll',
     },
     caption: {
-        title: 'Captions File',
+        title: 'Place Local Captions File',
         configure_blurb:
             'Upload a captions file (.vtt or .xml), pick one from the file manager, or add via the public URL',
     },

package/i18n/en-US/shared/settings.ts

@@ -21,7 +21,7 @@ export default {
         block_quote: 'Block Quote Settings',
     },
     errors: {
-        input_limitations: 'Must be less than {0} characters.'
+        input_limitations: 'Must be less than {0} characters.',
     },
     upload_file: 'Upload File',
     alt_image: 'Alternate text for image',

package/i18n/es-ES/components/settings/open_response_collate.ts

@@ -1,6 +1,6 @@
 export default {
     instructions:
-        'Marque las respuestas abiertas para cotejar. Arrastra las indicaciones para establecer el orden en el que deseas que se cotejen las respuestas',
+        'Marque los elementos de respuesta abiertos para recopilarlos en un documento.',
     include_prompts: 'Incluir mensajes',
     filename:
         'Nombre de archivo (en blanco para el nombre de la página actual)',

package/i18n/es-ES/components/settings/scenario_choice.ts

@@ -3,8 +3,8 @@ export default {
     description: 'Descripción',
     over_item_limit: 'No se pueden agregar más elementos',
     no_title: 'Sin título',
-    item_title: 'Título del artículo',
-    item_text: 'Texto del elemento',
+    item_title: 'Texto de elección',
+    item_text: 'Explicación de esta elección',
     correct_choice: 'Es la elección correcta',
     show_reset: 'Permitir reintentos',
     display_style: 'Estilo de visualización',
@@ -16,4 +16,5 @@ export default {
         letter: 'Letras',
         number: 'Números',
     },
+    add_choice: 'Agregar opción',
 }

package/i18n/es-ES/components/settings/video.ts

@@ -44,7 +44,7 @@ export default {
         postroll: 'Desplazamiento posterior',
     },
     caption: {
-        title: 'Archivo de subtítulos',
+        title: 'Colocar archivo de subtítulos locales',
         configure_blurb:
             'Cargue un archivo de subtítulos (.vtt o .xml), elija uno del administrador de archivos o agréguelo a través de la URL pública',
     },

package/i18n/es-ES/shared/settings.ts

@@ -23,7 +23,7 @@ export default {
         block_quote: 'Configuración de cotización en bloque',
     },
     errors: {
-        input_limitations: 'Debe tener menos de {0} caracteres.'
+        input_limitations: 'Debe tener menos de {0} caracteres.',
     },
     upload_file: 'Subir Archivo',
     alt_image: 'Texto alternativo para imagen',

package/i18n/sv-SE/components/settings/open_response_collate.ts

@@ -1,6 +1,6 @@
 export default {
     instructions:
-        'Bocka av öppna svar för att sortera. Dra uppmaningarna för att ställa in den ordning du vill att svaren ska sorteras',
+        'Bocka av öppna svarsobjekt för att sortera till ett dokument.',
     include_prompts: 'Inkludera uppmaningar',
     filename: 'Filnamn (tomt för nuvarande sidnamn)',
 }

package/i18n/sv-SE/components/settings/scenario_choice.ts

@@ -3,8 +3,8 @@ export default {
     description: 'Beskrivning',
     over_item_limit: 'Kan inte lägga till fler objekt',
     no_title: 'Ingen titel',
-    item_title: 'Artikeltitel',
-    item_text: 'Artikeltext',
+    item_title: 'Valtext',
+    item_text: 'Förklaring av detta val',
     correct_choice: 'Är rätt val',
     show_reset: 'Tillåt återförsök',
     display_style: 'Visa stil',
@@ -16,4 +16,5 @@ export default {
         letter: 'Brev',
         number: 'Nummer',
     },
+    add_choice: 'Lägg till val',
 }

package/i18n/sv-SE/components/settings/video.ts

@@ -42,7 +42,7 @@ export default {
         postroll: 'Postroll',
     },
     caption: {
-        title: 'Captions File',
+        title: 'Placera en lokal bildtextfil',
         configure_blurb:
             'Ladda upp en bildtextfil (.vtt eller .xml), välj en från filhanteraren eller lägg till via den offentliga webbadressen',
     },

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@windward/core",
-    "version": "0.7.0",
+    "version": "0.8.0",
     "description": "Windward UI Core Plugins",
     "main": "plugin.js",
     "scripts": {
@@ -36,6 +36,7 @@
     },
     "devDependencies": {
         "@babel/preset-env": "^7.16.11",
+        "@mindedge/vue-api-query": "^1.14.0",
         "@nuxtjs/axios": "^5.13.6",
         "@types/lodash": "^4.14.180",
         "@vue/cli-plugin-babel": "^5.0.4",
@@ -52,7 +53,6 @@
         "ts-jest": "^26.5.6",
         "typescript": "^4.6.3",
         "vue": "^2.6.14",
-        "vue-api-query": "^1.11.0",
         "vue-jest": "^3.0.7",
         "vuetify": "^2.6.4"
     }

package/test/__mocks__/modelMock.js

@@ -1,4 +1,4 @@
-import { Model as mockModel } from 'vue-api-query'
+import { Model as mockModel } from '@mindedge/vue-api-query'
 
 import axios from 'axios'
 jest.mock('axios')

package/test/helpers/GlossaryHelper.spec.js

@@ -16,6 +16,10 @@ const unVerifiedGlossaryWordWithSpace =
     '<span class="glossary-word" aria-label="Glossary Term"> Climate </span>'
 const glossaryWord3 =
     '<span class="glossary-word" aria-label="Glossary Term">Crisis change</span>'
+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 glossaryWordSpaceBefore =
     '<span class="glossary-word" aria-label="Glossary Term"> Crisis change</span>'
 const glossaryWordSpaceAfter =
@@ -32,7 +36,7 @@ const glossary = [
     {
         term: 'Architecto',
         definition: 'Architecto is a word that means architect of the universe',
-        alternate_forms: null,
+        alternate_forms: ['Architect', 'universe'],
         related_term: 'a,b,c,d',
     },
     {
@@ -47,7 +51,7 @@ const glossary = [
     {
         term: 'crisis change',
         definition: 'n/a',
-        alternate_forms: null,
+        alternate_forms: ['crisis', 'change'],
         related_term: null,
     },
 ]
@@ -135,7 +139,14 @@ describe('GlossaryHelper ', () => {
             )
         ).toEqual([term])
     })
-
+    test('can retrieve verified glossary terms from alternate form ', () => {
+        expect(
+            GlossaryHelper.getContentVerifiedGlossaryTerms(
+                glossaryWord4 + contentHtml + glossaryWord5,
+                glossary
+            )
+        ).toEqual([term])
+    })
     test('can retrieve un-verified glossary terms', () => {
         expect(
             GlossaryHelper.getContentUnVerifiedGlossaryTerms(
@@ -144,6 +155,14 @@ describe('GlossaryHelper ', () => {
             )
         ).toEqual([new GlossaryTerm({ term: 'unverified', definition: 'n/a' })])
     })
+    test('does not mistake alternate forms for un-verified glossary terms', () => {
+        expect(
+            GlossaryHelper.getContentUnVerifiedGlossaryTerms(
+                glossaryWord2 + contentHtml + glossaryWord4,
+                glossary
+            )
+        ).toEqual([new GlossaryTerm({ term: 'unverified', definition: 'n/a' })])
+    })
 
     test('can retrieve un-verified glossary terms with space', () => {
         expect(

package/test/mocks.js

@@ -55,6 +55,14 @@ const mocks = {
     window: {},
     app: {},
     $router: [],
+    $Validation: {
+        getRule() {},
+        getLimit() {},
+        addLimit() {},
+        addRule() {},
+        addLimits() {},
+        addRules() {},
+    },
     $PluginService: { mounted: () => {} },
     $PermissionService: { userHasAccessTo: () => {} },
     $Grading: {