@windward/core 0.2.3 → 0.4.0

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

@@ -9,10 +9,12 @@ export default {
     item_color: 'Color del artículo',
     item_text: 'Texto del elemento',
     autocolor: 'Opciones de color automático',
+    icon_image: 'Usar imagen como ícono',
     display: {
         show_title: 'Mostrar siempre el título',
         show_background: 'Mostrar fondo',
         round_icon: 'Iconos redondos',
         italic_icon: 'Iconos en cursiva',
+        large_icon: 'Iconos grandes',
     },
 }

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

@@ -2,11 +2,18 @@ export default {
     hide_background: 'Ocultar fondo',
     modal: 'Haga clic para abrir en modal',
     decorative: 'Imagen decorativa',
-    toggle_description:
+    decorative_toggle_description:
         'Para cumplir con los estándares de accesibilidad, se requiere texto alternativo para todas las imágenes, excepto para las imágenes puramente decorativas. Esta configuración agregará el texto alternativo y el texto del lector de pantalla adecuados para los estudiantes.',
+    inherit_global_toggle_description:
+        'Cuando está habilitado, la imagen seleccionada utilizará texto alternativo y texto del lector de pantalla almacenado en el archivo, administrado en el administrador de archivos. Cuando está deshabilitada, la imagen seleccionada tendrá su propio texto alternativo y texto de lector de pantalla que no se comparte globalmente en el archivo.',
     alt_description:
         'El texto alternativo es un texto descriptivo que transmite el significado y el contexto de un elemento visual en un entorno digital, destinado a usuarios con discapacidad visual o que no pueden identificar visualmente una imagen. Esto debe ser breve y claro.',
     screenreader: 'Texto del lector de pantalla',
     screenreader_description:
         'Se puede agregar texto al lector de pantalla para brindarle al usuario que utiliza tecnología de asistencia más información sobre los elementos de la página',
+    inherit: 'Heredar configuración global',
+    inherit_no_alt:
+        'No hay texto alternativo global disponible para el archivo',
+    inherit_no_aria:
+        'No hay texto de lector de pantalla global disponible para el archivo',
 }

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

@@ -24,4 +24,7 @@ export default {
         instructions: 'Instrucciones',
         placeholder: 'Ingrese texto aquí',
     },
+    upload_file: 'Subir Archivo',
+    alt_image: 'Texto alternativo para imagen',
+    aria_described: 'Aria descrita por',
 }

package/i18n/sv-SE/components/content/blocks/image.ts

@@ -1,5 +1,5 @@
 export default {
     title: 'Välj en bild',
     description: 'Välj en bild att visa',
-    no_image_url: 'Ingen bild har valts ',
+    no_image_url: 'Ingen bilduppsättning ',
 }

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

@@ -9,10 +9,12 @@ export default {
     item_color: 'Artikelfärg',
     item_text: 'Artikeltext',
     autocolor: 'Auto-färgalternativ',
+    icon_image: 'Använd bild för ikon',
     display: {
         show_title: 'Visa alltid titel',
         show_background: 'Visa bakgrund',
         round_icon: 'Runda ikoner',
         italic_icon: 'Kursiva ikoner',
+        large_icon: 'Stora ikoner',
     },
 }

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

@@ -2,11 +2,16 @@ export default {
     hide_background: 'Dölj bakgrund',
     modal: 'Klicka för att öppna i modal',
     decorative: 'Dekorativ bild',
-    toggle_description:
+    decorative_toggle_description:
         'För att uppfylla tillgänglighetsstandarder krävs alt-text för alla bilder utom för rent dekorativa bilder. Den här inställningen kommer att lägga till rätt alt-text och skärmläsartext för eleverna.',
+    inherit_global_toggle_description:
+        'När den är aktiverad kommer den valda bilden att använda alt-text och skärmläsartext lagrad i filen, hanterad i filhanteraren. När den är inaktiverad kommer den valda bilden att ha sin egen unika alt-text och skärmläsartext som inte delas globalt på filen.',
     alt_description:
         'Alternativ text är beskrivande text som förmedlar innebörden och sammanhanget av ett visuellt föremål i en digital miljö, avsedd för användare som är synskadade eller på annat sätt oförmögna att visuellt identifiera en bild. Detta ska vara kort och tydligt.',
     screenreader: 'Skärmläsartext',
     screenreader_description:
         'Skärmläsartext kan läggas till för att ge en användare som använder hjälpmedel mer information om elementen på sidan',
+    inherit: 'Ärva globala inställningar',
+    inherit_no_alt: 'Ingen global alt-text tillgänglig för filen',
+    inherit_no_aria: 'Ingen global skärmläsartext tillgänglig för filen',
 }

