[frontend] Fix subscriptions

OpenCTI-Platform · Oct 20, 2021 · f120e9a · f120e9a
1 parent f072e06
commit f120e9a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/opencti-platform/opencti-front/src/private/components/Profile.js b/opencti-platform/opencti-front/src/private/components/Profile.js
@@ -40,7 +40,7 @@ class Profile extends Component {
               const subscriptionStatus = R.head(
                 R.filter(
                   (n) => n.id === 'SUBSCRIPTION_MANAGER',
-                  R.pathOr([], ['settings', 'platform_modules'], props.settings),
+                  R.pathOr([], ['settings', 'platform_modules'], props),
                 ),
               )?.enable;
               return (

diff --git a/opencti-platform/opencti-front/src/private/components/profile/ProfileOverview.js b/opencti-platform/opencti-front/src/private/components/profile/ProfileOverview.js
@@ -126,7 +126,6 @@ const ProfileOverviewComponent = (props) => {
       },
     });
   };
-
   return (
     <div>
       <Grid container={true} spacing={3}>
@@ -270,6 +269,7 @@ const ProfileOverviewComponent = (props) => {
                             userId={me.id}
                             userSubscriptionId={userSubscription.id}
                             paginationOptions={null}
+                            disabled={!subscriptionStatus}
                           />
                         </ListItemSecondaryAction>
                       </ListItem>

diff --git a/opencti-platform/opencti-front/src/private/components/profile/UserSubscriptionPopover.js b/opencti-platform/opencti-front/src/private/components/profile/UserSubscriptionPopover.js
@@ -119,13 +119,16 @@ class UserSubscriptionPopover extends Component {
   }
 
   render() {
-    const { classes, t, userSubscriptionId } = this.props;
+    const {
+      classes, t, userSubscriptionId, disabled,
+    } = this.props;
     return (
       <div className={classes.container}>
         <IconButton
           onClick={this.handleOpen.bind(this)}
           aria-haspopup="true"
           style={{ marginTop: 1 }}
+          disabled={disabled}
         >
           <MoreVert />
         </IconButton>
@@ -199,6 +202,7 @@ class UserSubscriptionPopover extends Component {
 
 UserSubscriptionPopover.propTypes = {
   userId: PropTypes.string,
+  disabled: PropTypes.bool,
   userSubscriptionId: PropTypes.string,
   paginationOptions: PropTypes.object,
   classes: PropTypes.object,