@windward/core 0.17.0 → 0.19.0

package/components/Settings/TabSettings.vue

@@ -1,27 +1,10 @@
 <template>
     <div>
         <v-row class="pl-3 pr-3">
-            <v-text-field
-                id="block-settings-title"
-                v-model="block.metadata.config.title"
-                :autofocus="true"
-                :rules="$Validation.getRule('block.title')"
-                :counter="$Validation.getLimit('block.title')"
-                outlined
-                :label="
-                    $t('windward.core.components.settings.clickable_icon.title')
-                "
+            <BaseContentBlockSettings
+                v-model="block.metadata.config"
                 :disabled="render"
-            ></v-text-field>
-            <v-textarea
-                id="block-settings-instructions"
-                v-model="block.metadata.config.instructions"
-                :rules="$Validation.getRule('block.instructions')"
-                :counter="$Validation.getLimit('block.instructions')"
-                outlined
-                :label="$t('components.content.settings.base.instructions')"
-                :disabled="render"
-            ></v-textarea>
+            ></BaseContentBlockSettings>
         </v-row>
         <v-divider class="my-4 primary"></v-divider>
         <p>{{ $t('windward.core.components.settings.tab.tabs') }}</p>
@@ -130,16 +113,30 @@
 <script>
 import _, { get } from 'lodash'
 import Crypto from '~/helpers/Crypto'
-import TextEditor from '~/components/Text/TextEditor'
 import ImageAssetSettings from '~/components/Content/Settings/ImageAssetSettings.vue'
 import BaseContentSettings from '~/components/Content/Settings/BaseContentSettings.js'
 import SortableExpansionPanel from '~/components/Core/SortableExpansionPanel.vue'
 import Uuid from '~/helpers/Uuid'