package/i18n/sv-SE/shared/settings.ts

@@ -22,4 +22,7 @@ export default {
         instructions: 'Instruktioner',
         placeholder: 'Skriv in text här',
     },
+    upload_file: 'Ladda upp fil',
+    alt_image: 'Alternativ text till bild',
+    aria_described: 'Aria beskrivs av',
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@windward/core",
-    "version": "0.2.3",
+    "version": "0.4.0",
     "description": "Windward UI Core Plugins",
     "main": "plugin.js",
     "scripts": {
@@ -27,9 +27,10 @@
         "he": "^1.2.0",
         "lodash": "^4.17.21",
         "mathlive": "^0.75.0",
-        "mathml-to-latex": "^1.3.0",
+        "mathml-to-latex": "^1.4.0",
         "prettier": "^2.6.0",
-        "raw-loader": "^4.0.2"
+        "raw-loader": "^4.0.2",
+        "tinymce": "^7.1.0"
     },
     "devDependencies": {
         "@babel/preset-env": "^7.16.11",

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

@@ -27,8 +27,22 @@ describe('AccordionSettings', () => {
         })
         wrapper.vm.onAddElement()
         expect(wrapper.vm.$data.block.metadata.config.items).toEqual([
-            { header: '', expand: false, content: '' },
-            { header: '', expand: false, content: '' },
+            {
+                header: '',
+                expand: false,
+                content: '',
+                file: null,
+                altText: '',
+                ariaDescribedBy: '',
+            },
+            {
+                header: '',
+                expand: false,
+                content: '',
+                file: null,
+                altText: '',
+                ariaDescribedBy: '',
+            },
         ])
     })
 

package/test/__mocks__/componentsMock.js

@@ -1,101 +1,61 @@
-jest.mock(
-    '~/components/TextIconPicker.vue',
-    () => {
-        return {
-            props: {},
-            computed: {},
-            methods: {},
-        }
-    },
-    { virtual: true }
-)
+const shallowMocks = [
+    { path: '~/components/Core/AuditLogList' },
+    { path: '~/components/Core/AvatarUpload' },
+    { path: '~/components/Core/Breadcrumbs' },
+    { path: '~/components/Core/ColorPicker' },
+    { path: '~/components/Core/ContextMenu' },
+    { path: '~/components/Core/DialogBox' },
+    { path: '~/components/Core/DragDirection' },
+    { path: '~/components/Core/FileDropZone' },
+    { path: '~/components/Core/FormButtons' },
+    { path: '~/components/Core/Form', data: { validation: {} } },
+    { path: '~/components/Core/PageTopActionArea' },
+    { path: '~/components/Core/PluginRef' },
+    { path: '~/components/Core/SearchField' },
+    { path: '~/components/Core/SortableExpansionPanel' },
+    { path: '~/components/Core/SpeedDial' },
+    { path: '~/components/Core/TextIconPicker' },
+    { path: '~/components/Core/UserAvatar' },
+    { path: '~/components/Text/TextViewer' },
+    { path: '~/components/Text/TextEditor' },
+]
 
