feat: adding frontend and backend feature flags (#817)

### Feature or Bugfix - Feature ### Detail - Adding frontend support for all feature flags defined in config.json with a new util method isFeatureEnabled - Adding a new flag **preview_data** in the datasets module to control whether previewing data is allowed - Adding a new flag **glue_crawler** in the datasets module to control whether running glue crawler is allowed - Updating environment features to be hidden or visible based on whether the module is active. Adding a new util isAnyFeatureModuleEnabled to check whether to render the entire feature box. ### Relates N/A ### Security Not relevant By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. --------- Co-authored-by: Zilvinas Saltys <zilvinas.saltys@yahooinc.com>
data-dot-all · Oct 25, 2023 · 48c32e5 · 48c32e5
1 parent 8b7b82e
commit 48c32e5
Show file tree

Hide file tree

Showing 14 changed files with 444 additions and 341 deletions.
diff --git a/backend/dataall/modules/datasets/api/dataset/resolvers.py b/backend/dataall/modules/datasets/api/dataset/resolvers.py
@@ -128,6 +128,7 @@ def get_dataset_assume_role_url(context: Context, source, datasetUri: str = None
     return DatasetService.get_dataset_assume_role_url(uri=datasetUri)
 
 
+@is_feature_enabled('modules.datasets.features.glue_crawler')
 def start_crawler(context: Context, source, datasetUri: str, input: dict = None):
     return DatasetService.start_crawler(uri=datasetUri, data=input)
 

diff --git a/backend/dataall/modules/datasets/api/table/resolvers.py b/backend/dataall/modules/datasets/api/table/resolvers.py
@@ -1,5 +1,6 @@
 import logging
 
+from dataall.core.feature_toggle_checker import is_feature_enabled
 from dataall.modules.catalog.db.glossary_repositories import GlossaryRepository
 from dataall.modules.datasets.api.dataset.resolvers import get_dataset
 from dataall.base.api.context import Context
@@ -23,6 +24,7 @@ def delete_table(context, source, tableUri: str = None):
     return DatasetTableService.delete_table(uri=tableUri)
 
 
+@is_feature_enabled('modules.datasets.features.preview_data')
 def preview(context, source, tableUri: str = None):
     if not tableUri:
         return None

diff --git a/config.json b/config.json
@@ -14,7 +14,9 @@
             "features": {
                 "file_uploads": true,
                 "file_actions": true,
-                "aws_actions": true
+                "aws_actions": true,
+                "preview_data": true,
+                "glue_crawler": true
             }
         },
         "worksheets": {

diff --git a/frontend/src/modules/Datasets/components/DatasetData.js b/frontend/src/modules/Datasets/components/DatasetData.js
@@ -3,6 +3,7 @@ import React from 'react';
 import { Box } from '@mui/material';
 import { DatasetTables } from './DatasetTables';
 import { DatasetFolders } from './DatasetFolders';
+import { isFeatureEnabled } from 'utils';
 
 export const DatasetData = (props) => {
   const { dataset, isAdmin } = props;
@@ -12,9 +13,11 @@ export const DatasetData = (props) => {
       <Box>
         <DatasetTables dataset={dataset} isAdmin={isAdmin} />
       </Box>
-      <Box sx={{ mt: 3 }}>
-        <DatasetFolders dataset={dataset} isAdmin={isAdmin} />
-      </Box>
+      {isFeatureEnabled('datasets', 'file_actions') && (
+        <Box sx={{ mt: 3 }}>
+          <DatasetFolders dataset={dataset} isAdmin={isAdmin} />
+        </Box>
+      )}
     </Box>
   );
 };

diff --git a/frontend/src/modules/Datasets/components/DatasetTables.js b/frontend/src/modules/Datasets/components/DatasetTables.js
@@ -40,6 +40,7 @@ import { listDatasetTables, deleteDatasetTable, useClient } from 'services';
 import { syncTables } from '../services';
 
 import { DatasetStartCrawlerModal } from './DatasetStartCrawlerModal';
+import { isFeatureEnabled } from 'utils';
 
 export const DatasetTables = (props) => {
   const { dataset, isAdmin } = props;
@@ -216,15 +217,17 @@ export const DatasetTables = (props) => {
                 Synchronize
               </LoadingButton>
 
-              <LoadingButton
-                color="primary"
-                onClick={handleStartCrawlerModalOpen}
-                startIcon={<SearchIcon fontSize="small" />}
-                sx={{ m: 1 }}
-                variant="outlined"
-              >
-                Start Crawler
-              </LoadingButton>
+              {isFeatureEnabled('datasets', 'glue_crawler') && (
+                <LoadingButton
+                  color="primary"
+                  onClick={handleStartCrawlerModalOpen}
+                  startIcon={<SearchIcon fontSize="small" />}
+                  sx={{ m: 1 }}
+                  variant="outlined"
+                >
+                  Start Crawler
+                </LoadingButton>
+              )}
             </Grid>
           )}
         </Box>

diff --git a/frontend/src/modules/Datasets/views/DatasetView.js b/frontend/src/modules/Datasets/views/DatasetView.js
@@ -48,6 +48,7 @@ import {
   DatasetOverview,
   DatasetUpload
 } from '../components';
+import { isFeatureEnabled } from 'utils';
 
 const DatasetView = () => {
   const dispatch = useDispatch();
@@ -81,11 +82,13 @@ const DatasetView = () => {
         value: 'shares',
         icon: <ShareOutlined fontSize="small" />
       });
-      tabs.push({
-        label: 'Upload',
-        value: 'upload',
-        icon: <Upload fontSize="small" />
-      });
+      if (isFeatureEnabled('datasets', 'file_uploads')) {
+        tabs.push({
+          label: 'Upload',
+          value: 'upload',
+          icon: <Upload fontSize="small" />
+        });
+      }
       if (settings.isAdvancedMode) {
         tabs.push({
           label: 'Tags',
@@ -278,7 +281,9 @@ const DatasetView = () => {
                   >
                     Chat
                   </Button>
-                  <DatasetAWSActions dataset={dataset} isAdmin={isAdmin} />
+                  {isFeatureEnabled('datasets', 'aws_actions') && (
+                    <DatasetAWSActions dataset={dataset} isAdmin={isAdmin} />
+                  )}
                   <Button
                     color="primary"
                     component={RouterLink}

diff --git a/frontend/src/modules/Environments/components/EnvironmentFeatures.js b/frontend/src/modules/Environments/components/EnvironmentFeatures.js
@@ -41,46 +41,50 @@ export const EnvironmentFeatures = (props) => {
   // Filter the features based on the 'active' attribute
   const activeFeatures = features.filter((feature) => feature.active);
 
-  return (
-    <Card {...other}>
-      <CardHeader title="Features" />
-      <Divider />
-      <CardContent sx={{ pt: 0 }}>
-        <List>
-          {activeFeatures.map((feature) => (
-            <ListItem
-              key={feature.title}
-              disableGutters
-              divider
-              sx={{
-                justifyContent: 'space-between',
-                padding: 2
-              }}
-            >
-              <Typography color="textSecondary" variant="subtitle2">
-                {feature.title}
-              </Typography>
-              <Typography color="textPrimary" variant="body2">
-                <Label
-                  color={
-                    environment.parameters[feature.enabledEnvVariableName] ===
+  if (activeFeatures.length === 0) {
+    return <></>;
+  } else {
+    return (
+      <Card {...other}>
+        <CardHeader title="Features" />
+        <Divider />
+        <CardContent sx={{ pt: 0 }}>
+          <List>
+            {activeFeatures.map((feature) => (
+              <ListItem
+                key={feature.title}
+                disableGutters
+                divider
+                sx={{
+                  justifyContent: 'space-between',
+                  padding: 2
+                }}
+              >
+                <Typography color="textSecondary" variant="subtitle2">
+                  {feature.title}
+                </Typography>
+                <Typography color="textPrimary" variant="body2">
+                  <Label
+                    color={
+                      environment.parameters[feature.enabledEnvVariableName] ===
+                      'true'
+                        ? 'success'
+                        : 'error'
+                    }
+                  >
+                    {environment.parameters[feature.enabledEnvVariableName] ===
                     'true'
-                      ? 'success'
-                      : 'error'
-                  }
-                >
-                  {environment.parameters[feature.enabledEnvVariableName] ===
-                  'true'
-                    ? 'Enabled'
-                    : 'Disabled'}
-                </Label>
-              </Typography>
-            </ListItem>
-          ))}
-        </List>
-      </CardContent>
-    </Card>
-  );
+                      ? 'Enabled'
+                      : 'Disabled'}
+                  </Label>
+                </Typography>
+              </ListItem>
+            ))}
+          </List>
+        </CardContent>
+      </Card>
+    );
+  }
 };
 
 EnvironmentFeatures.propTypes = {

diff --git a/frontend/src/modules/Environments/components/EnvironmentTeams.js b/frontend/src/modules/Environments/components/EnvironmentTeams.js
@@ -51,6 +51,7 @@ import {
 import { EnvironmentRoleAddForm } from './EnvironmentRoleAddForm';
 import { EnvironmentTeamInviteEditForm } from './EnvironmentTeamInviteEditForm';
 import { EnvironmentTeamInviteForm } from './EnvironmentTeamInviteForm';
+import { isFeatureEnabled } from '../../../utils';
 
 function TeamRow({ team, environment, fetchItems }) {
   const client = useClient();
@@ -176,34 +177,39 @@ function TeamRow({ team, environment, fetchItems }) {
           />
         )}
       </TableCell>
+
       <TableCell>
         <Box>
-          <LoadingButton
-            loading={accessingConsole}
-            onClick={() => getConsoleLink(team.groupUri)}
-          >
-            <FaIcons.FaAws
-              size={25}
-              color={
-                theme.palette.mode === 'dark'
-                  ? theme.palette.primary.contrastText
-                  : theme.palette.primary.main
-              }
-            />
-          </LoadingButton>
-          <LoadingButton
-            loading={loadingCreds}
-            onClick={() => generateCredentials(team.groupUri)}
-          >
-            <CopyAllOutlined
-              sx={{
-                color:
-                  theme.palette.mode === 'dark'
-                    ? theme.palette.primary.contrastText
-                    : theme.palette.primary.main
-              }}
-            />
-          </LoadingButton>
+          {isFeatureEnabled('core', 'env_aws_actions') && (
+            <>
+              <LoadingButton
+                loading={accessingConsole}
+                onClick={() => getConsoleLink(team.groupUri)}
+              >
+                <FaIcons.FaAws
+                  size={25}
+                  color={
+                    theme.palette.mode === 'dark'
+                      ? theme.palette.primary.contrastText
+                      : theme.palette.primary.main
+                  }
+                />
+              </LoadingButton>
+              <LoadingButton
+                loading={loadingCreds}
+                onClick={() => generateCredentials(team.groupUri)}
+              >
+                <CopyAllOutlined
+                  sx={{
+                    color:
+                      theme.palette.mode === 'dark'
+                        ? theme.palette.primary.contrastText
+                        : theme.palette.primary.main
+                  }}
+                />
+              </LoadingButton>
+            </>
+          )}
           {team.groupUri !== environment.SamlGroupName && (
             <LoadingButton onClick={() => removeGroup(team.groupUri)}>
               <HiUserRemove