@windward/core 0.7.0 → 0.9.0

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/i18n/sv-SE/components/utils/FillInBlank/FillInBlankInput.ts

@@ -10,4 +10,6 @@ export default {
     input_incorrect: "'{0}' är felaktig",
     reset: 'återställ',
     try_again: 'Try Again',
+    user_input: 'Ditt svar: {0}',
+    correct_answer: 'Rätt svar: {0}',
 }

package/i18n/sv-SE/components/utils/tiny_mce_wrapper.ts

@@ -1,5 +1,7 @@
 export default {
     accessibility: 'Tillgänglighet',
+    aria_text:
+        'Tryck på ALT + F10 eller fn + alternativ + F10 för att komma till verktygsfältet.',
     glossary: 'Ordlista',
     term: 'Ordlista Term',
     alternate_forms: 'Alternativa formulär',

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@windward/core",
-    "version": "0.7.0",
+    "version": "0.9.0",
     "description": "Windward UI Core Plugins",
     "main": "plugin.js",
     "scripts": {
@@ -36,7 +36,9 @@
     },
     "devDependencies": {
         "@babel/preset-env": "^7.16.11",
+        "@mindedge/vue-api-query": "^1.14.0",
         "@nuxtjs/axios": "^5.13.6",
+        "@nuxtjs/eslint-config-typescript": "^12.1.0",
         "@types/lodash": "^4.14.180",
         "@vue/cli-plugin-babel": "^5.0.4",
         "@vue/cli-plugin-typescript": "^5.0.4",
@@ -52,7 +54,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/pages/glossary.vue

@@ -1,6 +1,6 @@
 <template>
     <v-row justify="center" align="center">
-        <v-col cols="10">
+        <v-col cols="12">
             <div class="d-flex mb-5">
                 <h2 class="mr-auto flex-grow-1">
                     {{ $t('windward.core.pages.glossary.title') }}

package/stylelint.config.js

@@ -0,0 +1,14 @@
+module.exports = {
+    extends: ['stylelint-config-standard', 'stylelint-config-prettier'],
+    // add your custom config here
+    // https://stylelint.io/user-guide/configure
+    rules: {
+        'at-rule-no-unknown': null,
+        'selector-pseudo-element-no-unknown': [
+            true,
+            {
+                ignorePseudoElements: ['v-deep'],
+            },
+        ],
+    },
+}

package/test/Components/Content/Blocks/OpenResponseCollate.spec.js

@@ -2,13 +2,13 @@ import { shallowMount } from '@vue/test-utils'
 import Vue from 'vue'
 import Vuetify from 'vuetify'
 import { defaultMocks } from '@/test/mocks'
-import Image from '@/components/Content/Blocks/Image.vue'
+import OpenResponseCollate from '@/components/Content/Blocks/OpenResponseCollate.vue'
 
 Vue.use(Vuetify)
 
-describe('Image content block component', () => {
+describe('OpenResponseCollate content block component', () => {
     test('is a Vue instance', () => {
-        const wrapper = shallowMount(Image, {
+        const wrapper = shallowMount(OpenResponseCollate, {
             vuetify: new Vuetify(),
             mocks: defaultMocks,
             propsData: {

package/test/Components/Settings/TabSettings.spec.js

@@ -27,8 +27,8 @@ describe('TabSettings', () => {
         })
         wrapper.vm.onAddElement()
         expect(wrapper.vm.$data.block.metadata.config.items).toEqual([
-            { tabHeader: '', expand: false, content: '' },
-            { tabHeader: '', expand: false, content: '' },
+            { tabHeader: '', expand: false, content: '', imageAsset: null },
+            { tabHeader: '', expand: false, content: '', imageAsset: null },
         ])
     })
 

package/test/__mocks__/contentBlockMock.js

@@ -20,6 +20,26 @@ jest.mock(
     { virtual: true }
 )
 
+jest.mock(
+    '~/components/Content/ImageAssetViewer.vue',
+    () => {
+        return jest.fn().mockImplementation(() => {
+            return { test: () => {} }
+        })
+    },
+    { virtual: true }
+)
+
+jest.mock(
+    '~/components/Content/Settings/ImageAssetSettings.vue',
+    () => {
+        return jest.fn().mockImplementation(() => {
+            return { test: () => {} }
+        })
+    },
+    { virtual: true }
+)
+
 jest.mock(
     '~/components/Content/Blocks/BaseContentBlock',
     () => {

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: {