-jest.mock(
-    '~/components/SortableExpansionPanel.vue',
-    () => {
-        return {
-            props: {},
-            computed: {},
-            methods: {},
-        }
-    },
-    { virtual: true }
-)
+for (const index in shallowMocks) {
+    const mockData = shallowMocks[index].data || {}
+    const mockProps = shallowMocks[index].props || {}
+    const mockComputed = shallowMocks[index].computed || {}
+    const mockMethods = shallowMocks[index].methods || {}
 
-jest.mock(
-    '~/components/DialogBox.vue',
-    () => {
-        return {
-            props: {},
-            computed: {},
-            methods: {},
-        }
-    },
-    { virtual: true }
-)
+    jest.mock(
+        shallowMocks[index].path,
+        () => {
+            return {
+                data() {
+                    return { ...mockData }
+                },
+                props: mockProps,
+                computed: mockComputed,
+                methods: mockMethods,
+            }
+        },
+        { virtual: true }
+    )
 
-jest.mock(
-    '~/components/Text/TextViewer',
-    () => {
-        return {
-            props: {},
-            computed: {},
-            methods: {},
-        }
-    },
-    { virtual: true }
-)
-
-jest.mock(
-    '~/components/Text/TextEditor',
-    () => {
-        return {
-            props: {},
-            computed: {},
-            methods: {},
-        }
-    },
-    { virtual: true }
-)
-
-jest.mock(
-    '~/components/Form',
-    () => {
-        return {
-            props: {},
-            computed: {},
-            methods: {},
-            data() {
-                return { validation: {} }
+    // If the path does not include .vue then stub that out too
+    if (!shallowMocks[index].path.includes('.vue')) {
+        jest.mock(
+            shallowMocks[index].path + '.vue',
+            () => {
+                return {
+                    data() {
+                        return { ...mockData }
+                    },
+                    props: mockProps,
+                    computed: mockComputed,
+                    methods: mockMethods,
+                }
             },
-        }
-    },
-    { virtual: true }
-)
-
-jest.mock(
-    '~/components/Form.vue',
-    () => {
-        return {
-            props: {},
-            computed: {},
-            methods: {},
-            data() {
-                return { validation: {} }
-            },
-        }
-    },
-    { virtual: true }
-)
-
-jest.mock(
-    '~/components/ColorPicker.vue',
-    () => {
-        return {
-            props: {},
-            computed: {},
-            methods: {},
-        }
-    },
-    { virtual: true }
-)
+            { virtual: true }
+        )
+    }
+}

package/test/__mocks__/contentBlockMock.js

@@ -59,6 +59,12 @@ jest.mock(
                         resolve(true)
                     })
                 },
+                getAssetByFileAssetId(fileAssetId) {
+                    return null
+                },
+                resolveAsset(file) {
+                    return file
+                },
             },
         }
     },
