@windward/core 0.14.0 → 0.16.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+### Release [0.16.0] created - 2025-04-29
+
+
+### Release [0.15.0] created - 2025-04-09
+
+
 ### Release [0.14.0] created - 2025-03-25
 
 

package/bitbucket-pipelines.yml

@@ -1,6 +1,14 @@
 image: atlassian/default-image:3
 
 pipelines:
+  pull-requests:
+    '**':
+      - step:
+          name: Build and test
+          image: node:16.20.2
+          script:
+            - npm install
+            - npm run test
   custom:
     create-release:
       import: infrastructure-automation:master:create-release

package/components/Content/Blocks/BlockQuote.vue

@@ -34,7 +34,9 @@
         <v-row>
             <v-col cols="12">
                 <p>
-                    {{ citation }}
+                    <span>{{
+                        citation && source ? citation + ',' : citation
+                    }}</span>
                     <span :class="sourceClass">{{ source }}</span>
                 </p>
             </v-col>
@@ -51,38 +53,10 @@ import BaseContentBlock from '~/components/Content/Blocks/BaseContentBlock'
 
 export default {
     name: 'ContentBlockTab',
-    extends: BaseContentBlock,
-    beforeMount() {
-        if (_.isEmpty(this.block)) {
-            this.block = {}
-        }
-        if (_.isEmpty(this.block.metadata)) {
-            this.block.metadata = {}
-        }
-        if (_.isEmpty(this.block.metadata.config)) {
-            this.block.metadata.config = {}
-        }
-        if (_.isEmpty(this.block.metadata.config.title)) {
-            this.block.metadata.config.title = ''
-        }
-        if (_.isEmpty(this.block.metadata.config.instructions)) {
-            this.block.metadata.config.instructions = ''
-        }
-        if (_.isEmpty(this.block.metadata.config.block_quote)) {
-            this.block.metadata.config.block_quote = {
-                quote: '',
-                author: '',
-                author_title: '',
-                organization: '',
-                source_title: '',
-                source_type: '',
-                source_url: '',
-            }
-        }
-        this.block.body = this.$t(
-            'windward.core.components.content.blocks.block_quote.body'
-        )
+    components: {
+        TextViewer,
     },
+    extends: BaseContentBlock,
     data() {
         return {}
     },
@@ -101,7 +75,6 @@ export default {
                     parts.push(value)
                 }
             }
-
             // If there were parts to return then prepend with a mdash
             if (parts.length > 0) {
                 return he.decode('&mdash;') + parts.join(', ')
@@ -113,24 +86,23 @@ export default {
             const parts = []
 
             const sourceTitle =
-                this.block.metadata.config.block_quote['source_title'] || ''
+                this.block.metadata.config.block_quote.source_title || ''
             const sourceType =
-                this.block.metadata.config.block_quote['source_type'] || ''
+                this.block.metadata.config.block_quote.source_type || ''
 
-            if (sourceTitle && sourceType) {
+            if (sourceType) {
                 switch (sourceType) {
                     case 'online_journal':
                         // Wrap the sourceTitle for online journals in quotes
-                        parts.push('"' + sourceTitle + '"')
+                        if (!_.isEmpty(sourceTitle)) {
+                            parts.push('"' + sourceTitle + '"')
+                        }
 
                         // For online journals also add the url if it exists
-                        if (
-                            this.block.metadata.config.block_quote['source_url']
-                        ) {
+                        if (this.block.metadata.config.block_quote.source_url) {
                             parts.push(
-                                this.block.metadata.config.block_quote[
-                                    'source_url'
-                                ]
+                                this.block.metadata.config.block_quote
+                                    .source_url
                             )
                         }
                         break
@@ -140,7 +112,6 @@ export default {
                         break
                 }
             }
-
             // If the citation is empty (aka we only have sources)
             // and there's sources then prepend with a mdash
             if (parts.length > 0 && this.citation === '') {
@@ -154,14 +125,47 @@ export default {
         },
         sourceClass() {
             if (
-                this.block.metadata.config.block_quote['source_title'] &&
-                this.block.metadata.config.block_quote['source_type'] &&
-                this.block.metadata.config.block_quote['source_type'] === 'book'
+                this.block.metadata.config.block_quote.source_title &&
+                this.block.metadata.config.block_quote.source_type &&
+                this.block.metadata.config.block_quote.source_type === 'book'
             ) {
                 return 'span-title'
+            } else {
+                return ''
             }
         },
     },
+    beforeMount() {
+        if (_.isEmpty(this.block)) {
+            this.block = {}
+        }
+        if (_.isEmpty(this.block.metadata)) {
+            this.block.metadata = {}
+        }
+        if (_.isEmpty(this.block.metadata.config)) {
+            this.block.metadata.config = {}
+        }
+        if (_.isEmpty(this.block.metadata.config.title)) {
+            this.block.metadata.config.title = ''
+        }
+        if (_.isEmpty(this.block.metadata.config.instructions)) {
+            this.block.metadata.config.instructions = ''
+        }
+        if (_.isEmpty(this.block.metadata.config.block_quote)) {
+            this.block.metadata.config.block_quote = {
+                quote: '',
+                author: '',
+                author_title: '',
+                organization: '',
+                source_title: '',
+                source_type: '',
+                source_url: '',
+            }
+        }
+        this.block.body = this.$t(
+            'windward.core.components.content.blocks.block_quote.body'
+        )
+    },
     mounted() {},
     methods: {},
 }

package/components/Content/Blocks/GenerateAIQuestionButton.vue

@@ -1,7 +1,46 @@
 <template>
     <div>
-        <v-row>
-            <v-col cols="12" class="d-flex justify-end pb-1">
+        <v-row class="container-generate-ai mt-2">
+            <v-col>{{
+                $t(
+                    'windward.core.components.content.blocks.generate_questions.ai_assistance'
+                )
+            }}</v-col>
+            <v-col>
+                <v-select
+                    v-model="selectedContent"
+                    :items="flattenedContent"
+                    class="btn-selector"
+                    outlined
+                    hide-details
+                    dense
+                    :label="
+                        $t(
+                            'windward.core.components.content.blocks.generate_questions.selected_pages'
+                        )
+                    "
+                    item-text="content.name"
+                    return-object
+                ></v-select>
+            </v-col>
+            <v-col>
+                <v-select
+                    v-model="selectedDifficulty"
+                    :items="taxonomyLevels"
+                    item-text="text"
+                    class="btn-selector"
+                    outlined
+                    hide-details
+                    dense
+                    :label="
+                        $t(
+                            'windward.core.components.content.blocks.generate_questions.blooms.blooms_taxonomy'
+                        )
+                    "
+                    return-object
+                ></v-select>
+            </v-col>
+            <v-col>
                 <v-btn
                     elevation="0"
                     color="secondary"
@@ -10,37 +49,33 @@
                     :disabled="isLoading"
                     @click="generateAIQuestion"
                 >
-                    <v-icon class="pr-1" v-if="!isLoading">mdi-magic-staff</v-icon>
-                    {{ $t('windward.core.components.content.blocks.generate_questions.button_label') }}
+                    <v-icon v-if="!isLoading" class="pr-1"
+                        >mdi-magic-staff</v-icon
+                    >
+                    {{
+                        $t(
+                            'windward.core.components.content.blocks.generate_questions.button_label'
+                        )
+                    }}
                     <template v-slot:loader>
-                        <v-progress-circular indeterminate size="23"></v-progress-circular>
+                        <v-progress-circular
+                            indeterminate
+                            size="23"
+                        ></v-progress-circular>
                     </template>
                 </v-btn>
             </v-col>
-            <v-col cols="12" class="d-flex justify-end pt-0">
-                <v-select
-                    v-model="selectedContent"
-                    :items="flattenedContent"
-                    class="btn-selector"
-                    outlined
-                    hide-details
-                    dense
-                    :label="$t('windward.core.components.content.blocks.generate_questions.selected_pages')"
-                    item-text="content.name"
-                    return-object
-                ></v-select>
-            </v-col>
         </v-row>
     </div>
 </template>
 
 <script>
+import _ from 'lodash'
+import { mapGetters } from 'vuex'
 import AssessmentQuestion from '~/models/AssessmentQuestion'
 import Course from '~/models/Course'
 import Assessment from '~/models/Assessment'
 import Content from '~/models/Content'
-import { mapGetters } from 'vuex'
-import _ from 'lodash'
 import Crypto from '~/helpers/Crypto'
 
 export default {
@@ -55,6 +90,12 @@ export default {
         return {
             isLoading: false,
             selectedContent: '',
+            selectedDifficulty: {
+                value: 'None',
+                text: this.$t(
+                    'windward.core.components.content.blocks.generate_questions.blooms.none'
+                ),
+            },
         }
     },
     computed: {
@@ -73,6 +114,10 @@ export default {
                 fullTree.push(content)
                 if (content.children.length > 0) {
                     fullTree = fullTree.concat(_.flatten(content.children))
+                    // check if children have children
+                    content.children.forEach((child) => {
+                        fullTree = fullTree.concat(_.flatten(child.children))
+                    })
                 }
             })
             //
@@ -85,17 +130,78 @@ export default {
             }
             return fullTree
         },
+        taxonomyLevels() {
+            let basicBloomTaxonomy = [
+                {
+                    value: 'None',
+                    text: this.$t(
+                        'windward.core.components.content.blocks.generate_questions.blooms.none'
+                    ),
+                },
+                {
+                    value: 'Remember',
+                    text: this.$t(
+                        'windward.core.components.content.blocks.generate_questions.blooms.remember'
+                    ),
+                },
+                {
+                    value: 'Understand',
+                    text: this.$t(
+                        'windward.core.components.content.blocks.generate_questions.blooms.understand'
+                    ),
+                },
+                {
+                    value: 'Apply',
+                    text: this.$t(
+                        'windward.core.components.content.blocks.generate_questions.blooms.apply'
+                    ),
+                },
+            ]
+
+            if (
+                this.questionType === 'multi_choice_single_answer' ||
+                this.questionType === 'ordering' ||
+                this.questionType === 'multi_choice_multi_answer'
+            ) {
+                const multiBlooms = [
+                    {
+                        value: 'Analyze',
+                        text: this.$t(
+                            'windward.core.components.content.blocks.generate_questions.blooms.analyze'
+                        ),
+                    },
+                    {
+                        value: 'Evaluate',
+                        text: this.$t(
+                            'windward.core.components.content.blocks.generate_questions.blooms.evaluate'
+                        ),
+                    },
+                ]
+                basicBloomTaxonomy = basicBloomTaxonomy.concat(multiBlooms)
+            }
+            return basicBloomTaxonomy
+        },
     },
     methods: {
         async generateAIQuestion() {
             this.isLoading = true
+            let bloomsRequest = ''
+            if (
+                this.selectedDifficulty.text !==
+                this.$t(
+                    'windward.core.components.content.blocks.generate_questions.blooms.none'
+                )
+            ) {
+                // send value to api call so its not changing with language
+                bloomsRequest = `?blooms_level=${this.selectedDifficulty.value}`
+            }
             try {
                 const response = await AssessmentQuestion.custom(
                     new Course(this.course),
                     new Content(this.selectedContent),
                     new Assessment({ id: this.block.id }),
                     new AssessmentQuestion(),
-                    `suggest/${this.questionType}`
+                    `suggest/${this.questionType}${bloomsRequest}`
                 ).get()
 
                 if (response && response.length > 0) {
@@ -103,27 +209,31 @@ export default {
                     this.$emit('click:generate', generatedQuestion)
                 }
             } catch (error) {
-                const errorMessage = error.response?.data?.error?.message || 'assessment.error.technical'
+                const errorMessage =
+                    error.response?.data?.error?.message ||
+                    'assessment.error.technical'
                 const errorType = errorMessage.split('.').pop()
-                const basePath = 'windward.core.components.content.blocks.generate_questions.error'
+                const basePath =
+                    'windward.core.components.content.blocks.generate_questions.error'
+
+                let errorText =
+                    this.$t(`${basePath}.${errorType}`) +
+                    '\n\n' +
+                    this.$t(`${basePath}.${errorType}_support`)
 
-                let errorText = this.$t(`${basePath}.${errorType}`) + '\n\n' + 
-                                this.$t(`${basePath}.${errorType}_support`)
-                
                 if (errorType === 'technical') {
-                    const errorCode = error.response?.data?.error?.details?.error_type || 'UNKNOWN'
+                    const errorCode =
+                        error.response?.data?.error?.details?.error_type ||
+                        'UNKNOWN'
                     errorText = errorText.replace('[ERROR_CODE]', errorCode)
                 }
-                
-                this.$dialog.error(
-                    errorText,
-                    {
-                        duration: 5000,
-                        keepOnHover: true,
-                        singleton: true,
-                        type: 'error'
-                    }
-                )
+
+                this.$dialog.error(errorText, {
+                    duration: 5000,
+                    keepOnHover: true,
+                    singleton: true,
+                    type: 'error',
+                })
             } finally {
                 this.isLoading = false
             }
@@ -136,4 +246,8 @@ export default {
 .btn-selector {
     width: 100%;
 }
+.container-generate-ai {
+    outline: 1px solid var(--v-secondary-base);
+    border-radius: 15px;
+}
 </style>

package/components/Content/Blocks/OpenResponse.vue

@@ -155,7 +155,13 @@ export default {
             this.block.metadata.config.starting_text = ''
         }
     },
-    watch: {},
+    watch: {
+        render(newVal) {
+            if (newVal) {
+                this.onAfterSetContentBlockState()
+            }
+        },
+    },
     mounted() {},
     methods: {
         async onAfterSetContentBlockState() {
@@ -181,11 +187,13 @@ export default {
                 }
 
                 // If after the state is applied the response is still empty then apply the default response
-                if (this.response === '') {
+                if (_.isEmpty(this.response)) {
                     this.response = this.block.metadata.config.starting_text
                 }
+            } else {
+                // If we don't have a block_id then we are in the initial setup state
+                this.response = this.block.metadata.config.starting_text
             }
-
             this.stateLoaded = true
         },
         onSubmit() {

package/components/Content/Blocks/UserUpload/ManageDataTableUserFiles.vue

@@ -1,9 +1,9 @@
 <template>
-    <div class="text-center">
+    <div>
         <DialogBox
             v-bind="$attrs"
             transition="dialog-bottom-transition"
-            :color="color"
+            color="primary"
             v-if="value.file_assets && value.file_assets.length > 0"
         >
             <template #title>{{
@@ -45,15 +45,6 @@ export default {
             userUploads: {},
         }
     },
-    computed: {
-        color() {
-            if (this.value.file_assets && this.value.file_assets.length > 0) {
-                return 'success'
-            } else {
-                return ''
-            }
-        },
-    },
     watch: {
         value(newVal) {
             this.userUploads = newVal

package/components/Content/Blocks/Video.vue

@@ -332,7 +332,7 @@ export default {
                     captionsmenu: true, // Show the captions below the video
                     playlistmenu: true, // Show the playlist menu if there's multiple videos
                     playlistautoadvance: true, // Play the next source group
-                    playbackrates: [0.5, 1, 1.5, 2], // Default playback speeds
+                    playbackrates: [0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2], // Default playback speeds
                 },
                 playlist: [
                     /*{