@windward/core 0.3.0 → 0.4.0

package/components/Settings/ClickableIconsSettings.vue

@@ -60,6 +60,15 @@
                     "
                     :disabled="render"
                 ></v-switch>
+                <v-switch
+                    v-model="block.metadata.config.display.large_icon"
+                    :label="
+                        $t(
+                            'windward.core.components.settings.clickable_icon.display.large_icon'
+                        )
+                    "
+                    :disabled="render"
+                ></v-switch>
                 <v-switch
                     v-model="block.metadata.config.display.autocolor"
                     :label="
@@ -77,12 +86,25 @@
                     @click:close="onRemoveElement"
                 >
                     <template #header="{ item }">
-                        <v-icon v-if="item.icon && isIcon(item.icon)">{{
-                            item.icon
-                        }}</v-icon>
-                        <span v-else-if="item.icon && !isIcon(item.icon)">{{
-                            item.icon
-                        }}</span>
+                        <v-avatar v-if="item.iconImage && item.iconAsset">
+                            <v-img :src="getImagePublicUrl(item.iconAsset)" />
+                        </v-avatar>
+                        <v-icon
+                            v-else-if="
+                                !item.iconImage &&
+                                item.icon &&
+                                isIcon(item.icon)
+                            "
+                            >{{ item.icon }}</v-icon
+                        >
+                        <span
+                            v-else-if="
+                                !item.iconImage &&
+                                item.icon &&
+                                !isIcon(item.icon)
+                            "
+                            >{{ item.icon }}</span
+                        >
                         <span v-else class="font-italic">
                             {{
                                 $t(
@@ -93,7 +115,24 @@
                     </template>
                     <template #body="{ index }">
                         <v-container>
+                            <v-switch
+                                v-model="
+                                    block.metadata.config.items[index].iconImage
+                                "
+                                :label="
+                                    $t(
+                                        'windward.core.components.settings.clickable_icon.icon_image'
+                                    )
+                                "
+                                @click="onClickToggleIconImage(index)"
+                                :disabled="render"
+                            ></v-switch>
+
                             <TextIconPicker
+                                v-if="
+                                    !block.metadata.config.items[index]
+                                        .iconImage
+                                "
                                 v-model="
                                     block.metadata.config.items[index].icon
                                 "
@@ -105,6 +144,20 @@
                                 "
                                 :disabled="render"
                             ></TextIconPicker>
+
+                            <ContentBlockAsset
+                                v-if="
+                                    block.metadata.config.items[index].iconImage
+                                "
+                                v-model="
+                                    block.metadata.config.items[index].iconAsset
+                                "
+                                :assets.sync="block.assets"
+                                class="mb-4"
+                                mimes="image/jpeg,image/png,image/gif"
+                                :disabled="render"
+                                @click:file="onFileSelect($event, index)"
+                            ></ContentBlockAsset>
                             <v-text-field
                                 v-model="
                                     block.metadata.config.items[index].title
@@ -118,7 +171,6 @@
                                 "
                                 :disabled="render"
                             ></v-text-field>
-
                             <ColorPicker
                                 v-if="!block.metadata.config.display.autocolor"
                                 v-model="
@@ -164,6 +216,7 @@ import TextEditor from '~/components/Text/TextEditor'
 import TextIconPicker from '~/components/Core/TextIconPicker.vue'
 import ColorPicker from '~/components/Core/ColorPicker.vue'
 import SortableExpansionPanel from '~/components/Core/SortableExpansionPanel.vue'
+import ContentBlockAsset from '~/components/Content/ContentBlockAsset.vue'
 
 export default {
     name: 'ClickableIconsSettings',
@@ -172,6 +225,7 @@ export default {
         TextEditor,
         TextIconPicker,
         ColorPicker,
+        ContentBlockAsset,
     },
     extends: BaseContentSettings,
 
@@ -202,6 +256,7 @@ export default {
                 show_background: false,
                 round_icon: false,
                 italic_icon: false,
+                large_icon: false,
                 autocolor: true,
             }
         }
@@ -218,6 +273,8 @@ export default {
         onAddElement() {
             const defaultObject = {
                 icon: '',
+                iconAsset: null,
+                iconImage: false,
                 title: '',
                 body: '<p></p>',
                 color: {
@@ -233,6 +290,26 @@ export default {
         isIcon(str) {
             return str && _.isString(str) && str.indexOf('mdi-') === 0
         },
+        getImagePublicUrl(fileAssetId) {
+            const foundAsset = this.resolveAsset(fileAssetId)
+
+            return _.get(foundAsset, 'asset.public_url', null)
+        },
+        onClickToggleIconImage(index) {
+            // We're switching between images / text. Clear the relevant fields
+            this.block.metadata.config.items[index].icon = ''
+            this.block.metadata.config.items[index].iconAsset = null
+        },
+        onFileSelect(file, index) {
+            // file = null when you remove a file
+            if (_.isEmpty(file)) {
+                this.block.metadata.config.items[index].icon = null
+            } else {
+                this.block.assets.push(file)
+                this.block.metadata.config.items[index].icon =
+                    file.file_asset_id
+            }
+        },
     },
 }
 </script>

package/components/Settings/EmailSettings.vue

@@ -210,15 +210,6 @@ export default {
         this.block.metadata.config.selectedPanels = 0
     },
     methods: {
-        onBeforeSave() {
-            this.block.metadata.config.emails.forEach((element) => {
-                if (element.from) {
-                    let matches = element.from.match(/\b(\w)/g)
-                    element.initials = matches.join('')
-                }
-                element.tinymce_expand = false
-            })
-        },
         onUpdatePanel($event) {
             if ($event !== this.block.metadata.config.selectedPanels) {
                 //catch click event to open selected panel to edit

package/components/Settings/ImageSettings.vue

@@ -2,9 +2,10 @@
     <v-container>
         <ContentBlockAsset
             mimes="image/jpeg,image/png,image/gif"
-            @click:file="onFileSelect"
+            v-model="block.metadata.config.asset"
             class="mb-4"
             :disabled="render"
+            @click:file="onFileSelect"
         >
             <template #title>
                 {{ $t('windward.core.components.content.blocks.image.title') }}
@@ -19,7 +20,7 @@
         </ContentBlockAsset>
 
         <v-switch
-            v-model="block.metadata.config.hide_background"
+            v-model="block.metadata.config.hideBackground"
             :label="
                 $t('windward.core.components.settings.image.hide_background')
             "
@@ -31,30 +32,86 @@
             :disabled="render"
         ></v-switch>
         <v-tooltip top color="primary">
-            <template v-slot:activator="{ on, attrs }">
-                <div v-bind="attrs" v-on="on" class="d-flex justify-content">
-                    <v-switch
-                        v-model="block.metadata.config.decorative"
-                        @change="onDecorativeToggled($event)"
-                        :label="
-                            $t(
-                                'windward.core.components.settings.image.decorative'
-                            )
-                        "
-                        :disabled="render"
-                    ></v-switch>
-                    <div class="d-flex align-center pb-4">
-                        <v-icon x-small>mdi-help</v-icon>
-                    </div>
-                </div>
+            <template #activator="{ on, attrs }">
+                <v-switch
+                    v-model="block.metadata.config.decorative"
+                    :disabled="render"
+                    @change="onDecorativeToggled($event)"
+                >
+                    <template #label>
+                        <span v-bind="attrs" v-on="on">
+                            {{
+                                $t(
+                                    'windward.core.components.settings.image.decorative'
+                                )
+                            }}
+                            <v-icon x-small class="help-offset-icon">
+                                mdi-help
+                            </v-icon>
+                        </span>
+                    </template>
+                </v-switch>
             </template>
             <span class="span-description">{{
-                $t('windward.core.components.settings.image.toggle_description')
+                $t(
+                    'windward.core.components.settings.image.decorative_toggle_description'
+                )
             }}</span>
         </v-tooltip>
 
         <v-form v-if="!block.metadata.config.decorative">
+            <v-tooltip top color="primary">
+                <template #activator="{ on, attrs }">
+                    <v-switch
+                        v-model="block.metadata.config.inherit"
+                        :disabled="render"
+                    >
+                        <template #label>
+                            <span v-bind="attrs" v-on="on">
+                                {{
+                                    $t(
+                                        'windward.core.components.settings.image.inherit'
+                                    )
+                                }}
+                                <v-icon x-small class="help-offset-icon">
+                                    mdi-help
+                                </v-icon>
+                            </span>
+                        </template>
+                    </v-switch>
+                </template>
+                <span class="span-description">{{
+                    $t(
+                        'windward.core.components.settings.image.inherit_global_toggle_description'
+                    )
+                }}</span>
+            </v-tooltip>
+
+            <v-alert
+                v-if="block.metadata.config.inherit && !assetAltText"
+                type="warning"
+            >
+                {{
+                    $t('windward.core.components.settings.image.inherit_no_alt')
+                }}
+            </v-alert>
+
+            <v-text-field
+                v-if="block.metadata.config.inherit && assetAltText"
+                :value="assetAltText"
+                :label="
+                    $t('windward.core.components.navigation.image.default_alt')
+                "
+                outlined
+                counter
+                maxlength="125"
+                :rules="validation.textRules"
+                disabled
+            >
+            </v-text-field>
+
             <v-text-field
+                v-if="!block.metadata.config.inherit"
                 v-model="block.metadata.config.alt"
                 outlined
                 counter
@@ -65,9 +122,9 @@
                 :rules="validation.textRules"
                 :disabled="render"
             >
-                <template v-slot:append>
+                <template #append>
                     <v-tooltip top color="primary">
-                        <template v-slot:activator="{ on }">
+                        <template #activator="{ on }">
                             <v-icon v-on="on" small>mdi-help</v-icon>
                         </template>
                         <span class="span-description">{{
@@ -81,8 +138,10 @@
             <h5 class="pb-2">
                 {{ $t('windward.core.components.settings.image.screenreader') }}
                 <v-tooltip top color="primary">
-                    <template v-slot:activator="{ on }">
-                        <v-icon v-on="on" small class="pb-3">mdi-help</v-icon>
+                    <template #activator="{ on }">
+                        <v-icon v-on="on" small class="help-offset-icon">
+                            mdi-help
+                        </v-icon>
                     </template>
                     <span class="span-description">{{
                         $t(
@@ -92,10 +151,26 @@
                 </v-tooltip>
             </h5>
             <TextEditor
-                v-model="block.metadata.config.aria_describedby"
+                v-if="!block.metadata.config.inherit"
+                v-model="block.metadata.config.ariaDescribedBy"
                 menubar="bullist numlist"
                 :disabled="render"
             ></TextEditor>
+
+            <div v-if="block.metadata.config.inherit">
+                <v-card v-if="assetDescribedByText">
+                    <v-card-text>
+                        <TextViewer v-model="assetDescribedByText"></TextViewer>
+                    </v-card-text>
+                </v-card>
+                <v-alert v-if="!assetDescribedByText" type="warning">
+                    {{
+                        $t(
+                            'windward.core.components.settings.image.inherit_no_aria'
+                        )
+                    }}
+                </v-alert>
+            </div>
         </v-form>
     </v-container>
 </template>
@@ -103,17 +178,38 @@
 <script>
 import _ from 'lodash'
 import TextEditor from '~/components/Text/TextEditor'
+import TextViewer from '~/components/Text/TextViewer'
 import BaseContentSettings from '~/components/Content/Settings/BaseContentSettings.js'
 import ContentBlockAsset from '~/components/Content/ContentBlockAsset.vue'
 
 export default {
     name: 'ImageSettings',
     extends: BaseContentSettings,
-    components: { ContentBlockAsset, TextEditor },
+    components: { ContentBlockAsset, TextEditor, TextViewer },
     props: {
         settings: { type: Object, required: false, default: null },
         context: { type: String, required: false, default: 'block' },
     },
+    computed: {
+        assetAltText() {
+            // Get the block aria info and fallback to the asset metadata
+            return _.get(this.fileAsset, 'metadata.props.alt', null)
+        },
+        assetDescribedByText() {
+            // Get the block aria info and fallback to the asset metadata
+            return _.get(
+                this.fileAsset,
+                'metadata.props.aria_describedby',
+                null
+            )
+        },
+        fileAsset() {
+            return _.get(this.block, 'assets[0].asset', null)
+        },
+        fileAssetMap() {
+            return _.get(this.block, 'metadata.config.asset', null)
+        },
+    },
     beforeMount() {
         if (_.isEmpty(this.block)) {
             this.block = {}
@@ -127,11 +223,17 @@ export default {
         if (_.isEmpty(this.block.metadata.config)) {
             this.block.metadata.config = {}
         }
+        if (_.isEmpty(this.block.metadata.config.asset)) {
+            this.block.metadata.config.asset = null
+        }
         if (_.isEmpty(this.block.metadata.config.alt)) {
             this.block.metadata.config.alt = ''
         }
-        if (!_.isBoolean(this.block.metadata.config.hide_background)) {
-            this.block.metadata.config.hide_background = false
+        if (!_.isBoolean(this.block.metadata.config.hideBackground)) {
+            this.block.metadata.config.hideBackground = false
+        }
+        if (!_.isBoolean(this.block.metadata.config.inherit)) {
+            this.block.metadata.config.inherit = true
         }
         if (!_.isBoolean(this.block.metadata.config.modal)) {
             this.block.metadata.config.modal = false
@@ -139,18 +241,12 @@ export default {
         if (!_.isBoolean(this.block.metadata.config.decorative)) {
             this.block.metadata.config.decorative = false
         }
-        if (_.isEmpty(this.block.metadata.config.aria_describedby)) {
-            this.block.metadata.config.aria_describedby = ''
+        if (_.isEmpty(this.block.metadata.config.ariaDescribedBy)) {
+            this.block.metadata.config.ariaDescribedBy = ''
         }
     },
     data() {
         return {
-            imageSettings: {
-                // Default values
-                alt_text: '',
-                aria_described: '',
-                release_results: 'submitted',
-            },
             validation: {
                 textRules: [
                     (v) => !!v || this.$t('shared.forms.errors.required'),
@@ -163,16 +259,19 @@ export default {
     methods: {
         onDecorativeToggled(evt) {
             if (evt) {
-                this.block.metadata.config.aria_describedby = ''
+                this.block.metadata.config.ariaDescribedBy = ''
                 this.block.metadata.config.alt = ''
             }
         },
         onFileSelect(file) {
+            // Clear out the body since we're defining a proper file link now
+            this.block.body = ''
+
             // file = null when you remove a file
             if (_.isEmpty(file)) {
-                this.block.body = ''
+                this.block.assets = []
             } else {
-                this.block.body = file.asset.public_url
+                this.block.assets = [file]
 
                 //Assign height and width for skeleton loader
                 if (!_.isEmpty(file.asset.metadata.props)) {
@@ -188,7 +287,7 @@ export default {
                     ''
                 )
 
-                this.block.metadata.config.aria_describedby = _.get(
+                this.block.metadata.config.ariaDescribedBy = _.get(
                     file,
                     'asset.metadata.props.aria_describedby',
                     ''
@@ -204,4 +303,8 @@ export default {
     justify-content: center;
     width: 200px;
 }
+.help-offset-icon {
+    position: relative;
+    top: -8px;
+}
 </style>

package/components/Settings/OpenResponseSettings.vue

@@ -45,12 +45,11 @@
 import _ from 'lodash'
 import TextEditor from '~/components/Text/TextEditor'
 import BaseContentSettings from '~/components/Content/Settings/BaseContentSettings.js'
-import ContentBlockAsset from '~/components/Content/ContentBlockAsset.vue'
 
 export default {
     name: 'ImageSettings',
     extends: BaseContentSettings,
-    components: { ContentBlockAsset, TextEditor },
+    components: { TextEditor },
     props: {
         settings: { type: Object, required: false, default: null },
         context: { type: String, required: false, default: 'block' },