Merge remote-tracking branch 'origin/feat/growi-bot' into feat/growi-bot-proxy

resource/locales/en_US/translation.json

@@ -108,7 +108,8 @@
   "Site URL settings": "Site URL settings",
   "Markdown Settings": "Markdown Settings",
   "Customize": "Customize",
-  "Notification Settings": "Notification Settings",
+  "External_Notification": "External Notification",
+  "Legacy_External_Notification": "Legacy External Notification",
   "User_Management": "User Management",
   "external_account_management": "External Account Management",
   "UserGroup Management": "UserGroup Management",

resource/locales/ja_JP/translation.json

@@ -109,7 +109,8 @@
   "Site URL settings": "サイトURL設定",
   "Markdown Settings": "マークダウン設定",
   "Customize": "カスタマイズ",
-  "Notification Settings": "通知設定",
+  "External_Notification": "外部ツールへの通知",
+  "Legacy_External_Notification": "外部ツールへの通知 (レガシー)",
   "User_Management": "ユーザー管理",
   "external_account_management": "外部アカウント管理",
   "UserGroup Management": "グループ管理",

resource/locales/zh_CN/translation.json

@@ -117,7 +117,8 @@
 	"Site URL settings": "主页URL设置",
 	"Markdown Settings": "Markdown设置",
 	"Customize": "页面定制",
-	"Notification Settings": "通知设置",
+  "External_Notification": "外部通知",
+  "Legacy_External_Notification": "旧版外部通知",
 	"User_Management": "用户管理",
 	"external_account_management": "外部账户管理",
 	"UserGroup Management": "用户组管理",

src/client/js/components/Admin/Common/AdminNavigation.jsx

@@ -20,7 +20,9 @@ const AdminNavigation = (props) => {
       case 'customize':     return <><i className="icon-fw icon-wrench"></i>          { t('Customize') }</>;
       case 'importer':      return <><i className="icon-fw icon-cloud-upload"></i>    { t('Import Data') }</>;
       case 'export':        return <><i className="icon-fw icon-cloud-download"></i>  { t('Export Archive Data') }</>;
-      case 'notification':  return <><i className="icon-fw icon-bell"></i>            { t('Notification Settings') }</>;
+      case 'notification':  return <><i className="icon-fw icon-bell"></i>            { t('External_Notification') }</>;
+      // TODO change icon for legacy-external-notification by GW-5466
+      case 'legacy-external-notification':  return <> <i className="icon-fw icon-bell"></i>{ t('Legacy_External_Notification') }</>;
       case 'users':         return <><i className="icon-fw icon-user"></i>            { t('User_Management') }</>;
       case 'user-groups':   return <><i className="icon-fw icon-people"></i>          { t('UserGroup Management') }</>;
       case 'search':        return <><i className="icon-fw icon-magnifier"></i>       { t('Full Text Search Management') }</>;
@@ -61,6 +63,7 @@ const AdminNavigation = (props) => {
         <MenuLink menu="importer"     isListGroupItems isActive={isActiveMenu('/importer')} />
         <MenuLink menu="export"       isListGroupItems isActive={isActiveMenu('/export')} />
         <MenuLink menu="notification" isListGroupItems isActive={isActiveMenu('/notification') || isActiveMenu('/global-notification')} />
+        <MenuLink menu="legacy-external-notification" isListGroupItems isActive={isActiveMenu('/legacy-external-notification')} />
         <MenuLink menu="users"        isListGroupItems isActive={isActiveMenu('/users')} />
         <MenuLink menu="user-groups"  isListGroupItems isActive={isActiveMenu('/user-groups')} />
         <MenuLink menu="search"       isListGroupItems isActive={isActiveMenu('/search')} />

src/client/js/components/Admin/Notification/GlobalNotification.jsx

@@ -26,7 +26,7 @@ class GlobalNotification extends React.Component {
 
     try {
       await adminNotificationContainer.updateGlobalNotificationForPages();
-      toastSuccess(t('toaster.update_successed', { target: t('Notification Settings') }));
+      toastSuccess(t('toaster.update_successed', { target: t('External_Notification') }));
     }
     catch (err) {
       toastError(err);

src/server/routes/admin.js

@@ -223,6 +223,11 @@ module.exports = function(crowi, app) {
     return res.render('admin/external-accounts');
   };
 
+  actions.legacyExternalNotification = {};
+  actions.legacyExternalNotification = function(req, res) {
+    return res.render('admin/legacy-external-notification');
+  };
+
 
   actions.userGroup = {};
   actions.userGroup.index = function(req, res) {

src/server/routes/index.js

@@ -93,6 +93,7 @@ module.exports = function(crowi, app) {
   app.get('/admin/notification/slackSetting/disconnect' , loginRequiredStrictly , adminRequired , admin.notification.disconnectFromSlack);
   app.get('/admin/global-notification/new'              , loginRequiredStrictly , adminRequired , admin.globalNotification.detail);
   app.get('/admin/global-notification/:id'              , loginRequiredStrictly , adminRequired , admin.globalNotification.detail);
+  app.get('/admin/legacy-external-notification'         , loginRequiredStrictly , adminRequired,  admin.legacyExternalNotification);
 
   app.get('/admin/users'                                , loginRequiredStrictly , adminRequired , admin.user.index);
 

src/server/views/admin/global-notification-detail.html

@@ -1,9 +1,9 @@
 {% extends '../layout/admin.html' %}
 
-{% block html_title %}{{ customizeService.generateCustomTitleForFixedPageName(t('Notification Settings')) }}{% endblock %}
+{% block html_title %}{{ customizeService.generateCustomTitleForFixedPageName(t('External_Notification')) }}{% endblock %}
 
 {% block content_header %}
-<h1 class="title">{{ t('Notification Settings') }}</h1>
+<h1 class="title">{{ t('External_Notification') }}</h1>
 {% endblock %}
 
 {% block content_main %}

src/server/views/admin/legacy-external-notification.html

@@ -0,0 +1,12 @@
+{% extends '../layout/admin.html' %}
+
+{% block html_title %}{{ customizeService.generateCustomTitleForFixedPageName(t('Legacy_External_Notification')) }}{% endblock %}
+
+{% block content_header %}
+<h1 class="title">{{ t('Legacy_External_Notification') }}</h1>
+{% endblock %}
+
+{% block content_main %}
+<!-- TODO: move contents from notification settings by GW-5467  -->
+{% endblock content_main %}
+

src/server/views/admin/notification.html

@@ -1,9 +1,9 @@
 {% extends '../layout/admin.html' %}
 
-{% block html_title %}{{ customizeService.generateCustomTitleForFixedPageName(t('Notification Settings')) }}{% endblock %}
+{% block html_title %}{{ customizeService.generateCustomTitleForFixedPageName(t('External_Notification')) }}{% endblock %}
 
 {% block content_header %}
-<h1 class="title">{{ t('Notification Settings') }}</h1>
+<h1 class="title">{{ t('External_Notification') }}</h1>
 {% endblock %}
 
 {% block content_main %}