@windward/integrations 0.13.0 → 0.15.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +6 -0
- package/bitbucket/releases/delete-rc-tags.sh +35 -0
- package/bitbucket/releases/tag-master-release.sh +48 -0
- package/bitbucket-pipelines.yml +11 -1
- package/components/Content/Blocks/ExternalIntegration/LtiConsumer.vue +10 -1
- package/components/Settings/ExternalIntegration/LtiConsumerSettings.vue +11 -26
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
#!/bin/bash
|
|
2
|
+
|
|
3
|
+
# Checkout the release branch
|
|
4
|
+
git checkout master || exit 1
|
|
5
|
+
git pull origin master || exit 1
|
|
6
|
+
|
|
7
|
+
# Configure Git user for the current repository
|
|
8
|
+
git config user.email "commits-noreply@bitbucket.org"
|
|
9
|
+
git config user.name "bitbucket-pipelines"
|
|
10
|
+
|
|
11
|
+
# Extract version from the last merge commit message. Expecting `Merged in xx.xx.xx`
|
|
12
|
+
VERSION=$(basename "$(git log -1 --pretty=%B | grep -o -E "Merged in (release|hotfix)\/([0-9]+\.[0-9]+\.[0-9]+)")")
|
|
13
|
+
|
|
14
|
+
if [ -z "$VERSION" ]; then
|
|
15
|
+
echo "Error: Could not extract version from release branch name."
|
|
16
|
+
exit 1
|
|
17
|
+
fi
|
|
18
|
+
|
|
19
|
+
echo "Running auto-rc-tag delete for version $VERSION"
|
|
20
|
+
|
|
21
|
+
# Delete all rc tags for the version
|
|
22
|
+
rc_tags=$(git tag --list "$VERSION-rc*")
|
|
23
|
+
|
|
24
|
+
if [ -n "$rc_tags" ]; then
|
|
25
|
+
echo "Deleting rc tags for version $VERSION..."
|
|
26
|
+
for tag in $rc_tags; do
|
|
27
|
+
git tag -d "$tag"
|
|
28
|
+
git push origin ":refs/tags/$tag"
|
|
29
|
+
done
|
|
30
|
+
echo "All rc tags for version $VERSION have been deleted."
|
|
31
|
+
else
|
|
32
|
+
echo "No rc tags found for version $VERSION."
|
|
33
|
+
fi
|
|
34
|
+
|
|
35
|
+
exit 0
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
#!/bin/bash
|
|
2
|
+
|
|
3
|
+
# Checkout the release branch
|
|
4
|
+
git checkout master || exit 1
|
|
5
|
+
git pull origin master || exit 1
|
|
6
|
+
|
|
7
|
+
# Configure Git user for the current repository
|
|
8
|
+
git config user.email "commits-noreply@bitbucket.org"
|
|
9
|
+
git config user.name "bitbucket-pipelines"
|
|
10
|
+
|
|
11
|
+
# Extract version from the last merge commit message. Expecting `Merged in xx.xx.xx`
|
|
12
|
+
VERSION=$(basename "$(git log -1 --pretty=%B | grep -o -E "Merged in (release|hotfix)\/([0-9]+\.[0-9]+\.[0-9]+)")")
|
|
13
|
+
|
|
14
|
+
if [ -z "$VERSION" ]; then
|
|
15
|
+
echo "Error: Could not extract version from release branch name."
|
|
16
|
+
exit 1
|
|
17
|
+
fi
|
|
18
|
+
|
|
19
|
+
echo "Running auto-tag for version $VERSION"
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
# Fetch the latest state of the repository
|
|
23
|
+
git fetch origin
|
|
24
|
+
|
|
25
|
+
# Get the latest commit on master branch
|
|
26
|
+
LATEST_MASTER_COMMIT=$(git rev-parse origin/master)
|
|
27
|
+
if [ $? -ne 0 ]; then
|
|
28
|
+
echo "Error: Failed to get the latest commit on master"
|
|
29
|
+
exit 1
|
|
30
|
+
fi
|
|
31
|
+
|
|
32
|
+
# Apply the tag to the latest master commit
|
|
33
|
+
git tag -a "$VERSION" -m "Tagging $VERSION" "$LATEST_MASTER_COMMIT"
|
|
34
|
+
if [ $? -ne 0 ]; then
|
|
35
|
+
echo "Error: Failed to tag the commit $LATEST_MASTER_COMMIT with tag $VERSION"
|
|
36
|
+
exit 1
|
|
37
|
+
fi
|
|
38
|
+
|
|
39
|
+
# Push the tag to the repository
|
|
40
|
+
git push origin "$VERSION"
|
|
41
|
+
if [ $? -ne 0 ]; then
|
|
42
|
+
echo "Error: Failed to push the tag $VERSION"
|
|
43
|
+
exit 1
|
|
44
|
+
fi
|
|
45
|
+
|
|
46
|
+
echo "Tag $VERSION successfully applied to commit $LATEST_MASTER_COMMIT and pushed to repository."
|
|
47
|
+
|
|
48
|
+
exit 0
|
package/bitbucket-pipelines.yml
CHANGED
|
@@ -1,6 +1,14 @@
|
|
|
1
1
|
image: atlassian/default-image:3
|
|
2
2
|
|
|
3
3
|
pipelines:
|
|
4
|
+
pull-requests:
|
|
5
|
+
'**':
|
|
6
|
+
- step:
|
|
7
|
+
name: Build and test
|
|
8
|
+
image: node:16.20.2
|
|
9
|
+
script:
|
|
10
|
+
- npm install
|
|
11
|
+
- npm run test
|
|
4
12
|
custom:
|
|
5
13
|
create-release:
|
|
6
14
|
import: infrastructure-automation:master:create-release
|
|
@@ -11,4 +19,6 @@ pipelines:
|
|
|
11
19
|
"release/*":
|
|
12
20
|
import: infrastructure-automation:master:auto-update
|
|
13
21
|
"hotfix/*":
|
|
14
|
-
import: infrastructure-automation:master:auto-update
|
|
22
|
+
import: infrastructure-automation:master:auto-update
|
|
23
|
+
master:
|
|
24
|
+
import: infrastructure-automation:master:auto-publish-release
|
|
@@ -1,7 +1,13 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div>
|
|
3
3
|
<div v-if="!missing && consumer">
|
|
4
|
-
<h2
|
|
4
|
+
<h2
|
|
5
|
+
v-if="
|
|
6
|
+
block.metadata.config.title &&
|
|
7
|
+
block.metadata.config.display_title
|
|
8
|
+
"
|
|
9
|
+
tabindex="0"
|
|
10
|
+
>
|
|
5
11
|
{{ block.metadata.config.title }}
|
|
6
12
|
</h2>
|
|
7
13
|
|
|
@@ -227,6 +233,9 @@ export default {
|
|
|
227
233
|
if (_.isEmpty(this.block.metadata.config.title)) {
|
|
228
234
|
this.block.metadata.config.title = ''
|
|
229
235
|
}
|
|
236
|
+
if (!_.isBoolean(this.block.metadata.config.display_title)) {
|
|
237
|
+
this.$set(this.block.metadata.config, 'display_title', true)
|
|
238
|
+
}
|
|
230
239
|
if (_.isEmpty(this.block.metadata.config.instructions)) {
|
|
231
240
|
this.block.metadata.config.instructions = ''
|
|
232
241
|
}
|
|
@@ -1,31 +1,9 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<v-container>
|
|
3
|
-
<
|
|
4
|
-
|
|
5
|
-
v-model="block.metadata.config.title"
|
|
6
|
-
outlined
|
|
7
|
-
:rules="$Validation.getRule('block.title')"
|
|
8
|
-
:counter="$Validation.getLimit('block.title')"
|
|
9
|
-
:label="
|
|
10
|
-
$t(
|
|
11
|
-
'windward.integrations.components.settings.external_integration.lti_consumer.title'
|
|
12
|
-
)
|
|
13
|
-
"
|
|
3
|
+
<BaseContentBlockSettings
|
|
4
|
+
v-model="block.metadata.config"
|
|
14
5
|
:disabled="render"
|
|
15
|
-
></
|
|
16
|
-
<v-textarea
|
|
17
|
-
id="block-settings-instructions"
|
|
18
|
-
v-model="block.metadata.config.instructions"
|
|
19
|
-
outlined
|
|
20
|
-
:rules="$Validation.getRule('block.instructions')"
|
|
21
|
-
:counter="$Validation.getLimit('block.instructions')"
|
|
22
|
-
:label="
|
|
23
|
-
$t(
|
|
24
|
-
'windward.integrations.components.settings.external_integration.lti_consumer.instructions'
|
|
25
|
-
)
|
|
26
|
-
"
|
|
27
|
-
:disabled="render"
|
|
28
|
-
></v-textarea>
|
|
6
|
+
></BaseContentBlockSettings>
|
|
29
7
|
<br />
|
|
30
8
|
<v-divider class="primary"></v-divider>
|
|
31
9
|
<br />
|
|
@@ -92,13 +70,17 @@
|
|
|
92
70
|
|
|
93
71
|
<script>
|
|
94
72
|
import { mapGetters } from 'vuex'
|
|
95
|
-
import LtiConsumer from '../../../models/ExternalIntegration/LtiConsumer'
|
|
96
73
|
import BaseContentSettings from '~/components/Content/Settings/BaseContentSettings.js'
|
|
97
74
|
import Course from '~/models/Course'
|
|
98
75
|
import Organization from '~/models/Organization'
|
|
76
|
+
import BaseContentBlockSettings from '~/components/Content/Settings/BaseContentBlockSettings.vue'
|
|
77
|
+
import LtiConsumer from '../../../models/ExternalIntegration/LtiConsumer'
|
|
99
78
|
|
|
100
79
|
export default {
|
|
101
80
|
name: 'ContentBlockExternalIntegrationLti1p1ConsumerSettings',
|
|
81
|
+
components: {
|
|
82
|
+
BaseContentBlockSettings,
|
|
83
|
+
},
|
|
102
84
|
extends: BaseContentSettings,
|
|
103
85
|
props: {
|
|
104
86
|
settings: { type: Object, required: false, default: null },
|
|
@@ -176,6 +158,9 @@ export default {
|
|
|
176
158
|
if (_.isEmpty(this.block.metadata.config.launch_type)) {
|
|
177
159
|
this.block.metadata.config.launch_type = 'new_window'
|
|
178
160
|
}
|
|
161
|
+
if (!_.isBoolean(this.block.metadata.config.display_title)) {
|
|
162
|
+
this.$set(this.block.metadata.config, 'display_title', true)
|
|
163
|
+
}
|
|
179
164
|
},
|
|
180
165
|
mounted() {},
|
|
181
166
|
methods: {},
|