+import BaseContentBlockSettings from '~/components/Content/Settings/BaseContentBlockSettings.vue'
+import TextEditor from '~/components/Text/TextEditor'
 
 export default {
     name: 'TabSettings',
-    components: { TextEditor, ImageAssetSettings, SortableExpansionPanel },
+    components: {
+        TextEditor,
+        ImageAssetSettings,
+        SortableExpansionPanel,
+        BaseContentBlockSettings,
+    },
     extends: BaseContentSettings,
+    data() {
+        return {
+            expansionPanelKey: '0',
+            textEditorUpdateKey: Crypto.id(),
+            valid: true,
+            loading: false,
+        }
+    },
     beforeMount() {
         if (_.isEmpty(this.block)) {
             this.block = {}
@@ -158,6 +155,9 @@ export default {
         if (_.isEmpty(this.block.metadata.config.title)) {
             this.block.metadata.config.title = ''
         }
+        if (!_.isBoolean(this.block.metadata.config.display_title)) {
+            this.$set(this.block.metadata.config, 'display_title', true)
+        }
         if (
             _.isEmpty(this.block.metadata.config.instructions) &&
             this.block.id &&
@@ -188,14 +188,6 @@ export default {
             this.block.metadata.config.items.push(defaultObject)
         }
     },
-    data() {
-        return {
-            expansionPanelKey: '0',
-            textEditorUpdateKey: Crypto.id(),
-            valid: true,
-            loading: false,
-        }
-    },
     mounted() {
         if (this.block.metadata.config.items.length <= 0) {
             this.onAddElement()

package/components/Settings/UserUploadSettings.vue

@@ -1,24 +1,11 @@
 <template>
     <div>
-        <v-text-field
-            id="block-settings-title"
-            v-model="block.metadata.config.title"
-            outlined
-            :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.getRule('block.instructions')"
-            :counter="$Validation.getLimit('block.instructions')"
-            outlined
-            :label="$t('components.content.settings.base.instructions')"
-            :disabled="render"
-        ></v-textarea>
+        <v-container>
+            <BaseContentBlockSettings
+                v-model="block.metadata.config"
+                :disabled="render"
+            ></BaseContentBlockSettings>
+        </v-container>
         <v-switch
             v-model="block.metadata.config.uploadSettings.multiple"
             :label="
@@ -45,15 +32,15 @@
 </template>
 <script>
 import BaseContentSettings from '~/components/Content/Settings/BaseContentSettings.js'
-import Crypto from '~/helpers/Crypto'
-import TextEditor from '~/components/Text/TextEditor'
 import _ from 'lodash'
 import Uuid from '~/helpers/Uuid'
+import BaseContentBlockSettings from '~/components/Content/Settings/BaseContentBlockSettings.vue'
+import TextEditor from '~/components/Text/TextEditor'
 
 export default {
     name: 'UserUploadSettings',
+    components: { TextEditor, BaseContentBlockSettings },
     extends: BaseContentSettings,
-    components: { TextEditor },
     beforeMount() {
         if (_.isEmpty(this.block)) {
             this.block = {}
@@ -73,6 +60,9 @@ export default {
         if (_.isEmpty(this.block.metadata.config.title)) {
             this.block.metadata.config.title = ''
         }
+        if (!_.isBoolean(this.block.metadata.config.display_title)) {
+            this.$set(this.block.metadata.config, 'display_title', true)
+        }
         if (
             _.isEmpty(this.block.metadata.config.instructions) &&
             this.block.id &&

package/components/Settings/VideoSettings.vue

@@ -2,29 +2,18 @@
     <div>
         <v-row>
             <v-col cols="12">
-                <v-text-field
-                    id="block-settings-title"
-                    v-model="block.metadata.config.title"
-                    :rules="$Validation.getRule('block.title')"
-                    :counter="$Validation.getLimit('block.title')"
-                    outlined
-                    :label="$t('windward.core.components.settings.video.title')"
+                <BaseContentBlockSettings
+                    v-model="block.metadata.config"
                     :disabled="render"
-                ></v-text-field>
-                <v-textarea
-                    id="block-settings-instructions"
-                    v-model="block.metadata.config.description"
-                    outlined
-                    auto-grow
-                    :rules="$Validation.getRule('block.instructions')"
-                    :counter="$Validation.getLimit('block.instructions')"
-                    :label="
+                    :title-label="
+                        $t('windward.core.components.settings.video.title')
+                    "
+                    :instructions-label="
                         $t(
                             'components.content.settings.base.description_optional'
                         )
                     "
-                    :disabled="render"
-                ></v-textarea>
+                ></BaseContentBlockSettings>
 
                 <h4 class="mb-3">
                     {{ $t('windward.core.components.settings.video.sources') }}
@@ -404,11 +393,12 @@ import _ from 'lodash'
 import BaseContentSettings from '~/components/Content/Settings/BaseContentSettings.js'
 import ContentBlockAsset from '~/components/Content/ContentBlockAsset.vue'
 import SourcePicker from './VideoSettings/SourcePicker.vue'
+import BaseContentBlockSettings from '~/components/Content/Settings/BaseContentBlockSettings.vue'
 
 export default {
     name: 'VideoSettings',
+    components: { ContentBlockAsset, SourcePicker, BaseContentBlockSettings },
     extends: BaseContentSettings,
-    components: { ContentBlockAsset, SourcePicker },
     data() {
         return {
             fileTab: null,
@@ -450,6 +440,9 @@ export default {
             this.onAddPlaylistItem()
             this.playlistPaginator = 1
         }
+        if (!_.isBoolean(this.block.metadata.config.display_title)) {
+            this.$set(this.block.metadata.config, 'display_title', true)
+        }
     },
     mounted() {
         this.reloadMedia()

package/components/utils/GenerateAIQuestionButton.vue

@@ -41,9 +41,9 @@
                 ></v-select>
             </v-col>
             <v-col
+                v-if="isFlashcardType || isBucketGameType"
                 cols="auto"
                 class="d-flex align-center"
-                v-if="isFlashcardType"
             >
                 <v-switch
                     v-model="replaceExisting"
@@ -51,11 +51,7 @@
                     dense
                     color="secondary"
                     class="mt-0 pt-0"
-                    :label="
-                        $t(
-                            'windward.games.components.settings.flashcard.form.replace_existing'
-                        )
-                    "
+                    :label="replaceExistingLabel"
                     :disabled="isLoading"
                 ></v-switch>
             </v-col>
@@ -126,6 +122,19 @@ export default {
         isFlashcardType() {
             return this.questionType === 'flashcard'
         },
+        isBucketGameType() {
+            return this.questionType === 'bucket_game'
+        },
+        replaceExistingLabel() {
+            if (this.isBucketGameType) {
+                return this.$t(
+                    'windward.games.components.settings.bucket_game.form.replace_existing'
+                )
+            }
+            return this.$t(
+                'windward.games.components.settings.flashcard.form.replace_existing'
+            )
+        },
         flattenedContent() {
             let cloneContentTree = _.cloneDeep(this.contentTree)
             const homepage = this.$ContentService.getHomepage()
@@ -184,9 +193,10 @@ export default {
             ]
 
             // Only add higher-level Bloom's taxonomy for supported question types
-            // Flashcards use only basic levels
+            // Flashcards and bucket games use only basic levels
             if (
                 !this.isFlashcardType &&
+                !this.isBucketGameType &&
                 (this.questionType === 'multi_choice_single_answer' ||
                     this.questionType === 'ordering' ||
                     this.questionType === 'multi_choice_multi_answer')
@@ -277,6 +287,52 @@ export default {
                             'Invalid response from flashcard generation'
                         )
                     }
+                } else if (this.questionType === 'bucket_game') {
+                    // BUCKET GAME GENERATION
+                    const activity = new Activity()
+
+                    const endpoint = `suggest/bucket_game${bloomsRequest}`
+
+                    response = await Activity.custom(
+                        course,
+                        content,
+                        activity,
+                        endpoint
+                    ).get()
+
+                    let activityData = null
+
+                    if (response && response.activity) {
+                        activityData = response.activity
+                    } else if (
+                        response &&
+                        response.length > 0 &&
+                        response[0] &&
+                        response[0].activity
+                    ) {
+                        activityData = response[0].activity
+                    } else if (Array.isArray(response) && response.length > 0) {
+                        activityData = response[0]
+                    }
+
+                    if (
+                        activityData &&
+                        activityData.metadata &&
+                        activityData.metadata.config &&
+                        activityData.metadata.config.bucket_titles &&
+                        activityData.metadata.config.bucket_answers
+                    ) {
+                        // We pass the activity data and the replace flag to the parent component
+                        this.$emit(
+                            'click:generate',
+                            activityData,
+                            this.replaceExisting
+                        )
+                    } else {
+                        throw new Error(
+                            'Invalid response from bucket game generation'
+                        )
+                    }
                 } else {
                     // ASSESSMENT QUESTION GENERATION
                     const assessment = new Assessment({ id: this.block.id })
@@ -308,16 +364,32 @@ export default {
                 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 = ''
 
-                if (errorType === 'technical') {
-                    const errorCode =
-                        error.response?.data?.error?.details?.error_type ||
-                        'UNKNOWN'
-                    errorText = errorText.replace('[ERROR_CODE]', errorCode)
+                // Check for content mismatch error specifically for bucket games
+                if (
+                    (errorMessage === 'activity.error.content_mismatch' ||
+                        errorType === 'content_mismatch') &&
+                    this.questionType === 'bucket_game'
+                ) {
+                    errorText =
+                        this.$t(`${basePath}.content_mismatch_bucket_game`) +
+                        '\n\n' +
+                        this.$t(
+                            `${basePath}.content_mismatch_bucket_game_support`
+                        )
+                } else {
+                    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'
+                        errorText = errorText.replace('[ERROR_CODE]', errorCode)
+                    }
                 }
 
                 this.$dialog.error(errorText, {