@windward/games 0.19.1 → 0.20.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## Release [0.20.0] - 2025-06-25
+
+* Merged in feature/LE-1948/empty-bucket (pull request #242)
+* Merged in LE-1951-bucket-update-default-instructio (pull request #239)
+* Merged in bugfix/LE-1954-bucket-long-answers-have-both-sc (pull request #240)
+* Merged in bugfix/LE-1906-ai-assistant-button-text (pull request #241)
+
+
 ### Hotfix [0.19.1] created - 2025-06-16
 
 

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

@@ -1,6 +1,14 @@
 image: atlassian/default-image:3
 
 pipelines:
+  pull-requests:
+    '**':
+      - step:
+          name: Build and test
+          image: node:16.20.2
+          script:
+            - npm install
+            - npm run test
   custom:
     create-release:
       import: infrastructure-automation:master:create-release
@@ -11,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/dragDrop/BucketGame.vue

@@ -623,7 +623,7 @@ export default {
     min-width: 10vw;
     padding-left: 4px;
     padding-right: 4px;
-    overflow: hidden;
+    overflow: hidden !important;
     white-space: nowrap;
     text-overflow: ellipsis;
     background-color: white;

package/components/settings/BucketGameSettingsManager.vue

@@ -198,7 +198,7 @@
                 <v-col cols="12">
                     <GenerateAIQuestionButton
                         :course="course"
-                        :content="content"
+                        :content="currentContent"
                         :block="block"
                         question-type="bucket_game"
                         :replace-existing-mode="replaceExisting"
@@ -239,7 +239,7 @@ export default {
         TextEditor,
         GenerateAIQuestionButton,
     },
-    beforeMount() {
+    beforeMount() {   
         if (_.isEmpty(this.block)) {
             this.block = {}
         }
@@ -301,7 +301,7 @@ export default {
     computed: {
         ...mapGetters({
             course: 'course/get',
-            content: 'content/get',
+            currentContent: 'content/get',
         }),
     },
     methods: {

package/components/settings/FlashCardSlidesManager.vue

@@ -21,12 +21,12 @@
                 :disabled="render"
                 @click:close="onDelete($event)"
             >
-                <template #header="{ item, index }">
+                <template #header="{ index }">
                     {{
                         stripHtml(block.metadata.config.cards[index].front.text)
                     }}
                 </template>
-                <template #body="{ item, index }">
+                <template #body="{ index }">
                     <v-container>
                         <v-row
                             class="d-flex justify-space-around"
@@ -258,7 +258,7 @@
                 <v-col cols="12">
                     <GenerateAIQuestionButton
                         :course="course"
-                        :content="content"
+                        :content="currentContent"
                         :block="block"
                         question-type="flashcard"
                         :replace-existing-mode="replaceExisting"
@@ -343,7 +343,7 @@ export default {
     computed: {
         ...mapGetters({
             course: 'course/get',
-            content: 'content/get',
+            currentContent: 'content/get',
         }),
         defaultCard() {
             return {
@@ -511,4 +511,3 @@ export default {
     },
 }
 </script>
-

package/i18n/en-US/components/settings/bucket_game.ts

@@ -4,7 +4,7 @@ export default {
         mass_entry: 'Mass data entry',
         title: 'Title',
         instructions: 'Instructions',
-        default_instructions: 'Match the correct descriptor to the prompt. To make a match, drag the descriptor and release it over the prompt. Incorrect answers will flash red. Correct answers will flash green and reveal a Continue button so you can move on to the next prompt.',
+        default_instructions: 'Match items and categories by dragging items and releasing them into a category area. Correctly sorted items will remain in the buckets. Keep sorting items until all of them are placed in a category.',
         buckets: 'Bucket Items',
         feedback: {
             feedback: 'Feedback',

package/i18n/es-ES/components/settings/bucket_game.ts

@@ -5,7 +5,7 @@ export default {
         title: 'Título',
         instructions: 'Instrucciones',
         default_instructions:
-            'Haga coincidir el descriptor correcto con el mensaje. Para hacer una coincidencia, arrastre el descriptor y suéltelo sobre el mensaje. Las respuestas incorrectas parpadearán en rojo. Las respuestas correctas parpadearán en verde y revelarán un botón Continuar para que pueda pasar al siguiente mensaje.',
+            'Haga coincidir elementos y categorías arrastrando elementos y soltándolos en un área de categoría. Los elementos ordenados correctamente permanecerán en los depósitos. Continúe ordenando elementos hasta que todos estén colocados en una categoría.',
         buckets: 'Elementos del depósito',
         feedback: {
             feedback: 'Comentarios',

package/i18n/sv-SE/components/settings/bucket_game.ts

@@ -5,7 +5,7 @@ export default {
         title: 'Titel',
         instructions: 'Instruktioner',
         default_instructions:
-            'Matcha rätt beskrivning med prompten. För att göra en matchning, dra deskriptorn och släpp den över prompten. Felaktiga svar blinkar rött. Rätta svar blinkar grönt och visar en Fortsätt-knapp så att du kan gå vidare till nästa uppmaning.',
+            'Matcha objekt och kategorier genom att dra objekt och släppa dem i ett kategoriområde. Korrekt sorterade objekt kommer att förbli i hinkarna. Fortsätt sortera objekt tills alla är placerade i en kategori.',
         buckets: 'Bucket Items',
         feedback: {
             feedback: 'Feedback',

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@windward/games",
-    "version": "0.19.1",
+    "version": "0.20.0",
     "description": "Windward UI Plugin Games",
     "main": "plugin.js",
     "scripts": {
@@ -21,7 +21,7 @@
     "license": "MIT",
     "homepage": "https://bitbucket.org/mindedge/windward-ui-plugin-games#readme",
     "dependencies": {
-        "@windward/core": "^0.19.0",
+        "@windward/core": "^0.20.0",
         "eslint": "^8.11.0",
         "lodash": "^4.17.21",
         "prettier": "^2.6.0",
@@ -32,6 +32,7 @@
     },
     "devDependencies": {
         "@babel/preset-env": "^7.16.11",
+        "@mindedge/vue-api-query": "^1.15.1",
         "@nuxtjs/axios": "^5.13.6",
         "@types/lodash": "^4.14.180",
         "@vue/test-utils": "^1.1.3",