EPMRPP-87016 || Plugin icon is not displayed (#3609)

and users endpoint fix
reportportal · Oct 17, 2023 · e1eec39 · e1eec39
1 parent 720b07f
commit e1eec39
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 6 deletions.
diff --git a/app/src/common/urls.js b/app/src/common/urls.js
@@ -235,7 +235,7 @@ export const URLS = {
     })}`,
   logSearch: (activeProject, itemId) => `${urlBase}${activeProject}/log/search/${itemId}`,
   bulkLastLogs: (activeProject) => `${urlBase}${activeProject}/log/under`,
-  user: () => `${urlBase}user`,
+  users: () => `${urlCommonBase}users`,
   userRegistration: () => `${urlCommonBase}users/registration`,
   userValidateRegistrationInfo: () => `${urlCommonBase}users/registration/info`,
   userPasswordReset: () => `${urlCommonBase}users/password/reset`,

diff --git a/app/src/components/integrations/elements/pluginIcon/pluginIcon.jsx b/app/src/components/integrations/elements/pluginIcon/pluginIcon.jsx
@@ -21,7 +21,11 @@ import { URLS } from 'common/urls';
 import { activeProjectSelector } from 'controllers/user';
 import { COMMAND_GET_FILE } from 'controllers/plugins/uiExtensions/constants';
 import { globalIntegrationsSelector } from 'controllers/plugins/selectors';
-import { filterIntegrationsByName, isPluginSupportsCommonCommand } from 'controllers/plugins/utils';
+import {
+  filterIntegrationsByName,
+  isPluginSupportsAllowedCommand,
+  isPluginSupportsCommonCommand,
+} from 'controllers/plugins/utils';
 import { PLUGIN_DEFAULT_IMAGE, PLUGIN_IMAGES_MAP } from 'components/integrations/constants';
 import { Image } from 'components/main/image';
 
@@ -36,6 +40,10 @@ export const PluginIcon = ({ pluginData, className, ...rest }) => {
 
     if (isDynamicIconAvailable && enabled) {
       const isCommonCommandSupported = isPluginSupportsCommonCommand(pluginData, COMMAND_GET_FILE);
+      const isAllowedCommandSupported = isPluginSupportsAllowedCommand(
+        pluginData,
+        COMMAND_GET_FILE,
+      );
 
       if (isCommonCommandSupported) {
         return {
@@ -45,7 +53,7 @@ export const PluginIcon = ({ pluginData, className, ...rest }) => {
       }
 
       const integration = filterIntegrationsByName(globalIntegrations, name)[0];
-      if (integration) {
+      if (integration && isAllowedCommandSupported) {
         return {
           url: URLS.projectIntegrationByIdCommand(projectId, integration.id, COMMAND_GET_FILE),
           requestParams: commandParams,

diff --git a/app/src/controllers/plugins/utils.js b/app/src/controllers/plugins/utils.js
@@ -74,3 +74,10 @@ export const isPluginSupportsCommonCommand = ({ enabled, details }, command) =>
   details.commonCommands &&
   details.commonCommands.length &&
   details.commonCommands.includes(command);
+
+export const isPluginSupportsAllowedCommand = ({ enabled, details }, command) =>
+  enabled &&
+  details &&
+  details.allowedCommands &&
+  details.allowedCommands.length &&
+  details.allowedCommands.includes(command);
diff --git a/app/src/controllers/user/sagas.js b/app/src/controllers/user/sagas.js
@@ -120,7 +120,7 @@ function* unassignFromProject({ payload: project }) {
 function* fetchUserWorker() {
   let user;
   try {
-    user = yield call(fetch, URLS.user());
+    user = yield call(fetch, URLS.users());
     yield put(fetchUserSuccessAction(user));
   } catch (err) {
     yield put(fetchUserErrorAction());

diff --git a/app/src/pages/admin/allUsersPage/allUsersPage.jsx b/app/src/pages/admin/allUsersPage/allUsersPage.jsx
@@ -205,7 +205,7 @@ export class AllUsersPage extends Component {
   confirmDeleteItems = (items) => {
     const ids = items.map((item) => item.id);
     this.props.showScreenLockAction();
-    fetch(URLS.user(), {
+    fetch(URLS.users(), {
       method: 'delete',
       data: {
         ids,

diff --git a/app/src/pages/admin/allUsersPage/usersToolbar/actionPanel/actionPanel.jsx b/app/src/pages/admin/allUsersPage/usersToolbar/actionPanel/actionPanel.jsx
@@ -115,7 +115,7 @@ export class ActionPanel extends Component {
   };
 
   addUser = (values) => {
-    fetch(URLS.user(), {
+    fetch(URLS.users(), {
       method: 'post',
       data: {
         accountRole: values.accountRole,