Просмотр исходного кода

Merge branch 'master' into feat/notification

kaori 4 лет назад
Родитель
Сommit
b554f2bfed
20 измененных файлов с 81 добавлено и 568 удалено
  1. 7 3
      .github/release-drafter.yml
  2. 52 557
      CHANGELOG.md
  3. 1 0
      bin/github-actions/list-branches.js
  4. BIN
      packages/app/public/images/slack-integration/activate-public-dist.png
  5. BIN
      packages/app/public/images/slack-integration/basicinfo-all-checked.png
  6. BIN
      packages/app/public/images/slack-integration/click-add-to-slack.png
  7. BIN
      packages/app/public/images/slack-integration/growi-bot-kun-icon.png
  8. BIN
      packages/app/public/images/slack-integration/growi-register-modal.png
  9. BIN
      packages/app/public/images/slack-integration/growi-register-sentence.png
  10. BIN
      packages/app/public/images/slack-integration/growi-set-proxy-url.png
  11. BIN
      packages/app/public/images/slack-integration/impossible.png
  12. BIN
      packages/app/public/images/slack-integration/possible.png
  13. BIN
      packages/app/public/images/slack-integration/slack-bot-install-to-workspace-joined-bot.png
  14. BIN
      packages/app/public/images/slack-integration/slack-bot-install-to-workspace.png
  15. BIN
      packages/app/public/images/slack-integration/slack-bot-install-your-app-complete.png
  16. BIN
      packages/app/public/images/slack-integration/slack-bot-install-your-app-introduction-to-channel.png
  17. BIN
      packages/app/public/images/slack-integration/slack-bot-install-your-app-introduction.png
  18. BIN
      packages/app/public/images/slack-integration/slack-bot-install-your-app-transition-destination.png
  19. BIN
      packages/app/public/images/slack-integration/triangle-basic-gray.png
  20. 21 8
      packages/app/src/migrations/20210913153942-migrate-slack-app-integration-schema.js

+ 7 - 3
.github/release-drafter.yml

@@ -41,10 +41,14 @@ autolabeler:
       - '/^chore\/.+/'
       - '/^chore\/.+/'
     title:
     title:
       - '/^chore/i'
       - '/^chore/i'
-
+include-labels:
+  - breaking
+  - feature
+  - improvement
+  - bug
+  - support
+  - dependencies
 exclude-labels:
 exclude-labels:
   - 'exclude from changelog'
   - 'exclude from changelog'
 template: |
 template: |
-  ### Changes
-
   $CHANGES
   $CHANGES

Разница между файлами не показана из-за своего большого размера
+ 52 - 557
CHANGELOG.md


+ 1 - 0
bin/github-actions/list-branches.js

@@ -18,6 +18,7 @@ const EXCLUDE_PATTERNS = [
   // https://regex101.com/r/Lnx7Pz/3
   // https://regex101.com/r/Lnx7Pz/3
   /^dev\/[\d.x]*$/,
   /^dev\/[\d.x]*$/,
   /^release\/.+$/,
   /^release\/.+$/,
+  /^dependabot\/.+$/,
 ];
 ];
 const LEGAL_PATTERNS = [
 const LEGAL_PATTERNS = [
   /^master$/,
   /^master$/,

BIN
packages/app/public/images/slack-integration/activate-public-dist.png


BIN
packages/app/public/images/slack-integration/basicinfo-all-checked.png


BIN
packages/app/public/images/slack-integration/click-add-to-slack.png


BIN
packages/app/public/images/slack-integration/growi-bot-kun-icon.png


BIN
packages/app/public/images/slack-integration/growi-register-modal.png


BIN
packages/app/public/images/slack-integration/growi-register-sentence.png


BIN
packages/app/public/images/slack-integration/growi-set-proxy-url.png


BIN
packages/app/public/images/slack-integration/impossible.png


BIN
packages/app/public/images/slack-integration/possible.png


BIN
packages/app/public/images/slack-integration/slack-bot-install-to-workspace-joined-bot.png


BIN
packages/app/public/images/slack-integration/slack-bot-install-to-workspace.png


BIN
packages/app/public/images/slack-integration/slack-bot-install-your-app-complete.png


BIN
packages/app/public/images/slack-integration/slack-bot-install-your-app-introduction-to-channel.png


BIN
packages/app/public/images/slack-integration/slack-bot-install-your-app-introduction.png


BIN
packages/app/public/images/slack-integration/slack-bot-install-your-app-transition-destination.png


BIN
packages/app/public/images/slack-integration/triangle-basic-gray.png


+ 21 - 8
packages/app/src/migrations/20210913153942-migrate-slack-app-integration-schema.js

@@ -29,14 +29,26 @@ module.exports = {
 
 
     // create operations
     // create operations
     const operations = slackAppIntegrations.map((doc) => {
     const operations = slackAppIntegrations.map((doc) => {
-      const copyForBroadcastUse = defaultDataForBroadcastUse;
-      const copyForSingleUse = defaultDataForSingleUse;
-      doc._doc.supportedCommandsForBroadcastUse.forEach((commandName) => {
-        copyForBroadcastUse[commandName] = true;
-      });
-      doc._doc.supportedCommandsForSingleUse.forEach((commandName) => {
-        copyForSingleUse[commandName] = true;
-      });
+      const copyForBroadcastUse = { ...defaultDataForBroadcastUse };
+      const copyForSingleUse = { ...defaultDataForSingleUse };
+      // when the document does NOT have supportedCommandsFor... columns
+      if (doc._doc.supportedCommandsForBroadcastUse == null) {
+        defaultSupportedCommandsNameForBroadcastUse.forEach((commandName) => {
+          copyForBroadcastUse[commandName] = true;
+        });
+        defaultSupportedCommandsNameForSingleUse.forEach((commandName) => {
+          copyForSingleUse[commandName] = true;
+        });
+      }
+      // // when the document has supportedCommandsFor... columns
+      else {
+        doc._doc.supportedCommandsForBroadcastUse.forEach((commandName) => {
+          copyForBroadcastUse[commandName] = true;
+        });
+        doc._doc.supportedCommandsForSingleUse.forEach((commandName) => {
+          copyForSingleUse[commandName] = true;
+        });
+      }
 
 
       return {
       return {
         updateOne: {
         updateOne: {
@@ -63,6 +75,7 @@ module.exports = {
 
 
   async down(db, next) {
   async down(db, next) {
     logger.info('Rollback migration');
     logger.info('Rollback migration');
+    // return next();
     mongoose.connect(config.mongoUri, config.mongodb.options);
     mongoose.connect(config.mongoUri, config.mongodb.options);
 
 
     const SlackAppIntegration = getModelSafely('SlackAppIntegration') || require('~/server/models/slack-app-integration')();
     const SlackAppIntegration = getModelSafely('SlackAppIntegration') || require('~/server/models/slack-app-integration')();

Некоторые файлы не были показаны из-за большого количества измененных файлов