@windward/core 0.4.3 → 0.5.1

package/components/Content/Blocks/GenerateAIQuestionButton.vue

@@ -0,0 +1,61 @@
+<template>
+    <v-btn
+        elevation="0"
+        color="primary"
+        icon
+        @click="generateAIQuestion"
+        :loading="isLoading"
+        :disabled="isLoading"
+    >
+        <v-icon v-if="!isLoading">mdi-magic-staff</v-icon>
+        <template v-slot:loader>
+            <v-progress-circular indeterminate size="23"></v-progress-circular>
+        </template>
+    </v-btn>
+</template>
+
+<script>
+import AssessmentQuestion from '~/models/AssessmentQuestion'
+import Course from '~/models/Course'
+import Assessment from '~/models/Assessment'
+import Content from '~/models/Content'
+
+export default {
+    name: 'GenerateAIQuestionButton',
+    props: {
+        course: { type: Object, required: true },
+        content: { type: Object, required: true },
+        block: { type: Object, required: true },
+        questionType: { type: String, required: true },
+    },
+    data() {
+        return {
+            isLoading: false,
+        }
+    },
+    methods: {
+        async generateAIQuestion() {
+            this.isLoading = true
+            try {
+                const response = await AssessmentQuestion.custom(
+                    new Course(this.course),
+                    new Content(this.content),
+                    new Assessment({ id: this.block.id }),
+                    new AssessmentQuestion(),
+					`suggest/${this.questionType}`
+                ).get()
+
+                if (response && response.length > 0) {
+                    const generatedQuestion = response[0]
+                    this.$emit('click:generate', generatedQuestion)
+                }
+            } catch (error) {
+                console.error(error)
+                this.$dialog.error(this.$t('windward.core.components.content.blocks.generate_questions.error'))
+            } finally {
+                this.isLoading = false
+            }
+        },
+    },
+}
+</script>

package/components/Content/Blocks/ScenarioChoice.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <v-container>
+        <v-container class="pa-0">
             <h2>{{ block.metadata.config.title }}</h2>
             <h4>{{ block.metadata.config.description }}</h4>
             <p>
@@ -23,7 +23,7 @@
                 </v-btn>
             </div>
         </v-container>
-        <v-container>
+        <v-container class="pa-0">
             <v-row
                 v-for="(item, itemIndex) in block.metadata.config.items"
                 :key="itemIndex"

package/components/Content/Blocks/UserUpload.vue

@@ -1,26 +1,22 @@
 <template>
-    <v-container>
-        <div v-if="render || !block.metadata.config.expand">
+    <v-container class="pa-0">
+        <div>
+            <h2 v-if="block.metadata.config.title">
+                {{ block.metadata.config.title }}
+            </h2>
             <v-row>
                 <v-col cols="12">
-                    {{
-                        $t(
-                            'windward.core.components.content.blocks.user_upload.instructions'
-                        )
-                    }}
-                    <p v-if="!block.metadata.config.instructions">
-                        {{
-                            $t(
-                                'windward.core.components.content.blocks.user_upload.instructions_none'
-                            )
-                        }}
-                    </p>
                     <TextViewer
+                        v-if="render || !block.__expandInstructions"
                         v-model="block.metadata.config.instructions"
                     ></TextViewer>
+                    <TextEditor
+                        v-if="!render && block.__expandInstructions"
+                        v-model="block.metadata.config.instructions"
+                    />
                 </v-col>