@@ -101,7 +107,7 @@ jest.mock(
 )
 
 jest.mock(
-    '~/components/FileDropZone.vue',
+    '~/components/Core/FileDropZone.vue',
     () => {
         return {
             props: {},

package/test/__mocks__/contentSettingsMock.js

@@ -1,5 +1,6 @@
+// Mock the base settings
 jest.mock(
-    '~/components/Content/Tool/BaseContentSettings.js',
+    '~/components/Content/Settings/BaseContentSettings.js',
     () => {
         return {
             props: {
@@ -47,6 +48,12 @@ jest.mock(
                         resolve(true)
                     })
                 },
+                getAssetByFileAssetId(fileAssetId) {
+                    return null
+                },
+                resolveAsset(file) {
+                    return file
+                },
             },
         }
     },

package/test/__mocks__/helpersMock.js

@@ -1,3 +1,11 @@
+jest.mock(
+    '!raw-loader!sass-loader!./assets/tinymce/css/content.scss',
+    () => {
+        return ''
+    },
+    { virtual: true }
+)
+
 jest.mock(
     '~/helpers/Uuid',
     () => {
@@ -9,6 +17,7 @@ jest.mock(
     },
     { virtual: true }
 )
+
 jest.mock(
     '~/helpers/Download',
     () => {

package/test/__mocks__/modelMock.js

@@ -8,15 +8,50 @@ jest.mock('axios')
 
 // Define any new model mocks here. The imports / mocks will be auto-generated below
 const mockVirtualModels = [
+    { path: '~/models/AskTheExpert', resource: 'user-tools/ask-the-expert' },
+    { path: '~/models/AssessmentQuestion', resource: 'questions' },
     {
-        path: '~/models/UserContentBlockState',
-        resource: 'user-content-block-state',
+        path: '~/models/AssessmentQuestionType',
+        resource: 'assessments/questions/types',
     },
-    { path: '~/models/Enrollment', resource: 'enrollments' },
+    { path: '~/models/AssessmentResult', resource: 'assessment-results' },
+    { path: '~/models/Assessment', resource: 'assessments' },
+    { path: '~/models/ContactSupport', resource: 'user-tools/contact-support' },
     { path: '~/models/ContentBlock', resource: 'blocks' },
-    { path: '~/models/FileAsset', resource: 'file-assets' },
-    { path: '~/models/UserFileAsset', resource: 'user-files' },
+    { path: '~/models/Content', resource: 'content' },
+    { path: '~/models/CourseSection', resource: 'sections' },
     { path: '~/models/Course', resource: 'courses' },
+    { path: '~/models/CourseUserTrack', resource: 'track' },
+    { path: '~/models/Enrollment', resource: 'enrollments' },
+    { path: '~/models/FileAssetNamespace', resource: 'file-namespaces' },
+    { path: '~/models/FileAsset', resource: 'files' },
+    { path: '~/models/GradeMap', resource: 'maps' },
+    { path: '~/models/Grade', resource: 'grades' },
+    { path: '~/models/GradeType', resource: 'grades/types' },
+    { path: '~/models/Locale', resource: 'locales' },
+    { path: '~/models/Note', resource: 'notes' },
+    { path: '~/models/NotificationEvent', resource: 'notifications/events' },
+    { path: '~/models/NotificationTemplate', resource: 'notifications' },
+    { path: '~/models/NotificationType', resource: 'notifications/types' },
+    {
+        path: '~/models/OrganizationNotification',
+        resource: 'organization-notifications',
+    },
+    { path: '~/models/Organization', resource: 'organizations' },
+    { path: '~/models/Permission', resource: 'permissions' },
+    { path: '~/models/PermissionType', resource: 'permissions/types' },
+    { path: '~/models/Plugin', resource: 'plugins' },
+    { path: '~/models/repositories/AuthUserRepository', resource: 'users' },
+    { path: '~/models/Role', resource: 'roles' },
+    { path: '~/models/Rubric', resource: 'rubrics' },
+    { path: '~/models/ServiceStatus', resource: 'status' },
+    { path: '~/models/Tenant', resource: 'tenant' },
+    {
+        path: '~/models/UserContentBlockState',
+        resource: 'user-content-block-state',
+    },
+    { path: '~/models/UserGrade', resource: 'user-grades' },
+    { path: '~/models/UserNotification', resource: 'notifications' },
 ]
 
 const mockModels = [
@@ -24,12 +59,7 @@ const mockModels = [
 ]
 
 // DO NOT ALTER THE BELOW CODE
-jest.mock('', () => {
-    return {
-        __esModule: true,
-        default: class Model {},
-    }
-})
+
 class mockBaseModel extends mockModel {
     baseURL() {
         return 'http://windwardapi.local'
@@ -39,6 +69,34 @@ class mockBaseModel extends mockModel {
             resolve({ data: {} })
         })
     }
+
+    integrations() {
+        return this
+    }
+
+    where() {
+        return this
+    }
+
+    include() {
+        return this
+    }
+
+    with() {
+        return this
+    }
+
+    for() {
+        return this
+    }
+
+    get() {
+        return []
+    }
+
+    first() {
+        return {}
+    }
 }
 
 jest.mock(
@@ -52,35 +110,47 @@ jest.mock(
     { virtual: true }
 )
 
-for (let mockI = 0; mockI < mockVirtualModels.length; mockI++) {
-    jest.mock(
-        mockVirtualModels[mockI].path,
-        () => {
+const registerVirtualModels = function (mockVirtualModelsParam) {
+    for (let mockI = 0; mockI < mockVirtualModelsParam.length; mockI++) {
+        jest.mock(
+            mockVirtualModelsParam[mockI].path,
+            () => {
+                return {
+                    __esModule: true,
+                    default: class Model extends mockBaseModel {
+                        resource() {
+                            return (
+                                mockVirtualModelsParam[mockI].resource ||
+                                this.constructor.name
+                            )
+                        }
+                    },
+                }
+            },
+            { virtual: true }
+        )
+    }
+}
+
+const registerModels = function (mockModelsParam) {
+    for (let mockJ = 0; mockJ < mockModelsParam.length; mockJ++) {
+        jest.mock(mockModelsParam[mockJ].path, () => {
             return {
                 __esModule: true,
                 default: class Model extends mockBaseModel {
                     resource() {
                         return (
-                            mockVirtualModels[mockI].resource ||
+                            mockModelsParam[mockJ].resource ||
                             this.constructor.name
                         )
                     }
                 },
             }
-        },
-        { virtual: true }
-    )
+        })
+    }
 }
 
-for (let mockJ = 0; mockJ < mockModels.length; mockJ++) {
-    jest.mock(mockModels[mockJ].path, () => {
-        return {
-            __esModule: true,
-            default: class Model extends mockBaseModel {
-                resource() {
-                    return mockModels[mockJ].resource || this.constructor.name
-                }
-            },
-        }
-    })
-}
+registerVirtualModels(mockVirtualModels)
+registerModels(mockModels)
+
+export { registerVirtualModels, registerModels }

package/test/helpers/MathHelper.spec.js

@@ -98,7 +98,7 @@ describe('MahtHelper ', () => {
     test('detects content wrapped for tinymce', () => {
         expect(
             MathHelper.checkMathContentWrappedForTMCE(
-                `<span class ='windward-math-content'>` +
+                `<span class='windward-math-content'>` +
                     srEnhancedlatex +
                     `</span>` +
                     text +
@@ -111,7 +111,7 @@ describe('MahtHelper ', () => {
         expect(MathHelper.wrapMathContentForTinyMCE(srEnhancedlatex)).toEqual(
             `<span class ='windward-math-content'>` +
                 srEnhancedlatex +
-                `</span>`
+                `</span> &nbsp;`
         )
     })
     test('can wrap latexContent in math span for tinymce', () => {
@@ -122,7 +122,26 @@ describe('MahtHelper ', () => {
                 '$$' +
                 latexContent +
                 '$$' +
-                `</span>`
+                `</span> &nbsp;`
+        )
+    })
+
+    test('can wrap latexContent in math span for tinymce only once', () => {
+        expect(
+            MathHelper.wrapMathContentForTinyMCE(
+                '$$' + latexContent + '$$' + '$$' + latexContent + '$$'
+            )
+        ).toEqual(
+            `<span class ='windward-math-content'>` +
+                '$$' +
+                latexContent +
+                '$$' +
+                `</span> &nbsp;` +
+                `<span class ='windward-math-content'>` +
+                '$$' +
+                latexContent +
+                '$$' +
+                `</span> &nbsp;`
         )
     })
 })

package/tsconfig.json

@@ -6,6 +6,7 @@
         "noImplicitAny": false,
         "outDir": "./lib",
         "strict": true,
+        "lib": ["ES2021.String"],
         "paths": {
             "~/*": ["./*"],
             "@/*": ["./*"]

package/.idea/codeStyles/Project.xml

@@ -1,58 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <HTMLCodeStyleSettings>
-      <option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
-      <option name="HTML_ENFORCE_QUOTES" value="true" />
-    </HTMLCodeStyleSettings>
-    <JSCodeStyleSettings version="0">
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="Remove" />
-      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </JSCodeStyleSettings>
-    <TypeScriptCodeStyleSettings version="0">
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="Remove" />
-      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </TypeScriptCodeStyleSettings>
-    <VueCodeStyleSettings>
-      <option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
-      <option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
-    </VueCodeStyleSettings>
-    <codeStyleSettings language="HTML">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="JavaScript">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="TypeScript">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="Vue">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-  </code_scheme>
-</component>

package/.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>

package/.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
-  </profile>
-</component>