@windward/core 0.19.0 → 0.21.0

package/CHANGELOG.md

@@ -1,5 +1,42 @@
 # Changelog
 
+## Release [0.21.0] - 2025-08-01
+
+* Merged in feature/LE-2045/lableing-fixes (pull request #414)
+* Merged in feature/LE-2009-organizations-custom-color-palle (pull request #410)
+* Merged in feature/LE-2011-open-response-download-field-to- (pull request #411)
+* Merged in feature/LE-1912/sorting-game-gen-2 (pull request #413)
+* Merged in feature/LE-2029-open-response-block-design (pull request #412)
+* Merged in feature/LE-1912/sorting-game-gen (pull request #409)
+* Merged in feature/LE-2011-open-response-download-field-to- (pull request #408)
+* Merged in feature/LE-1924-clickable-icons-ux (pull request #407)
+* Merged in feature/LE-1913/matching-block (pull request #405)
+* Merged in feature/LE-1924-clickable-icons-ux (pull request #404)
+* Merged in feature/LE-2011-open-response-download-field-to- (pull request #406)
+* Merged in bugfix/LE-1928-user-upload-allowed-file-types (pull request #398)
+* Merged release/0.21.0 into feature/LE-2011-open-response-download-field-to-
+* Merge branch 'release/0.21.0' into feature/LE-1913/matching-block
+* Merged in bugfix/LE-1990-video-black-line-on-left-and-rig (pull request #403)
+* Merged in feature/LE-1900-fill-in-the-blank-formatting-sho (pull request #402)
+* Merged release/0.21.0 into feature/LE-1924-clickable-icons-ux
+* Merge branch 'release/0.20.0' into feature/LE-1913/matching-block
+
+
+## Release [0.20.0] - 2025-07-01
+
+* Merge remote-tracking branch 'origin/release/0.20.0' into release/0.20.0
+* Merge remote-tracking branch 'origin/release/0.20.0' into release/0.20.0
+* Merged in feature/LE-1948/empty-bucket-localization-fix (pull request #397)
+* Merged in LE-1911-email-block-to-cc-and-subject-te (pull request #395)
+* Merged in bugfix/LE-1928-user-upload-allowed-file-types (pull request #391)
+* Merged in bugfix/LE-1941-divider-dashed-line-renders-soli (pull request #396)
+* Merged in feature/LE-1948/empty-bucket (pull request #393)
+* Merged in feature/LE-1906-ai-assistant-button-text (pull request #394)
+* Merged in bugfix/LE-1739-email-block-to-cc-and-subject-te (pull request #392)
+* Merged in bugfix/LE-1917-student-experience-cleanup (pull request #386)
+* Merged release/0.19.0 into bugfix/LE-1917-student-experience-cleanup
+
+
 ### Release [0.19.0] created - 2025-05-30
 
 ### Release [0.18.0] created - 2025-05-21

package/bitbucket/releases/delete-rc-tags.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# Checkout the release branch
+git checkout master || exit 1
+git pull origin master || exit 1
+
+# Configure Git user for the current repository
+git config user.email "commits-noreply@bitbucket.org"
+git config user.name "bitbucket-pipelines"
+
+# Extract version from the last merge commit message. Expecting `Merged in xx.xx.xx`
+VERSION=$(basename "$(git log -1 --pretty=%B | grep -o -E "Merged in (release|hotfix)\/([0-9]+\.[0-9]+\.[0-9]+)")")
+
+if [ -z "$VERSION" ]; then
+  echo "Error: Could not extract version from release branch name."
+  exit 1
+fi
+
+echo "Running auto-rc-tag delete for version $VERSION"
+
+# Delete all rc tags for the version
+rc_tags=$(git tag --list "$VERSION-rc*")
+
+if [ -n "$rc_tags" ]; then
+  echo "Deleting rc tags for version $VERSION..."
+  for tag in $rc_tags; do
+    git tag -d "$tag"
+    git push origin ":refs/tags/$tag"
+  done
+  echo "All rc tags for version $VERSION have been deleted."
+else
+  echo "No rc tags found for version $VERSION."
+fi
+
+exit 0

package/bitbucket/releases/tag-master-release.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+
+# Checkout the release branch
+git checkout master || exit 1
+git pull origin master || exit 1
+
+# Configure Git user for the current repository
+git config user.email "commits-noreply@bitbucket.org"
+git config user.name "bitbucket-pipelines"
+
+# Extract version from the last merge commit message. Expecting `Merged in xx.xx.xx`
+VERSION=$(basename "$(git log -1 --pretty=%B | grep -o -E "Merged in (release|hotfix)\/([0-9]+\.[0-9]+\.[0-9]+)")")
+
+if [ -z "$VERSION" ]; then
+  echo "Error: Could not extract version from release branch name."
+  exit 1
+fi
+
+echo "Running auto-tag for version $VERSION"
+
+
+# Fetch the latest state of the repository
+git fetch origin
+
+# Get the latest commit on master branch
+LATEST_MASTER_COMMIT=$(git rev-parse origin/master)
+if [ $? -ne 0 ]; then
+  echo "Error: Failed to get the latest commit on master"
+  exit 1
+fi
+
+# Apply the tag to the latest master commit
+git tag -a "$VERSION" -m "Tagging $VERSION" "$LATEST_MASTER_COMMIT"
+if [ $? -ne 0 ]; then
+  echo "Error: Failed to tag the commit $LATEST_MASTER_COMMIT with tag $VERSION"
+  exit 1
+fi
+
+# Push the tag to the repository
+git push origin "$VERSION"
+if [ $? -ne 0 ]; then
+  echo "Error: Failed to push the tag $VERSION"
+  exit 1
+fi
+
+echo "Tag $VERSION successfully applied to commit $LATEST_MASTER_COMMIT and pushed to repository."
+
+exit 0

package/bitbucket-pipelines.yml

@@ -19,4 +19,6 @@ pipelines:
     "release/*":
       import: infrastructure-automation:master:auto-update
     "hotfix/*":
-      import: infrastructure-automation:master:auto-update
+      import: infrastructure-automation:master:auto-update
+    master:
+      import: infrastructure-automation:master:auto-publish-release

package/components/Content/Blocks/ClickableIcons.vue

@@ -19,71 +19,87 @@
             </p>
         </v-container>
         <v-container class="pa-0">
-            <v-row
+            <v-container
                 v-for="(item, itemIndex) in block.metadata.config.items"
                 :key="itemIndex"
                 no-gutters
+                role="button"
+                class="flex-nowrap mb-3"
                 :class="rowClass(itemIndex)"
-                class="pa-0"
+                @click="item.active = !item.active"
             >
-                <v-col cols="8" v-bind="iconColumnAttrs">
-                    <button
-                        class="mr-1"
-                        :class="activatorButtonClass(itemIndex)"
-                        @click="item.active = !item.active"
-                    >
-                        <v-avatar
-                            v-if="item.iconImage && item.fileConfig"
-                            class="clickable--image"
-                            :rounded="
-                                block.metadata.config.display.round_icon
-                                    ? '100%'
-                                    : '0'
-                            "
-                            size="100%"
-                        >
-                            <ImageAssetViewer
-                                v-if="
-                                    item.fileConfig.asset &&
-                                    item.fileConfig.asset.file_asset_id
+                <v-row class="mb-0 pb-0" no-gutters>
+                    <v-col cols="auto" class="flex-shrink-0 ma-2 mr-0">
+                        <button :class="activatorButtonClass(itemIndex)">
+                            <v-avatar
+                                v-if="item.iconImage && item.fileConfig"
+                                class="clickable--image"
+                                :rounded="
+                                    block.metadata.config.display.round_icon
+                                        ? '100%'
+                                        : '0'
                                 "
-                                v-model="item.fileConfig"
-                                :assets="block.assets"
-                                class="image-asset-viewer"
-                                :inherit-sizing="true"
-                            ></ImageAssetViewer>
-                        </v-avatar>
-                        <v-icon
-                            v-else-if="isIcon(item.icon)"
-                            class="clickable--icon black--text"
-                            >{{ item.icon }}</v-icon
-                        >
-                        <span v-else :class="iconClass + ' black--text'">{{
-                            decode(item.icon)
-                        }}</span>
-                    </button>
-                </v-col>
-                <v-col cols="12" v-bind="bodyColumnAttrs">
-                    <v-container :class="bodyClass">
-                        <h4
-                            v-if="
-                                block.metadata.config.display.show_title ||
-                                item.active
-                            "
-                            role="button"
-                            @click="item.active = !item.active"
-                        >
-                            {{ item.title }}
-                        </h4>
-                        <v-expand-transition>
-                            <div v-if="item.active">
-                                <v-divider light class="my-4" />
-                                <TextViewer v-model="item.body"></TextViewer>
-                            </div>
-                        </v-expand-transition>
-                    </v-container>
-                </v-col>
-            </v-row>
+                                size="100%"
+                            >
+                                <ImageAssetViewer
+                                    v-if="
+                                        item.fileConfig.asset &&
+                                        item.fileConfig.asset.file_asset_id
+                                    "
+                                    v-model="item.fileConfig"
+                                    :assets="block.assets"
+                                    class="image-asset-viewer"
+                                    :inherit-sizing="true"
+                                ></ImageAssetViewer>
+                            </v-avatar>
+                            <v-icon
+                                v-else-if="isIcon(item.icon)"
+                                class="clickable--icon black--text"
+                                >{{ item.icon }}</v-icon
+                            >
+                            <span v-else :class="iconClass + ' black--text'">{{
+                                decode(item.icon)
+                            }}</span>
+                        </button>
+                    </v-col>
+                    <v-col style="min-width: 0" class="ma-3 mt-5">
+                        <v-row :class="clickableContainerClass">
+                            <v-col style="min-width: 0">
+                                <h3
+                                    v-if="
+                                        block.metadata.config.display
+                                            .show_title || item.active
+                                    "
+                                    class="wrap-text"
+                                >
+                                    {{ item.title }}
+                                </h3>
+                            </v-col>
+                            <v-col cols="auto" class="d-flex justify-end">
+                                <v-icon v-if="!item.active" class="icon-chevron"
+                                    >mdi-chevron-down</v-icon
+                                >
+                                <v-icon v-else class="icon-chevron"
+                                    >mdi-chevron-up</v-icon
+                                >
+                            </v-col>
+                        </v-row>
+                        <div v-if="item.active && !isMobile" class="pr-8">
+                            <TextViewer
+                                v-model="item.body"
+                                class="content-body"
+                            />
+                        </div>
+                    </v-col>
+                </v-row>
+                <v-row
+                    v-if="isMobile && item.active"
+                    cols="12"
+                    class="px-6 pb-4"
+                >
+                    <TextViewer v-model="item.body" class="content-body" />
+                </v-row>
+            </v-container>
         </v-container>
     </div>
 </template>
@@ -128,46 +144,9 @@ export default {
                 ) {
                     classes += ' ' + this.itemColor(itemIndex) + ' black--text'
                 }
-                if (window.innerWidth <= 600) {
-                    classes += 'd-flex justify-center '
-                }
                 return classes
             }
         },
-        iconColumnAttrs() {
-            if (this.block.metadata.config.display.large_icon) {
-                return {
-                    xl: '3',
-                    lg: '3',
-                    md: '4',
-                    sm: '4',
-                }
-            } else {
-                return {
-                    xl: '2',
-                    lg: '3',
-                    md: '3',
-                    sm: '3',
-                }
-            }
-        },
-        bodyColumnAttrs() {
-            if (this.block.metadata.config.display.large_icon) {
-                return {
-                    xl: '9',
-                    lg: '8',
-                    md: '8',
-                    sm: '8',
-                }
-            } else {
-                return {
-                    xl: '10',
-                    lg: '9',
-                    md: '9',
-                    sm: '9',
-                }
-            }
-        },
         iconClass() {
             let classes = 'clickable--text'
             if (
@@ -198,12 +177,12 @@ export default {
                 // If autocolor is enabled then calculate the color on the index
                 if (this.block.metadata.config.display.autocolor) {
                     const colors = [
-                        'light-blue lighten-4',
-                        'light-green lighten-4',
-                        'yellow lighten-4',
-                        'orange lighten-3',
-                        'red lighten-3',
-                        'deep-purple lighten-3',
+                        'extended-system-9',
+                        'extended-system-7',
+                        'extended-system-6',
+                        'extended-system-5',
+                        'extended-system-4',
+                        'extended-system-10',
                     ]
                     let colorIndex = itemIndex
                     // If we exceed the above list of colors loop back around to the beginning
@@ -230,12 +209,15 @@ export default {
                 }
             }
         },
-        bodyClass() {
-            if (window.innerWidth <= 665) {
-                return ''
-            } else {
-                return 'ml-4'
+        isMobile() {
+            return window.innerWidth <= 400
+        },
+        clickableContainerClass() {
+            let classList = 'align-start'
+            if (window.innerWidth > 400) {
+                classList += ' mb-3'
             }
+            return classList
         },
     },
     beforeMount() {
@@ -277,11 +259,6 @@ export default {
         isIcon(str) {
             return str && _.isString(str) && str.indexOf('mdi-') === 0
         },
-        getImagePublicUrl(asset) {
-            const foundAsset = this.resolveAsset(asset)
-
-            return _.get(foundAsset, 'asset.public_url', null)
-        },
     },
 }
 </script>
@@ -291,9 +268,8 @@ export default {
 }
 button.button-icon {
     border-width: 4px;
-    width: 100% !important;
-    height: auto !important;
     aspect-ratio: 1 / 1;
+    border-radius: 16px;
 }
 
 button.button-icon.button-icon--outline {
@@ -307,16 +283,20 @@ button.button-icon.button-icon--rounded {
 }
 
 .button-icon--normal {
+    width: 5rem;
+    height: 5rem;
     .clickable--icon {
-        font-size: 5rem;
+        font-size: 3rem;
     }
     .clickable--text {
         font-size: 1.5rem;
     }
 }
 .button-icon--large {
+    width: 7rem;
+    height: 7rem;
     .clickable--icon {
-        font-size: 9rem;
+        font-size: 5rem;
     }
     .clickable--text {
         font-size: 2.5rem;
@@ -326,4 +306,21 @@ button.button-icon.button-icon--rounded {
     height: inherit;
     width: inherit;
 }
+
+.content-body {
+    overflow-wrap: break-word;
+    word-break: break-word;
+}
+.icon-chevron {
+    color: inherit;
+}
+h3 {
+    font-size: 1.2rem;
+    font-weight: 500;
+}
+.wrap-text {
+    word-wrap: break-word;
+    overflow-wrap: break-word;
+    white-space: normal;
+}
 </style>

package/components/Content/Blocks/Email.vue

@@ -7,13 +7,7 @@
             "
         >
             <v-col cols="12" class="pa-0">
-                <h2
-                    v-if="
-                        block.metadata.config.title &&
-                        block.metadata.config.display_title
-                    "
-                    tabindex="0"
-                >
+                <h2 v-if="block.metadata.config.title" tabindex="0">
                     {{ block.metadata.config.title }}
                 </h2>
                 <p
@@ -27,8 +21,8 @@
         </v-row>
         <v-row>
             <v-expansion-panels
-                :key="expansionPanelKey"
                 v-model="selectedPanels"
+                :key="expansionPanelKey"
                 accordion
             >
                 <v-container
@@ -130,23 +124,24 @@
                                 ></v-col>
                                 <v-col
                                     class="div-details"
-                                    v-if="item.to || item.cc"
+                                    :style="{ color: detailsTextColor }"
+                                    v-if="item.to || item.cc || item.subject"
                                 >
-                                    <div class="div-details-to">
+                                    <div v-if="item.to" class="div-details-to">
                                         {{
                                             $t(
                                                 'windward.core.components.content.blocks.email.to'
                                             )
                                         }}: {{ item.to }}
                                     </div>
-                                    <div class="div-details-cc">
+                                    <div v-if="item.cc" class="div-details-cc">
                                         {{
                                             $t(
                                                 'windward.core.components.content.blocks.email.cc'
                                             )
                                         }}: {{ item.cc }}
                                     </div>
-                                    <div class="div-details-cc">
+                                    <div v-if="item.subject" class="div-details-subject">
                                         {{
                                             $t(
                                                 'windward.core.components.content.blocks.email.subject'
@@ -279,6 +274,16 @@ export default {
             selectedPanels: 0,
         }
     },
+    computed: {
+        detailsTextColor() {
+            // Use a different AAA compliant color based on the theme
+            if (this.$vuetify.theme.dark) {
+                return '#A8A8A8'
+            } else {
+                return '#595959'
+            }
+        },
+    },
     watch: {
         render(newValue) {
             if (newValue) {
@@ -338,12 +343,12 @@ export default {
     font-size: 12px;
 }
 .div-details {
-    color: grey;
-    font-size: 10px;
+    font-size: 14px;
     margin-top: -25px;
 }
-.div-details-cc {
-    margin-top: -9px;
+.div-details-cc,
+.div-details-subject {
+    margin-top: -5px;
 }
 .span-details {
     font-weight: bold;

package/components/Content/Blocks/HorizontalRule.vue

@@ -43,9 +43,11 @@ export default {
 </script>
 <style>
 .solid {
+    border: none;
     border-bottom: solid 1px var(--v-primary-base);
 }
 .dashed {
+    border: none;
     border-bottom: dashed 1px var(--v-primary-base);
 }
 </style>

package/components/Content/Blocks/OpenResponseCollate.vue

@@ -34,13 +34,21 @@ import UserContentBlockState from '~/models/UserContentBlockState'
 
 export default {
     name: 'ContentBlockOpenResponseCollate',
-    extends: BaseContentBlock,
     components: {},
+    extends: BaseContentBlock,
     data() {
         return {
             saveState: false, // Override the base block to disable state saving
         }
     },
+    computed: {
+        ...mapGetters({
+            organization: 'organization/get',
+            course: 'course/get',
+            enrollment: 'enrollment/get',
+            content: 'content/get',
+        }),
+    },
     beforeMount() {
         if (_.isEmpty(this.block.body)) {
             this.block.body = ''
@@ -59,20 +67,10 @@ export default {
             this.block.metadata.config.include_prompts = false
         }
     },
-    computed: {
-        ...mapGetters({
-            organization: 'organization/get',
-            course: 'course/get',
-            enrollment: 'enrollment/get',
-            content: 'content/get',
-        }),
-    },
-    watch: {},
-    mounted() {},
     methods: {
         async onCollate() {
             try {
-                let userState = await UserContentBlockState.where({
+                const userState = await UserContentBlockState.where({
                     'metadata->block->tag': 'plugin-core-open-response',
                     course_user_id: this.enrollment.id,
                 })
@@ -98,14 +96,14 @@ export default {
                             '</strong><hr />'
                     }
                     if (!_.isEmpty(state.metadata.response)) {
-                        collated += '\n' + state.metadata.response
+                        collated += '\n' + state.metadata.response + '<br>'
                     } else {
                         collated +=
                             '\n<p>' +
                             this.$t(
                                 'windward.core.components.content.blocks.open_response_collate.no_response'
                             ) +
-                            '</p>'
+                            '</p><br>'
                     }
                 })
                 let filename = this.block.metadata.config.filename
@@ -123,7 +121,24 @@ export default {
                     filename = filename.replaceAll(/\s+/gi, '_')
                     filename = filename.replaceAll(/[^a-z0-9\-\_]/gi, '')
                 }
-
+                if (!_.isEmpty(this.block.metadata.config.additional_text)) {
+                    if (
+                        this.block.metadata.config.additional_text_alignment ===
+                        'top'
+                    ) {
+                        collated =
+                            this.block.metadata.config.additional_text +
+                            '<br><br><br>' +
+                            collated
+                    } else if (
+                        this.block.metadata.config.additional_text_alignment ===
+                        'bottom'
+                    ) {
+                        collated +=
+                            '<br><br><br>' +
+                            this.block.metadata.config.additional_text
+                    }
+                }
                 this.generateDocument(collated, filename)
             } catch (e) {
                 // eslint-disable-next-line no-console