Merge remote-tracking branch 'origin/master' into develop

linode · Jan 31, 2024 · e6d974c · e6d974c
2 parents dea5d57 + 8bbaaad
commit e6d974c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 19 deletions.
diff --git a/packages/manager/CHANGELOG.md b/packages/manager/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2024-01-31] - v1.110.3
+
+### Fix:
+- Enable `Can add VPCs to this account` for user permissions
+
 ## [2024-01-31] - v1.110.2
 
 ### Changed:

diff --git a/packages/manager/package.json b/packages/manager/package.json
@@ -2,7 +2,7 @@
   "name": "linode-manager",
   "author": "Linode",
   "description": "The Linode Manager website",
-  "version": "1.110.2",
+  "version": "1.110.3",
   "private": true,
   "type": "module",
   "bugs": {

diff --git a/packages/manager/src/features/Users/UserPermissions.tsx b/packages/manager/src/features/Users/UserPermissions.tsx
@@ -84,7 +84,6 @@ interface State {
   showTabs?: boolean;
   tabs?: string[];
   userType: null | string;
-  vpcEnabled: boolean;
 }
 
 type CombinedProps = Props &
@@ -96,12 +95,6 @@ class UserPermissions extends React.Component<CombinedProps, State> {
   componentDidMount() {
     this.getUserGrants();
     this.getUserType();
-
-    if (this.props.flags.vpc) {
-      this.setState({ vpcEnabled: true });
-      this.entityPerms.push('vpc');
-      this.globalBooleanPerms.push('add_vpcs');
-    }
   }
 
   componentDidUpdate(prevProps: CombinedProps) {
@@ -172,6 +165,7 @@ class UserPermissions extends React.Component<CombinedProps, State> {
     'domain',
     'longview',
     'database',
+    'vpc',
   ];
 
   entitySetAllTo = (entity: GrantType, value: GrantLevel) => () => {
@@ -267,17 +261,18 @@ class UserPermissions extends React.Component<CombinedProps, State> {
   };
 
   globalBooleanPerms = [
+    'add_databases',
+    'add_domains',
+    'add_firewalls',
+    'add_images',
     'add_linodes',
-    'add_nodebalancers',
     'add_longview',
-    'longview_subscription',
-    'add_domains',
+    'add_nodebalancers',
     'add_stackscripts',
-    'add_images',
     'add_volumes',
-    'add_firewalls',
-    'add_databases',
+    'add_vpcs',
     'cancel_account',
+    'longview_subscription',
   ];
 
   globalPermOnChange = (perm: string) => (
@@ -483,15 +478,12 @@ class UserPermissions extends React.Component<CombinedProps, State> {
       add_nodebalancers: 'Can add NodeBalancers to this account ($)',
       add_stackscripts: 'Can create StackScripts under this account',
       add_volumes: 'Can add Block Storage Volumes to this account ($)',
+      add_vpcs: 'Can add VPCs to this account',
       cancel_account: 'Can cancel the entire account',
       longview_subscription:
         'Can modify this account\u{2019}s Longview subscription ($)',
     };
 
-    if (this.state.vpcEnabled) {
-      permDescriptionMap['add_vpcs'] = 'Can add VPCs to this account';
-    }
-
     if (this.state.userType === 'parent') {
       permDescriptionMap['child_account_access'] =
         'Enable child account access';
@@ -817,7 +809,6 @@ class UserPermissions extends React.Component<CombinedProps, State> {
     loadingGrants: false,
     setAllPerm: 'null',
     userType: null,
-    vpcEnabled: false,
   };
 }