zahmis 4 лет назад
Родитель
Сommit
94977250b6

+ 3 - 5
packages/app/src/components/Admin/SlackIntegration/ManageCommandsProcess.jsx

@@ -62,19 +62,17 @@ const getPermissionTypeFromValue = (value) => {
   logger.error('The value type must be boolean or string[]');
 };
 
-// TODO: Add permittedChannelsForEachCommand to use data from server (props must have it) GW-7006
 const ManageCommandsProcess = ({
   apiv3Put, slackAppIntegrationId, permissionsForBroadcastUseCommands, permissionsForSingleUseCommands,
 }) => {
   const { t } = useTranslation();
 
-  // TODO: use data from server GW-7006
   const [permissionsForBroadcastUseCommandsState, setPermissionsForBroadcastUseCommandsState] = useState({
-    search: true,
+    search: permissionsForBroadcastUseCommands?.search,
   });
   const [permissionsForSingleUseCommandsState, setPermissionsForSingleUseCommandsState] = useState({
-    create: false,
-    togetter: [],
+    create: permissionsForSingleUseCommands?.create,
+    togetter: permissionsForSingleUseCommands?.togetter,
   });
   const [currentPermissionTypes, setCurrentPermissionTypes] = useState(() => {
     const initialState = {};

+ 0 - 5
packages/app/src/server/routes/apiv3/slack-integration-settings.js

@@ -182,11 +182,6 @@ module.exports = (crowi) => {
     else {
       settings.proxyServerUri = crowi.configManager.getConfig('crowi', 'slackbot:proxyUri');
       settings.proxyUriEnvVars = configManager.getConfigFromEnvVars('crowi', 'slackbot:proxyUri');
-      settings.permissionCommands = {
-        search: true,
-        create: true,
-        togetter: true,
-      };
     }
 
     // retrieve connection statuses