Merge pull request #4787 from cloud-gov/fix-build-tasks-feature-flag

fix: Site build tasks feature flag

Author: apburnes

ci/pipeline.yml

@@ -14,7 +14,6 @@ do:
     params:
       APP_HOSTNAME: https://((((deploy-env))-pages-domain))
       PROXY_DOMAIN: sites.((((deploy-env))-pages-domain))
-      FEATURE_BUILD_TASKS: "active"
       #@ if/end env != 'production':
       FEATURE_FILE_STORAGE_SERVICE: true
       #@ if/end env == 'production':

docker-compose.yml

@@ -42,7 +42,6 @@ services:
       <<: *minioenv
       APP_HOSTNAME: http://localhost:1337
       DOMAIN: localhost:1337
-      FEATURE_BUILD_TASKS: 'active'
       FEATURE_FILE_STORAGE_SERVICE: 'true'
       FEATURE_LOCAL_BUILD_REPORTS: 'active'
       FEATURE_LOCAL_S3_ENDPOINT: 'true'

frontend/hooks/useBuildTasks.js

@@ -15,7 +15,7 @@ export const useBuildTasks = (id) => {
         setResults({
           isLoading: false,
           buildTasks: data,
-          hasBuildTasks: process.env.FEATURE_BUILD_TASKS === 'active' && data.length > 0,
+          hasBuildTasks: data.length > 0,
         }),
       );
     }

frontend/pages/sites/$siteId/siteRoutes.js

@@ -39,17 +39,13 @@ export default [
     title: 'Logs for build #',
     path: 'builds/:buildId/logs',
   },
-  ...(process.env.FEATURE_BUILD_TASKS === 'true'
-    ? [
-        {
-          Component: Reports,
-          title: 'Report history',
-          path: 'reports',
-          icon: 'IconReport',
-          showInSidebar: true,
-        },
-      ]
-    : []),
+  {
+    Component: Reports,
+    title: 'Report history',
+    path: 'reports',
+    icon: 'IconReport',
+    showInSidebar: true,
+  },
   {
     Component: SiteSettings,
     title: 'Site settings',

frontend/pages/sites/$siteId/siteRoutes.test.jsx

@@ -18,32 +18,16 @@ describe('siteRoutes', () => {
   });
 
   describe('feature flags', () => {
-    it('should include Reports when FEATURE_BUILD_TASKS is true', () => {
-      process.env.FEATURE_BUILD_TASKS = 'true';
+    it('should include Reports', () => {
       const routes = jest.requireActual('./siteRoutes').default;
       expect(routes.some((route) => route.path === 'reports')).toBe(true);
     });
 
-    it('should not include Reports when FEATURE_BUILD_TASKS is false', () => {
-      process.env.FEATURE_BUILD_TASKS = 'false';
-      const routes = jest.requireActual('./siteRoutes').default;
-      expect(routes.some((route) => route.path === 'reports')).toBe(false);
-    });
-
-    it('should include storage routes when FEATURE_FILE_STORAGE_SERVICE is true', () => {
-      process.env.FEATURE_FILE_STORAGE_SERVICE = 'true';
+    it('should include storage routes', () => {
       const routes = jest.requireActual('./siteRoutes').default;
       expect(routes.some((route) => route.path === 'storage')).toBe(true);
       expect(routes.some((route) => route.path === 'storage/logs')).toBe(true);
     });
-
-    // eslint-disable-next-line max-len
-    it('should not include storage routes when FEATURE_FILE_STORAGE_SERVICE is false', () => {
-      process.env.FEATURE_FILE_STORAGE_SERVICE = 'false';
-      const routes = jest.requireActual('./siteRoutes').default;
-      expect(routes.some((route) => route.path === 'storage')).toBe(true);
-      expect(routes.some((route) => route.path === 'storage/logs')).toBe(false);
-    });
   });
 
   describe('each route Component', () => {