@windward/core 0.6.0 → 0.7.0

package/components/Settings/ClickableIconsSettings.vue

@@ -142,6 +142,7 @@
                                         [index + 1]
                                     )
                                 "
+                                :rules="validation.iconRules"
                                 :disabled="render"
                             ></TextIconPicker>
 
@@ -238,20 +239,55 @@ export default {
         return {
             validation: {
                 shortInputRules: [
-                    (v) =>
-                        v.length <= 50 ||
-                        this.$t(
-                            'windward.core.shared.settings.errors.input_limitations',
-                            [50]
-                        ),
+                    (v) => {
+                        if (v) {
+                            if (v.length <= 50) {
+                                return true
+                            } else {
+                                return this.$t(
+                                    'windward.core.shared.settings.errors.input_limitations',
+                                    [50]
+                                )
+                            }
+                        } else {
+                            return true
+                        }
+                    },
                 ],
                 instructionRule: [
-                    (v) =>
-                        v.length <= 255 ||
-                        this.$t(
-                            'windward.core.shared.settings.errors.input_limitations',
-                            [255]
-                        ),
+                    (v) => {
+                        if (v) {
+                            if (v.length <= 255) {
+                                return true
+                            } else {
+                                return this.$t(
+                                    'windward.core.shared.settings.errors.input_limitations',
+                                    [255]
+                                )
+                            }
+                        } else {
+                            return true
+                        }
+                    },
+                ],
+                iconRules: [
+                    (v) => {
+                        if (v) {
+                            const isMDI = v.startsWith('mdi')
+                            if (isMDI) {
+                                return true
+                            } else if (v.length >= 5) {
+                                return this.$t(
+                                    'shared.forms.errors.number_lt',
+                                    [4]
+                                )
+                            } else {
+                                return true
+                            }
+                        } else {
+                            return true
+                        }
+                    },
                 ],
             },
         }

package/components/Settings/EmailSettings.vue

@@ -215,20 +215,28 @@ export default {
             editingPanel: 0,
             validation: {
                 shortInputRules: [
-                    (v) =>
-                        v.length <= 50 ||
-                        this.$t(
-                            'windward.core.shared.settings.errors.input_limitations',
-                            [50]
-                        ),
+                    (v) => {
+                        if (v && v.length >= 50) {
+                            return this.$t(
+                                'windward.core.shared.settings.errors.input_limitations',
+                                [50]
+                            )
+                        } else {
+                            return true
+                        }
+                    },
                 ],
                 instructionRule: [
-                    (v) =>
-                        v.length <= 255 ||
-                        this.$t(
-                            'windward.core.shared.settings.errors.input_limitations',
-                            [255]
-                        ),
+                    (v) => {
+                        if (v && v.length >= 255) {
+                            return this.$t(
+                                'windward.core.shared.settings.errors.input_limitations',
+                                [255]
+                            )
+                        } else {
+                            return true
+                        }
+                    },
                 ],
             },
         }

package/components/Settings/FileDownloadSettings.vue

@@ -6,7 +6,7 @@
             :counter="50"
             :rules="validation.shortInputRules"
             :autofocus="true"
-            :label="$t('components.content.settings.base.title_optional')"
+            :label="$t('components.content.settings.base.title')"
             :disabled="render"
         ></v-text-field>
         <v-textarea
@@ -15,9 +15,7 @@
             :counter="255"
             :rules="validation.instructionRule"
             :disabled="render"
-            :label="
-                $t('components.content.settings.base.instructions_optional')
-            "
+            :label="$t('components.content.settings.base.instructions')"
         ></v-textarea>
         <v-switch
             v-model="block.metadata.config.display_detailed"
@@ -103,20 +101,28 @@ export default {
         return {
             validation: {
                 shortInputRules: [
-                    (v) =>
-                        v.length <= 50 ||
-                        this.$t(
-                            'windward.core.shared.settings.errors.input_limitations',
-                            [50]
-                        ),
+                    (v) => {
+                        if (v && v.length >= 50) {
+                            return this.$t(
+                                'windward.core.shared.settings.errors.input_limitations',
+                                [50]
+                            )
+                        } else {
+                            return true
+                        }
+                    },
                 ],
                 instructionRule: [
-                    (v) =>
-                        v.length <= 255 ||
-                        this.$t(
-                            'windward.core.shared.settings.errors.input_limitations',
-                            [255]
-                        ),
+                    (v) => {
+                        if (v && v.length >= 255) {
+                            return this.$t(
+                                'windward.core.shared.settings.errors.input_limitations',
+                                [255]
+                            )
+                        } else {
+                            return true
+                        }
+                    },
                 ],
             },
         }

package/components/Settings/HorizontalRuleSettings.vue

@@ -28,9 +28,6 @@ export default {
         if (_.isEmpty(this.block.metadata.config)) {
             this.block.metadata.config = {}
         }
-        if (_.isEmpty(this.block.metadata.config)) {
-            this.block.metadata.config = {}
-        }
         if (!_.isBoolean(this.block.metadata.config.dashed)) {
             this.block.metadata.config.dashed = false
         }

package/components/Settings/ScenarioChoiceSettings.vue

@@ -205,6 +205,7 @@ import BaseContentSettings from '~/components/Content/Settings/BaseContentSettin
 import TextEditor from '~/components/Text/TextEditor'
 import SortableExpansionPanel from '~/components/Core/SortableExpansionPanel.vue'
 import DialogBox from '~/components/Core/DialogBox.vue'
+import Uuid from '~/helpers/Uuid'
 
 export default {
     name: 'ScenarioChoiceSettings',
@@ -250,20 +251,28 @@ export default {
             ],
             validation: {
                 shortInputRules: [
-                    (v) =>
-                        v.length <= 50 ||
-                        this.$t(
-                            'windward.core.shared.settings.errors.input_limitations',
-                            [50]
-                        ),
+                    (v) => {
+                        if (v && v.length >= 50) {
+                            return this.$t(
+                                'windward.core.shared.settings.errors.input_limitations',
+                                [50]
+                            )
+                        } else {
+                            return true
+                        }
+                    },
                 ],
                 instructionRule: [
-                    (v) =>
-                        v.length <= 255 ||
-                        this.$t(
-                            'windward.core.shared.settings.errors.input_limitations',
-                            [255]
-                        ),
+                    (v) => {
+                        if (v && v.length >= 255) {
+                            return this.$t(
+                                'windward.core.shared.settings.errors.input_limitations',
+                                [255]
+                            )
+                        } else {
+                            return true
+                        }
+                    },
                 ],
             },
         }
@@ -286,8 +295,14 @@ export default {
         if (_.isEmpty(this.block.metadata.config.title)) {
             this.block.metadata.config.title = ''
         }
-        if (_.isEmpty(this.block.metadata.config.description)) {
-            this.block.metadata.config.description = ''
+        if (
+            _.isEmpty(this.block.metadata.config.description) &&
+            this.block.id &&
+            !Uuid.test(this.block.id)
+        ) {
+            this.block.metadata.config.description = this.$t(
+                'windward.core.components.content.blocks.scenario_choice.information'
+            )
         }
         if (_.isEmpty(this.block.metadata.config.display_style)) {
             this.block.metadata.config.display_style = 'letter'

package/components/Settings/TabSettings.vue

@@ -1,78 +1,92 @@
 <template>
     <div>
-            <v-divider class="my-4 primary"></v-divider>
-            <p>{{ $t('windward.core.components.settings.tab.tabs') }}</p>
-            <SortableExpansionPanel
-                v-model="block.metadata.config.items"
-                v-bind:currentPanel.sync="block.metadata.config.currentTab"
+        <v-row class="pl-3 pr-3">
+            <v-text-field
+                v-model="block.metadata.config.title"
+                :autofocus="true"
+                :rules="validation.shortInputRules"
+                :counter="50"
+                outlined
+                id="title"
+                :label="
+                    $t('windward.core.components.settings.clickable_icon.title')
+                "
                 :disabled="render"
-                @change="onDragged"
-                @click:close="onRemoveElement($event)"
-            >
-                <template #header="{ item }">
-                    {{ item.tabHeader !== '' ? item.tabHeader : 'No Header' }}
-                </template>
-                <template #body="{ item, index }">
-                    <v-container :key="expansionPanelKey">
-                        <p class="p-label">
-                            {{
-                                $t(
-                                    'windward.core.components.settings.tab.header'
-                                )
-                            }}
-                        </p>
-                        <v-text-field
-                            outlined
-                            :autofocus="true"
-                            v-model="
-                                block.metadata.config.items[index].tabHeader
-                            "
-                            :counter="50"
-                            :rules="validation.headerRule"
-                            :label="'item ' + (index + 1)"
-                            :disabled="render"
-                        ></v-text-field>
-                        <v-btn
-                            @click="onToggleExpand(index)"
-                            text
-                            elevation="0"
-                            class="mb-3"
-                            :disabled="render"
+            ></v-text-field>
+            <v-textarea
+                v-model="block.metadata.config.instructions"
+                :rules="validation.instructionRule"
+                :counter="255"
+                outlined
+                :label="$t('components.content.settings.base.instructions')"
+                :disabled="render"
+            ></v-textarea>
+        </v-row>
+        <v-divider class="my-4 primary"></v-divider>
+        <p>{{ $t('windward.core.components.settings.tab.tabs') }}</p>
+        <SortableExpansionPanel
+            v-model="block.metadata.config.items"
+            v-bind:currentPanel.sync="block.metadata.config.currentTab"
+            :disabled="render"
+            @change="onDragged"
+            @click:close="onRemoveElement($event)"
+        >
+            <template #header="{ item }">
+                {{ item.tabHeader !== '' ? item.tabHeader : 'No Header' }}
+            </template>
+            <template #body="{ item, index }">
+                <v-container :key="expansionPanelKey">
+                    <p class="p-label">
+                        {{ $t('windward.core.components.settings.tab.header') }}
+                    </p>
+                    <v-text-field
+                        outlined
+                        :autofocus="true"
+                        v-model="block.metadata.config.items[index].tabHeader"
+                        :counter="50"
+                        :rules="validation.shortInputRules"
+                        :label="'item ' + (index + 1)"
+                        :disabled="render"
+                    ></v-text-field>
+                    <v-btn
+                        @click="onToggleExpand(index)"
+                        text
+                        elevation="0"
+                        class="mb-3"
+                        :disabled="render"
+                    >
+                        <v-icon
+                            v-if="!block.metadata.config.items[index].expand"
+                            color="primary"
+                            >mdi-arrow-expand-all</v-icon
+                        >
+                        <v-icon
+                            v-if="block.metadata.config.items[index].expand"
+                            color="primary"
                         >
-                            <v-icon
-                                v-if="
-                                    !block.metadata.config.items[index].expand
-                                "
-                                color="primary"
-                                >mdi-arrow-expand-all</v-icon
-                            >
-                            <v-icon
-                                v-if="block.metadata.config.items[index].expand"
-                                color="primary"
-                            >
-                                mdi-arrow-collapse-all
-                            </v-icon>
-                        </v-btn>
-                        <TextEditor
-                            v-model="block.metadata.config.items[index].content"
-                            v-if="!item.expand"
-                            :key="textEditorUpdateKey"
-                            :disabled="render"
-                        ></TextEditor>
-                    </v-container>
-                </template>
-            </SortableExpansionPanel>
-            <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.tab.add_tab') }}
-                </v-btn>
-            </v-row>
+                            mdi-arrow-collapse-all
+                        </v-icon>
+                    </v-btn>
+                    <TextEditor
+                        v-model="block.metadata.config.items[index].content"
+                        v-if="!item.expand"
+                        :key="textEditorUpdateKey"
+                        :disabled="render"
+                    ></TextEditor>
+                </v-container>
+            </template>
+        </SortableExpansionPanel>
+        <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.tab.add_tab') }}
+            </v-btn>
+        </v-row>
         <div v-if="loading" class="text-center">
             <v-progress-circular
                 :size="70"
@@ -90,6 +104,7 @@ import Crypto from '~/helpers/Crypto'
 import TextEditor from '~/components/Text/TextEditor'
 import BaseContentSettings from '~/components/Content/Settings/BaseContentSettings.js'
 import SortableExpansionPanel from '~/components/Core/SortableExpansionPanel.vue'
+import Uuid from '~/helpers/Uuid'
 
 export default {
     name: 'TabSettings',
@@ -110,6 +125,18 @@ 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.id &&
+            !Uuid.test(this.block.id)
+        ) {
+            this.block.metadata.config.instructions = this.$t(
+                'windward.core.components.settings.tab.instructions'
+            )
+        }
         if (_.isEmpty(this.block.metadata.config.currentTab)) {
             this.block.metadata.config.currentTab = 0
         }
@@ -130,13 +157,29 @@ export default {
             valid: true,
             loading: false,
             validation: {
-                headerRule: [
-                    (v) =>
-                        v.length <= 50 ||
-                        this.$t(
-                            'windward.core.shared.settings.errors.input_limitations',
-                            [50]
-                        ),
+                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
+                        }
+                    },
                 ],
             },
         }

package/components/Settings/UserUploadSettings.vue

@@ -6,23 +6,9 @@
             :rules="validation.titleRules"
             :counter="50"
             :autofocus="true"
-            :label="$t('components.content.settings.base.title_optional')"
+            :label="$t('components.content.settings.base.title')"
             :disabled="render"
         ></v-text-field>
-        <v-btn
-            elevation="0"
-            text
-            class="mb-4"
-            :disabled="render"
-            @click="block.__expandInstructions = !block.__expandInstructions"
-        >
-            <v-icon v-if="!block.__expandInstructions" color="primary"
-                >mdi-arrow-expand-all</v-icon
-            >
-            <v-icon v-if="block.__expandInstructions" color="primary">
-                mdi-arrow-collapse-all
-            </v-icon>
-        </v-btn>
         <v-textarea
             v-model="block.metadata.config.instructions"
             :rules="validation.instructionRule"
@@ -60,6 +46,7 @@ import BaseContentSettings from '~/components/Content/Settings/BaseContentSettin
 import Crypto from '~/helpers/Crypto'
 import TextEditor from '~/components/Text/TextEditor'
 import _ from 'lodash'
+import Uuid from '~/helpers/Uuid'
 
 export default {
     name: 'UserUploadSettings',
@@ -70,9 +57,6 @@ export default {
             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'
@@ -87,8 +71,14 @@ export default {
         if (_.isEmpty(this.block.metadata.config.title)) {
             this.block.metadata.config.title = ''
         }
-        if (_.isEmpty(this.block.metadata.config.title)) {
-            this.block.metadata.config.instructions = ''
+        if (
+            _.isEmpty(this.block.metadata.config.instructions) &&
+            this.block.id &&
+            !Uuid.test(this.block.id)
+        ) {
+            this.block.metadata.config.instructions = this.$t(
+                'windward.core.components.settings.user_upload.instructions'
+            )
         }
         if (_.isEmpty(this.block.metadata.config.uploadSettings)) {
             this.block.metadata.config.uploadSettings = {
@@ -141,20 +131,28 @@ export default {
             },
             validation: {
                 titleRules: [
-                    (v) =>
-                        v.length <= 50 ||
-                        this.$t(
-                            'windward.core.shared.settings.errors.input_limitations',
-                            [50]
-                        ),
+                    (v) => {
+                        if (v && v.length >= 50) {
+                            return this.$t(
+                                'windward.core.shared.settings.errors.input_limitations',
+                                [50]
+                            )
+                        } else {
+                            return true
+                        }
+                    },
                 ],
                 instructionRule: [
-                    (v) =>
-                        v.length <= 255 ||
-                        this.$t(
-                            'windward.core.shared.settings.errors.input_limitations',
-                            [255]
-                        ),
+                    (v) => {
+                        if (v && v.length >= 255) {
+                            return this.$t(
+                                'windward.core.shared.settings.errors.input_limitations',
+                                [255]
+                            )
+                        } else {
+                            return true
+                        }
+                    },
                 ],
             },
         }