@windward/core 0.7.0 → 0.8.0

package/components/Settings/EmailSettings.vue

@@ -6,17 +6,17 @@
                 :autofocus="true"
                 ref="title"
                 outlined
-                :counter="50"
-                :rules="validation.shortInputRules"
+                :rules="$Validation.getRule('block.title')"
+                :counter="$Validation.getLimit('block.title')"
                 :label="$t('components.content.settings.base.title')"
                 :disabled="render"
             ></v-text-field>
             <v-textarea
                 v-model="block.metadata.config.instructions"
                 outlined
-                :rules="validation.instructionRule"
+                :rules="$Validation.getRule('block.instructions')"
+                :counter="$Validation.getLimit('block.instructions')"
                 auto-grow
-                :counter="255"
                 :label="$t('components.content.settings.base.instructions')"
                 :disabled="render"
             ></v-textarea>
@@ -42,8 +42,8 @@
                     <v-container :key="expansionPanelKey">
                         <v-text-field
                             v-model="block.metadata.config.emails[index].from"
-                            :rules="validation.shortInputRules"
-                            :counter="50"
+                            :rules="$Validation.getRule('shortInput')"
+                            :counter="$Validation.getLimit('shortInput')"
                             outlined
                             :label="
                                 $t(
@@ -54,8 +54,8 @@
                         ></v-text-field>
                         <v-text-field
                             v-model="block.metadata.config.emails[index].to"
-                            :rules="validation.shortInputRules"
-                            :counter="50"
+                            :rules="$Validation.getRule('shortInput')"
+                            :counter="$Validation.getLimit('shortInput')"
                             outlined
                             :label="
                                 $t('windward.core.components.settings.email.to')
@@ -64,8 +64,8 @@
                         ></v-text-field>
                         <v-text-field
                             v-model="block.metadata.config.emails[index].cc"
-                            :rules="validation.shortInputRules"
-                            :counter="50"
+                            :rules="$Validation.getRule('shortInput')"
+                            :counter="$Validation.getLimit('shortInput')"
                             outlined
                             :label="
                                 $t('windward.core.components.settings.email.cc')
@@ -76,8 +76,8 @@
                             v-model="
                                 block.metadata.config.emails[index].subject
                             "
-                            :rules="validation.shortInputRules"
-                            :counter="50"
+                            :rules="$Validation.getRule('shortInput')"
+                            :counter="$Validation.getLimit('shortInput')"
                             outlined
                             :label="
                                 $t(
@@ -213,32 +213,6 @@ export default {
             loading: false,
             expansionPanelKey: 0,
             editingPanel: 0,
-            validation: {
-                shortInputRules: [
-                    (v) => {
-                        if (v && v.length >= 50) {
-                            return this.$t(
-                                'windward.core.shared.settings.errors.input_limitations',
-                                [50]
-                            )
-                        } else {
-                            return true
-                        }
-                    },
-                ],
-                instructionRule: [
-                    (v) => {
-                        if (v && v.length >= 255) {
-                            return this.$t(
-                                'windward.core.shared.settings.errors.input_limitations',
-                                [255]
-                            )
-                        } else {
-                            return true
-                        }
-                    },
-                ],
-            },
         }
     },
     beforeDestroy() {

package/components/Settings/FileDownloadSettings.vue

@@ -1,19 +1,21 @@
 <template>
     <div>
         <v-text-field
+            id="block-settings-title"
             v-model="block.metadata.config.title"
             outlined
-            :counter="50"
-            :rules="validation.shortInputRules"
+            :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"
             outlined
-            :counter="255"
-            :rules="validation.instructionRule"
+            :rules="$Validation.getRule('block.instructions')"
+            :counter="$Validation.getLimit('block.instructions')"
             :disabled="render"
             :label="$t('components.content.settings.base.instructions')"
         ></v-textarea>
@@ -39,8 +41,8 @@
                     <v-text-field
                         v-model="block.metadata.config.items[index].name"
                         :autofocus="true"
-                        :counter="50"
-                        :rules="validation.shortInputRules"
+                        :rules="$Validation.getRule('shortInput')"
+                        :counter="$Validation.getLimit('shortInput')"
                         outlined
                         :label="
                             $t(
@@ -79,7 +81,7 @@
                     ><v-icon>mdi-plus</v-icon
                     >{{
                         $t(
-                            'windward.core.components.settings.file_download.add'
+                            'windward.core.components.settings.file_download.place_file'
                         )
                     }}</v-btn
                 >
@@ -98,34 +100,7 @@ export default {
     extends: BaseContentSettings,
     components: { TextEditor, SortableExpansionPanel },
     data() {
-        return {
-            validation: {
-                shortInputRules: [
-                    (v) => {
-                        if (v && v.length >= 50) {
-                            return this.$t(
-                                'windward.core.shared.settings.errors.input_limitations',
-                                [50]
-                            )
-                        } else {
-                            return true
-                        }
-                    },
-                ],
-                instructionRule: [
-                    (v) => {
-                        if (v && v.length >= 255) {
-                            return this.$t(
-                                'windward.core.shared.settings.errors.input_limitations',
-                                [255]
-                            )
-                        } else {
-                            return true
-                        }
-                    },
-                ],
-            },
-        }
+        return {}
     },
     computed: {
         filename() {

package/components/Settings/ImageSettings.vue

@@ -104,7 +104,7 @@
                 outlined
                 counter
                 maxlength="125"
-                :rules="validation.textRules"
+                :rules="$Validation.getRule('exists')"
                 disabled
             >
             </v-text-field>
@@ -118,7 +118,7 @@
                 :label="
                     $t('windward.core.components.navigation.image.default_alt')
                 "
-                :rules="validation.textRules"
+                :rules="$Validation.getRule('exists')"
                 :disabled="render"
             >
                 <template #append>
@@ -245,13 +245,7 @@ export default {
         }
     },
     data() {
-        return {
-            validation: {
-                textRules: [
-                    (v) => !!v || this.$t('shared.forms.errors.required'),
-                ],
-            },
-        }
+        return {}
     },
     watch: {},
     mounted() {},

package/components/Settings/OpenResponseCollateSettings.vue

@@ -33,41 +33,31 @@
                     color="primary"
                     @change="onLinkedChange"
                 >
-                    <draggable
-                        v-bind="dragOptions"
-                        :list="contentBlocks"
-                        @change="onDragChange"
+                    <v-list-item
+                        v-for="contentBlock in contentBlocks"
+                        :key="contentBlock.block_id"
+                        :value="contentBlock.block_id"
                     >
-                        <v-list-item
-                            v-for="contentBlock in contentBlocks"
-                            :key="contentBlock.block_id"
-                            :value="contentBlock.block_id"
-                        >
-                            <template #default="{ active }">
-                                <v-list-item-icon>
-                                    <v-icon>mdi-drag</v-icon>
-                                </v-list-item-icon>
-
-                                <v-list-item-content>
-                                    <v-list-item-title>
-                                        {{
-                                            contentBlock.block.body.replace(
-                                                /<[^>]*>?/gm,
-                                                ''
-                                            )
-                                        }}
-                                    </v-list-item-title>
-                                </v-list-item-content>
-                                <v-list-item-action>
-                                    <v-checkbox
-                                        :input-value="active"
-                                        color="primary"
-                                        :disabled="render"
-                                    ></v-checkbox>
-                                </v-list-item-action>
-                            </template>
-                        </v-list-item>
-                    </draggable>
+                        <template #default="{ active }">
+                            <v-list-item-content>
+                                <v-list-item-title>
+                                    {{
+                                        contentBlock.body.replace(
+                                            /<[^>]*>?/gm,
+                                            ''
+                                        )
+                                    }}
+                                </v-list-item-title>
+                            </v-list-item-content>
+                            <v-list-item-action>
+                                <v-checkbox
+                                    :input-value="active"
+                                    color="primary"
+                                    :disabled="render"
+                                ></v-checkbox>
+                            </v-list-item-action>
+                        </template>
+                    </v-list-item>
                 </v-list-item-group>
             </v-list>
         </v-form>
@@ -84,7 +74,7 @@ import ContentBlock from '~/models/ContentBlock'
 import Course from '~/models/Course'
 
 export default {
-    name: 'ImageSettings',
+    name: 'OpenResponseCollateSettings',
     extends: BaseContentSettings,
     components: { draggable, TextEditor },
     props: {
@@ -117,6 +107,8 @@ export default {
         )
             .for(new Course({ id: this.course.id }))
             .get()
+
+        this.sortContentBlocks(this.contentBlocks)
     },
     beforeMount() {
         if (_.isEmpty(this.block)) {
@@ -141,34 +133,34 @@ export default {
         if (!_.isBoolean(this.block.metadata.config.include_prompts)) {
             this.block.metadata.config.include_prompts = false
         }
-
         this.linked = this.block.metadata.config.linked
     },
     watch: {},
     mounted() {},
     methods: {
-        // Called when the order changes
-        onDragChange(e) {
-            this.setLinkedBlocks()
+        sortContentBlocks(contentBlocks) {
+            let contentBlocksByPage = []
+            const blockMap = []
+            // getting page order
+            const contentBlockTree = this.$ContentService.getFlatTree()
+            contentBlockTree.forEach(function (page, index) {
+                contentBlocks.forEach((block) => {
+                    // If the block is on this page and it wasn't already used on a different page
+                    if (
+                        page.content_id === block.content_id &&
+                        !blockMap.includes(block.block_id)
+                    ) {
+                        contentBlocksByPage.push(block)
+                        blockMap.push(block.block_id)
+                    }
+                })
+            })
+            this.contentBlocks = contentBlocksByPage
         },
         // Called when blocks are added / removed
         onLinkedChange() {
-            this.setLinkedBlocks()
-        },
-        setLinkedBlocks() {
-            const linkedBlockIds = []
-
-            // Loop over content blocks since they have the correct order we want to collate
-            this.contentBlocks.forEach((contentBlock) => {
-                // If the unsorted this.linked includes the block id, add it in the right order
-                if (this.linked.includes(contentBlock.block_id)) {
-                    linkedBlockIds.push(contentBlock.block_id)
-                }
-            })
-
-            // Set the linked and also body for convenience
-            this.block.metadata.config.linked = linkedBlockIds
-            this.block.body = linkedBlockIds.join()
+            // update block with linked open response for download
+            this.block.metadata.config.linked = this.linked
         },
     },
 }

package/components/Settings/OpenResponseSettings.vue

@@ -1,43 +1,63 @@
 <template>
     <v-container>
-        <v-form>
-            <p>
-                {{
-                    $t(
-                        'windward.core.components.settings.open_response.question'
-                    )
-                }}
-            </p>
-            <TextEditor
-                v-model="block.body"
-                :height="200"
+        <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')
+                "
                 :disabled="render"
-            ></TextEditor>
-            <p class="pt-4">
-                {{
-                    $t(
-                        'windward.core.components.settings.open_response.sample_response'
-                    )
-                }}
-            </p>
-            <TextEditor
-                v-model="block.metadata.config.sample_response"
-                :height="200"
+            ></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"
-            ></TextEditor>
-            <p class="pt-4">
-                {{
-                    $t(
-                        'windward.core.components.settings.open_response.starting_text'
-                    )
-                }}
-            </p>
-            <TextEditor
-                v-model="block.metadata.config.starting_text"
-                :height="200"
-                :disabled="render"
-            ></TextEditor>
-        </v-form>
+            ></v-textarea>
+        </v-row>
+        <p>
+            {{ $t('windward.core.components.settings.open_response.question') }}
+        </p>
+        <TextEditor
+            id="block-settings-body"
+            v-model="block.body"
+            :height="200"
+            :disabled="render"
+        ></TextEditor>
+        <p class="pt-4">
+            {{
+                $t(
+                    'windward.core.components.settings.open_response.sample_response'
+                )
+            }}
+        </p>
+        <TextEditor
+            id="block-settings-sample-response"
+            v-model="block.metadata.config.sample_response"
+            :height="200"
+            :disabled="render"
+        ></TextEditor>
+        <p class="pt-4">
+            {{
+                $t(
+                    'windward.core.components.settings.open_response.starting_text'
+                )
+            }}
+        </p>
+        <TextEditor
+            id="block-settings-starting-text"
+            v-model="block.metadata.config.starting_text"
+            :height="200"
+            :disabled="render"
+        ></TextEditor>
     </v-container>
 </template>
 
@@ -67,6 +87,12 @@ export default {
         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.sample_response)) {
             this.block.metadata.config.sample_response = ''
         }

package/components/Settings/ScenarioChoiceSettings.vue

@@ -3,11 +3,11 @@
         <v-container class="pa-0">
             <v-col class="pa-0">
                 <v-text-field
+                    id="block-settings-title"
                     v-model="block.metadata.config.title"
-                    :rules="validation.shortInputRules"
-                    :counter="50"
+                    :rules="$Validation.getRule('block.title')"
+                    :counter="$Validation.getLimit('block.title')"
                     outlined
-                    id="title"
                     :label="
                         $t(
                             'windward.core.components.settings.scenario_choice.title'
@@ -16,10 +16,10 @@
                     :disabled="render"
                 ></v-text-field>
                 <v-textarea
+                    id="block-settings-instructions"
                     v-model="block.metadata.config.description"
-                    id="description"
-                    :rules="validation.instructionRule"
-                    :counter="255"
+                    :rules="$Validation.getRule('block.instructions')"
+                    :counter="$Validation.getLimit('block.instructions')"
                     outlined
                     :label="$t('components.content.settings.base.instructions')"
                     :disabled="render"
@@ -77,8 +77,8 @@
                                 v-model="
                                     block.metadata.config.items[index].title
                                 "
-                                :rules="validation.shortInputRules"
-                                :counter="50"
+                                :rules="$Validation.getRule('longInput')"
+                                :counter="$Validation.getLimit('longInput')"
                                 outlined
                                 :id="'item-' + index + '-title'"
                                 :label="
@@ -128,7 +128,11 @@
                 >
                     <v-icon>mdi-plus</v-icon>
                     <span v-if="block.metadata.config.items.length <= 26">
-                        {{ $t('shared.forms.add') }}
+                        {{
+                            $t(
+                                'windward.core.components.settings.scenario_choice.add_choice'
+                            )
+                        }}
                     </span>
                     <span v-else>
                         {{
@@ -249,32 +253,6 @@ export default {
                     value: 'number',
                 },
             ],
-            validation: {
-                shortInputRules: [
-                    (v) => {
-                        if (v && v.length >= 50) {
-                            return this.$t(
-                                'windward.core.shared.settings.errors.input_limitations',
-                                [50]
-                            )
-                        } else {
-                            return true
-                        }
-                    },
-                ],
-                instructionRule: [
-                    (v) => {
-                        if (v && v.length >= 255) {
-                            return this.$t(
-                                'windward.core.shared.settings.errors.input_limitations',
-                                [255]
-                            )
-                        } else {
-                            return true
-                        }
-                    },
-                ],
-            },
         }
     },
     beforeMount() {

package/components/Settings/TabSettings.vue

@@ -2,21 +2,22 @@
     <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.shortInputRules"
-                :counter="50"
+                :rules="$Validation.getRule('block.title')"
+                :counter="$Validation.getLimit('block.title')"
                 outlined
-                id="title"
                 :label="
                     $t('windward.core.components.settings.clickable_icon.title')
                 "
                 :disabled="render"
             ></v-text-field>
             <v-textarea
+                id="block-settings-instructions"
                 v-model="block.metadata.config.instructions"
-                :rules="validation.instructionRule"
-                :counter="255"
+                :rules="$Validation.getRule('block.instructions')"
+                :counter="$Validation.getLimit('block.instructions')"
                 outlined
                 :label="$t('components.content.settings.base.instructions')"
                 :disabled="render"
@@ -43,8 +44,8 @@
                         outlined
                         :autofocus="true"
                         v-model="block.metadata.config.items[index].tabHeader"
-                        :counter="50"
-                        :rules="validation.shortInputRules"
+                        :rules="$Validation.getRule('shortInput')"
+                        :counter="$Validation.getLimit('shortInput')"
                         :label="'item ' + (index + 1)"
                         :disabled="render"
                     ></v-text-field>
@@ -156,32 +157,6 @@ export default {
             textEditorUpdateKey: Crypto.id(),
             valid: true,
             loading: false,
-            validation: {
-                shortInputRules: [
-                    (v) => {
-                        if (v && v.length >= 50) {
-                            return this.$t(
-                                'windward.core.shared.settings.errors.input_limitations',
-                                [50]
-                            )
-                        } else {
-                            return true
-                        }
-                    },
-                ],
-                instructionRule: [
-                    (v) => {
-                        if (v && v.length >= 255) {
-                            return this.$t(
-                                'windward.core.shared.settings.errors.input_limitations',
-                                [255]
-                            )
-                        } else {
-                            return true
-                        }
-                    },
-                ],
-            },
         }
     },
     mounted() {