-                <v-col cols="12">
-                    <v-alert v-if="!blockExists" color="warning">
+                <v-col v-if="!blockExists" cols="12">
+                    <v-alert color="warning">
                         <p>
                             {{
                                 $t(
@@ -73,20 +69,6 @@
                 </v-col>
             </v-row>
         </div>
-        <div v-if="!render && block.metadata.config.expand">
-            <v-row>
-                <v-col cols="12">
-                    <h3 class="pb-4">
-                        {{
-                            $t(
-                                'windward.core.components.content.blocks.user_upload.instructions_title'
-                            )
-                        }}
-                    </h3>
-                    <TextEditor v-model="block.metadata.config.instructions" />
-                </v-col>
-            </v-row>
-        </div>
     </v-container>
 </template>
 
@@ -119,6 +101,9 @@ export default {
         if (_.isEmpty(this.block)) {
             this.block = {}
         }
+        // Default the instructions to collapsed
+        this.block.__expandInstructions = false
+
         if (_.isEmpty(this.block.body)) {
             this.block.body = this.$t(
                 'windward.core.shared.content_blocks.title.user_upload'
@@ -130,9 +115,6 @@ export default {
         if (_.isEmpty(this.block.metadata.config)) {
             this.block.metadata.config = {}
         }
-        if (_.isEmpty(this.block.metadata.config.expand)) {
-            this.block.metadata.config.expand = false
-        }
         if (_.isEmpty(this.block.metadata.config.instructions)) {
             this.block.metadata.config.instructions = ''
         }
@@ -271,9 +253,6 @@ export default {
                     .first()
             }
         },
-        async onBeforeSave() {
-            return (this.block.metadata.config.expand = false)
-        },
     },
 }
 </script>

package/components/Content/Blocks/Video.vue

@@ -21,9 +21,12 @@
             type="image, image, list-item-avatar"
             class="reload-skeleton"
         ></v-skeleton-loader>
-        <h2 v-if="block.metadata.config.title" class="pl-4">
+        <h2 v-if="block.metadata.config.title">
             {{ block.metadata.config.title }}
         </h2>
+        <p v-if="block.metadata.config.description" class="pb-0 mb-0">
+            {{ block.metadata.config.description }}
+        </p>
         <VuetifyPlayer
             v-if="hasSource"
             :language="$i18n && $i18n.locale ? $i18n.locale : 'en-US'"
@@ -158,12 +161,11 @@ export default {
     data() {
         return {
             saveState: false,
-
             fileTab: null,
-
-            saveKey: null, // Used for checking changes in settings
             // Default config settings
             defaultConfig: {
+                title: '',
+                description: '',
                 // Default settings for new blocks
                 // This will be overridden in beforeMount()
                 type: 'video', // Allowed video|audio. In audio mode the player has a max-height of 40px
@@ -247,63 +249,11 @@ export default {
             this.$set(this.block, 'assets', [])
         }
     },
-    mounted() {
-        this.saveKey = this.settingsKey()
-    },
+    mounted() {},
     methods: {
-        /**
-         * Hash out the settings to see if there's any changes
-         */
-        settingsKey() {
-            const str = JSON.stringify(this.block.metadata.config)
-            return str.split('').reduce(function (a, b) {
-                a = (a << 5) - a + b.charCodeAt(0)
-                return a & a
-            }, 0)
-        },
-        async onActionPanelEdit() {
-            // Push any setting changes up
-            await this.onBeforeSave
-
-            // We're moving from edit mode to render mode
-            // Prompt about any unsaved changes
-            if (!this.render && this.settingsKey() !== this.saveKey) {
-                const self = this
-                this.$toast.info(this.$t('shared.forms.unsaved'), {
-                    icon: 'mdi-help',
-                    duration: null,
-                    action: [
-                        {
-                            text: this.$t('shared.forms.cancel'),
-                            onClick: (e, toastObject) => {
-                                toastObject.goAway(0)
-                                self.render = true
-                            },
-                        },
-                        {
-                            text: this.$t('shared.forms.confirm'),
-                            // router navigation
-                            onClick: async (e, toastObject) => {
-                                await this.onBeforeSave()
-                                // Saved, rehash the setting changes key
-                                this.saveKey = this.settingsKey()
-
-                                self.render = true
-                                toastObject.goAway(0)
-                            },
-                        },
-                    ],
-                })
-            } else {
-                this.render = !this.render
-            }
-        },
         async onBeforeSave() {
             this.block.body = 'video'
         },
-        onAfterSave() {
-            this.saveKey = this.settingsKey()
-        },
     },
 }
 </script>

package/components/Settings/AccordionSettings.vue

@@ -18,9 +18,7 @@
                     <template #header="{ item }">{{
                         item.header
                             ? item.header
-                            : $t(
-                                  'windward.core.shared.settings.title.placeholder'
-                              )
+                            : $t('components.content.settings.base.placeholder')
                     }}</template>
                     <template #body="{ index }">
                         <v-container :key="expansionPanelKey">
@@ -31,9 +29,7 @@
                                 :autofocus="true"
                                 outlined
                                 :label="
-                                    $t(
-                                        'windward.core.shared.settings.title.title'
-                                    )
+                                    $t('components.content.settings.base.title')
                                 "
                                 :disabled="render"
                                 @focus="onTextAreaFocus"
@@ -41,6 +37,7 @@
                             <v-btn
                                 text
                                 elevation="0"
+                                class="mb-3"
                                 :disabled="render"
                                 @click="
                                     onToggleExpand(

package/components/Settings/BlockQuoteSettings.vue

@@ -7,7 +7,7 @@
                 outlined
                 :counter="50"
                 :autofocus="true"
-                :label="$t('windward.core.shared.settings.title.title')"
+                :label="$t('components.content.settings.base.title')"
                 ref="title"
                 :disabled="render"
             ></v-text-field>
@@ -16,22 +16,20 @@
                 outlined
                 auto-grow
                 :counter="255"
-                :label="$t('windward.core.shared.settings.title.instructions')"
+                :label="$t('components.content.settings.base.instructions')"
                 :disabled="render"
             ></v-textarea>
         </v-container>
         <v-divider class="my-4 primary"></v-divider>
         <v-container class="pa-0">
-            <v-textarea
+            <TextEditor
                 v-model="block.metadata.config.block_quote.quote"
-                outlined
-                auto-grow
-                :counter="255"
+                :height="200"
                 :label="
                     $t('windward.core.components.settings.block_quote.body')
                 "
                 :disabled="render"
-            ></v-textarea>
+            ></TextEditor>
         </v-container>
         <v-divider class="my-4 primary"></v-divider>
         <v-container class="pa-0">
@@ -80,6 +78,21 @@
                 "
                 :disabled="render"
             ></v-select>
+            <v-text-field
+                v-if="
+                    block.metadata.config.block_quote.source_type ===
+                    'online_journal'
+                "
+                v-model="block.metadata.config.block_quote.source_url"
+                outlined
+                auto-grow
+                :label="
+                    $t(
+                        'windward.core.components.settings.block_quote.source_url'
+                    )
+                "
+                :disabled="render"
+            ></v-text-field>
         </v-container>
         <div v-if="loading" class="text-center">
             <v-progress-circular
@@ -93,11 +106,13 @@
 </template>
 <script>
 import _ from 'lodash'
+import TextEditor from '~/components/Text/TextEditor.vue'
 import BaseContentSettings from '~/components/Content/Settings/BaseContentSettings.js'
 
 export default {
     name: 'BlockQuoteSettings',
     extends: BaseContentSettings,
+    components: { TextEditor },
     beforeMount() {
         if (_.isEmpty(this.block)) {
             this.block = {}
@@ -122,6 +137,7 @@ export default {
                 organization: '',
                 source_title: '',
                 source_type: '',
+                source_url: '',
             }
         }
         this.block.body = this.$t(
@@ -132,15 +148,29 @@ export default {
         return {
             valid: true,
             loading: false,
-            sourceTypes: ['None', 'Book', 'Online Journal'],
-        }
-    },
-    beforeDestroy() {
-        if (this.debouncer) {
-            clearTimeout(this.debouncer)
+            sourceTypes: [
+                {
+                    text: this.$t(
+                        'windward.core.components.settings.block_quote.source_types.none'
+                    ),
+                    value: '',
+                },
+
+                {
+                    text: this.$t(
+                        'windward.core.components.settings.block_quote.source_types.book'
+                    ),
+                    value: 'book',
+                },
+                {
+                    text: this.$t(
+                        'windward.core.components.settings.block_quote.source_types.online_journal'
+                    ),
+                    value: 'online_journal',
+                },
+            ],
         }
     },
-
     methods: {},
 }
 </script>

package/components/Settings/EmailSettings.vue

@@ -8,7 +8,7 @@
                 outlined
                 :counter="50"
                 :autofocus="true"
-                :label="$t('windward.core.shared.settings.title.title')"
+                :label="$t('components.content.settings.base.title')"
                 :disabled="render"
             ></v-text-field>
             <v-textarea
@@ -16,7 +16,7 @@
                 outlined
                 auto-grow
                 :counter="255"
-                :label="$t('windward.core.shared.settings.title.instructions')"
+                :label="$t('components.content.settings.base.instructions')"
                 :disabled="render"
             ></v-textarea>
         </v-container>

package/components/Settings/FileDownloadSettings.vue

@@ -0,0 +1,168 @@
+<template>
+    <div>
+        <v-text-field
+            v-model="block.metadata.config.title"
+            outlined
+            :counter="50"
+            :autofocus="true"
+            :label="$t('components.content.settings.base.title_optional')"
+            :disabled="render"
+        ></v-text-field>
+        <TextEditor
+            v-model="block.metadata.config.instructions"
+            :disabled="render"
+            :label="
+                $t('components.content.settings.base.instructions_optional')
+            "
+        />
+        <v-switch
+            v-model="block.metadata.config.display_detailed"
+            :label="
+                $t(
+                    'windward.core.components.settings.file_download.display_detailed'
+                )
+            "
+            :disabled="render"
+        ></v-switch>
+        <v-spacer class="my-6" />
+
+        <SortableExpansionPanel
+            v-model="block.metadata.config.items"
+            :disabled="render"
+            @click:close="onRemoveElement($event)"
+        >
+            <template #header="{ item }">{{ filename(item) }}</template>
+            <template #body="{ index }">
+                <v-container>
+                    <v-text-field
+                        v-model="block.metadata.config.items[index].name"
+                        :autofocus="true"
+                        outlined
+                        :label="
+                            $t(
+                                'windward.core.components.settings.file_download.filename_optional'
+                            )
+                        "
+                        :disabled="render"
+                    ></v-text-field>
+                    <v-container class="pa-0 pt-3">
+                        <ContentBlockAsset
+                            v-model="block.metadata.config.items[index].file"
+                            :assets.sync="block.assets"
+                            :label="$t('shared.file.file')"
+                            :disabled="render"
+                        >
+                            <template #title>
+                                {{
+                                    $t(
+                                        'windward.core.components.settings.file_download.place_file'
+                                    )
+                                }}
+                            </template>
+                        </ContentBlockAsset>
+                    </v-container>
+                </v-container>
+            </template>
+        </SortableExpansionPanel>
+
+        <v-container class="pa-0">
+            <v-row justify="center" class="my-4">
+                <v-btn
+                    color="primary"
+                    elevation="0"
+                    :disabled="render"
+                    @click="onAddElement"
+                    ><v-icon>mdi-plus</v-icon
+                    >{{
+                        $t(
+                            'windward.core.components.settings.file_download.add'
+                        )
+                    }}</v-btn
+                >
+            </v-row>
+        </v-container>
+    </div>
+</template>
+<script>
+import BaseContentSettings from '~/components/Content/Settings/BaseContentSettings.js'
+import TextEditor from '~/components/Text/TextEditor'
+import _ from 'lodash'
+import SortableExpansionPanel from '~/components/Core/SortableExpansionPanel.vue'
+
+export default {
+    name: 'FileDownloadSettings',
+    extends: BaseContentSettings,
+    components: { TextEditor, SortableExpansionPanel },
+    data() {
+        return {}
+    },
+    computed: {
+        filename() {
+            return (item) => {
+                let filename = item.name
+
+                if (!filename && item.file) {
+                    const asset = this.resolveAsset(item.file)
+                    filename =
+                        _.get(asset, 'name', '') ||
+                        _.get(asset, 'asset.name', '')
+                }
+
+                if (!filename && item.file) {
+                    filename = this.$t(
+                        'windward.core.components.settings.file_download.no_file_selected'
+                    )
+                }
+                return filename
+            }
+        },
+    },
+    beforeMount() {
+        if (_.isEmpty(this.block)) {
+            this.block = {}
+        }
+        if (_.isEmpty(this.block.body)) {
+            this.block.body = this.$t(
+                'windward.core.shared.content_blocks.title.file_download'
+            )
+        }
+        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 (!_.isBoolean(this.block.metadata.config.display_detailed)) {
+            this.block.metadata.config.display_detailed = false
+        }
+
+        if (_.isEmpty(this.block.metadata.config.items)) {
+            this.block.metadata.config.items = []
+        }
+    },
+    mounted() {},
+    methods: {
+        onAddElement() {
+            const defaultItem = {
+                name: '',
+                file: null,
+            }
+            this.block.metadata.config.items.push(defaultItem)
+        },
+        onRemoveElement(index) {
+            this.block.metadata.config.items.splice(index, 1)
+        },
+    },
+}
+</script>
+<style scoped>
+.v-progress-circular {
+    margin: 1rem;
+}
+</style>