refactor(37943): remove the feature flag

vanch3d · vanch3d · commit 9e2ee0876304 · 2025-11-03T16:06:09.000Z
diff --git a/hivemq-edge-frontend/src/config/index.ts b/hivemq-edge-frontend/src/config/index.ts
@@ -20,7 +20,6 @@ interface configType {
     DEV_MOCK_SERVER: boolean
     DATAHUB_FSM_REACT_FLOW: boolean
     WORKSPACE_EXPERIMENTAL: boolean
-    WORKSPACE_AUTO_LAYOUT: boolean
   }
 
   documentation: {
@@ -90,13 +89,6 @@ const config: configType = {
     DATAHUB_FSM_REACT_FLOW: import.meta.env.VITE_FLAG_DATAHUB_FSM_REACTFLOW === 'true',
 
     WORKSPACE_EXPERIMENTAL: import.meta.env.VITE_FLAG_WORKSPACE_SHOW_EXPERIMENTAL === 'true',
-
-    /**
-     * Enable workspace auto-layout algorithms (dagre, WebCola)
-     * Allows users to apply professional graph layout algorithms to automatically arrange workspace nodes
-     * @experimental Phase: Beta testing
-     */
-    WORKSPACE_AUTO_LAYOUT: import.meta.env.VITE_FLAG_WORKSPACE_AUTO_LAYOUT === 'true',
   },
 
   documentation: {
diff --git a/hivemq-edge-frontend/src/modules/Workspace/components/controls/CanvasToolbar.spec.cy.tsx b/hivemq-edge-frontend/src/modules/Workspace/components/controls/CanvasToolbar.spec.cy.tsx
@@ -6,8 +6,6 @@ import config from '@/config'
 describe('CanvasToolbar', () => {
   beforeEach(() => {
     cy.viewport(800, 600)
-    // Enable feature flag for testing layout controls
-    config.features.WORKSPACE_AUTO_LAYOUT = true
   })
 
   const wrapper = ({ children }: { children: JSX.Element }) => (
@@ -41,7 +39,6 @@ describe('CanvasToolbar', () => {
   })
 
   it('should show layout section when expanded and feature enabled', () => {
-    config.features.WORKSPACE_AUTO_LAYOUT = true
     cy.mountWithProviders(<CanvasToolbar />, { wrapper })
 
     // Expand toolbar
@@ -54,7 +51,6 @@ describe('CanvasToolbar', () => {
   })
 
   it('should hide layout section when feature disabled', () => {
-    config.features.WORKSPACE_AUTO_LAYOUT = false
     cy.mountWithProviders(<CanvasToolbar />, { wrapper })
 
     // Expand toolbar
@@ -67,7 +63,6 @@ describe('CanvasToolbar', () => {
   })
 
   it('should show visual divider between sections when feature enabled', () => {
-    config.features.WORKSPACE_AUTO_LAYOUT = true
     cy.mountWithProviders(<CanvasToolbar />, { wrapper })
 
     // Expand toolbar
@@ -79,31 +74,27 @@ describe('CanvasToolbar', () => {
   })
 
   it('should show layout selector', () => {
-    config.features.WORKSPACE_AUTO_LAYOUT = true
     cy.mountWithProviders(<CanvasToolbar />, { wrapper })
 
     cy.getByTestId('toolbox-search-expand').click()
     cy.getByTestId('workspace-layout-selector').should('be.visible')
   })
 
   it('should show apply layout button', () => {
-    config.features.WORKSPACE_AUTO_LAYOUT = true
     cy.mountWithProviders(<CanvasToolbar />, { wrapper })
 
     cy.getByTestId('toolbox-search-expand').click()
     cy.getByTestId('workspace-apply-layout').should('be.visible')
   })
 
   it('should show presets manager', () => {
-    config.features.WORKSPACE_AUTO_LAYOUT = true
     cy.mountWithProviders(<CanvasToolbar />, { wrapper })
 
     cy.getByTestId('toolbox-search-expand').click()
     cy.get('button[aria-label*="preset"]').should('be.visible')
   })
 
   it('should show settings button', () => {
-    config.features.WORKSPACE_AUTO_LAYOUT = true
     cy.mountWithProviders(<CanvasToolbar />, { wrapper })
 
     cy.getByTestId('toolbox-search-expand').click()
@@ -114,7 +105,6 @@ describe('CanvasToolbar', () => {
   })
 
   it('should open layout options drawer when settings clicked', () => {
-    config.features.WORKSPACE_AUTO_LAYOUT = true
     cy.mountWithProviders(<CanvasToolbar />, { wrapper })
 
     cy.getByTestId('toolbox-search-expand').click()
@@ -128,7 +118,6 @@ describe('CanvasToolbar', () => {
   })
 
   it('should be accessible', () => {
-    config.features.WORKSPACE_AUTO_LAYOUT = true
     cy.injectAxe()
     cy.mountWithProviders(<CanvasToolbar />, { wrapper })
 
diff --git a/hivemq-edge-frontend/src/modules/Workspace/components/controls/CanvasToolbar.tsx b/hivemq-edge-frontend/src/modules/Workspace/components/controls/CanvasToolbar.tsx
@@ -148,53 +148,50 @@ const CanvasToolbar: FC = () => {
                 <DrawerFilterToolbox />
               </Box>
             </VStack>
-            {config.features.WORKSPACE_AUTO_LAYOUT && (
-              <Divider
-                orientation={dividerOrientation}
-                // h={{ base: 'auto', xl: '24px' }}
-                // w={{ base: 'auto', xl: 'auto' }}
-                borderColor="gray.300"
-                _dark={{ borderColor: 'gray.600' }}
-              />
-            )}
-            {config.features.WORKSPACE_AUTO_LAYOUT && (
-              <VStack
-                role="region"
-                data-testid="layout-controls-panel"
-                aria-label={t('workspace.autoLayout.controls.aria-label')}
-                spacing={{ base: 2, xl: 0 }}
-                align="stretch"
-                flex={{ base: '1', xl: 'initial' }}
+            <Divider
+              orientation={dividerOrientation}
+              // h={{ base: 'auto', xl: '24px' }}
+              // w={{ base: 'auto', xl: 'auto' }}
+              borderColor="gray.300"
+              _dark={{ borderColor: 'gray.600' }}
+            />
+
+            <VStack
+              role="region"
+              data-testid="layout-controls-panel"
+              aria-label={t('workspace.autoLayout.controls.aria-label')}
+              spacing={{ base: 2, xl: 0 }}
+              align="stretch"
+              flex={{ base: '1', xl: 'initial' }}
+            >
+              <Box
+                display="flex"
+                flexDirection={{ base: 'column', md: 'row', xl: 'row' }}
+                gap={2}
+                sx={{
+                  '& > *': {
+                    width: { base: '100%', md: 'auto' },
+                  },
+                }}
               >
-                <Box
-                  display="flex"
-                  flexDirection={{ base: 'column', md: 'row', xl: 'row' }}
-                  gap={2}
-                  sx={{
-                    '& > *': {
-                      width: { base: '100%', md: 'auto' },
-                    },
-                  }}
-                >
-                  <LayoutSelector />
-                  <ApplyLayoutButton />
-                  <Box display="flex" gap={2} width="fit-content">
-                    <LayoutPresetsManager />
-                    <Tooltip label={t('workspace.autoLayout.options.title')} placement={tooltipPlacement}>
-                      <ChakraIconButton
-                        data-testid="workspace-layout-options"
-                        aria-label={t('workspace.autoLayout.options.title')}
-                        icon={<Icon as={LuSettings} />}
-                        size="sm"
-                        variant="ghost"
-                        onClick={onLayoutDrawerOpen}
-                        width={{ base: '100%', md: 'auto' }}
-                      />
-                    </Tooltip>
-                  </Box>
+                <LayoutSelector />
+                <ApplyLayoutButton />
+                <Box display="flex" gap={2} width="fit-content">
+                  <LayoutPresetsManager />
+                  <Tooltip label={t('workspace.autoLayout.options.title')} placement={tooltipPlacement}>
+                    <ChakraIconButton
+                      data-testid="workspace-layout-options"
+                      aria-label={t('workspace.autoLayout.options.title')}
+                      icon={<Icon as={LuSettings} />}
+                      size="sm"
+                      variant="ghost"
+                      onClick={onLayoutDrawerOpen}
+                      width={{ base: '100%', md: 'auto' }}
+                    />
+                  </Tooltip>
                 </Box>
-              </VStack>
-            )}
+              </Box>
+            </VStack>
             <Divider
               orientation={dividerOrientation}
               // h={{ base: 'auto', xl: '24px' }}
@@ -220,14 +217,13 @@ const CanvasToolbar: FC = () => {
       </Panel>
 
       {/* Layout Options Drawer */}
-      {config.features.WORKSPACE_AUTO_LAYOUT && (
-        <LayoutOptionsDrawer
-          isOpen={isLayoutDrawerOpen}
-          onClose={onLayoutDrawerClose}
-          algorithmType={layoutConfig.currentAlgorithm}
-          options={layoutConfig.options}
-        />
-      )}
+
+      <LayoutOptionsDrawer
+        isOpen={isLayoutDrawerOpen}
+        onClose={onLayoutDrawerClose}
+        algorithmType={layoutConfig.currentAlgorithm}
+        options={layoutConfig.options}
+      />
     </>
   )
 }
diff --git a/hivemq-edge-frontend/src/modules/Workspace/components/layout/ApplyLayoutButton.spec.cy.tsx b/hivemq-edge-frontend/src/modules/Workspace/components/layout/ApplyLayoutButton.spec.cy.tsx
@@ -12,9 +12,6 @@ describe('ApplyLayoutButton', () => {
   beforeEach(() => {
     cy.viewport(400, 300)
 
-    // Enable the feature flag for testing
-    config.features.WORKSPACE_AUTO_LAYOUT = true
-
     // Reset store before each test
     useWorkspaceStore.getState().reset()
   })
diff --git a/hivemq-edge-frontend/src/modules/Workspace/components/layout/ApplyLayoutButton.tsx b/hivemq-edge-frontend/src/modules/Workspace/components/layout/ApplyLayoutButton.tsx
@@ -17,10 +17,6 @@ const ApplyLayoutButton: FC = () => {
   const { applyLayout, currentAlgorithmInstance } = useLayoutEngine()
   const [isApplying, setIsApplying] = useState(false)
 
-  if (!config.features.WORKSPACE_AUTO_LAYOUT) {
-    return null
-  }
-
   const handleApplyLayout = async () => {
     if (!currentAlgorithmInstance) {
       toast({
diff --git a/hivemq-edge-frontend/src/modules/Workspace/components/layout/LayoutOptionsDrawer.spec.cy.tsx b/hivemq-edge-frontend/src/modules/Workspace/components/layout/LayoutOptionsDrawer.spec.cy.tsx
@@ -12,9 +12,6 @@ describe('LayoutOptionsDrawer', () => {
   beforeEach(() => {
     cy.viewport(1200, 800)
 
-    // Enable the feature flag for testing
-    config.features.WORKSPACE_AUTO_LAYOUT = true
-
     // Reset store before each test
     useWorkspaceStore.getState().reset()
   })
diff --git a/hivemq-edge-frontend/src/modules/Workspace/components/layout/LayoutPresetsManager.spec.cy.tsx b/hivemq-edge-frontend/src/modules/Workspace/components/layout/LayoutPresetsManager.spec.cy.tsx
@@ -13,9 +13,6 @@ describe('LayoutPresetsManager', () => {
   beforeEach(() => {
     cy.viewport(600, 800)
 
-    // Enable the feature flag for testing
-    config.features.WORKSPACE_AUTO_LAYOUT = true
-
     // Reset store before each test
     useWorkspaceStore.getState().reset()
   })
diff --git a/hivemq-edge-frontend/src/modules/Workspace/components/layout/LayoutSelector.spec.cy.tsx b/hivemq-edge-frontend/src/modules/Workspace/components/layout/LayoutSelector.spec.cy.tsx
@@ -10,9 +10,6 @@ import config from '@/config'
 describe('LayoutSelector', () => {
   beforeEach(() => {
     cy.viewport(400, 300)
-
-    // Enable the feature flag for testing
-    config.features.WORKSPACE_AUTO_LAYOUT = true
   })
 
   it('should render with all available algorithms', () => {
diff --git a/hivemq-edge-frontend/src/modules/Workspace/components/layout/LayoutSelector.tsx b/hivemq-edge-frontend/src/modules/Workspace/components/layout/LayoutSelector.tsx
@@ -15,10 +15,6 @@ const LayoutSelector: FC = () => {
   const { t } = useTranslation()
   const { currentAlgorithm, setAlgorithm, availableAlgorithms } = useLayoutEngine()
 
-  if (!config.features.WORKSPACE_AUTO_LAYOUT) {
-    return null
-  }
-
   const handleChange = (event: React.ChangeEvent<HTMLSelectElement>) => {
     const newAlgorithm = event.target.value as LayoutType
     setAlgorithm(newAlgorithm)
diff --git a/hivemq-edge-frontend/src/modules/Workspace/hooks/useWorkspaceStore.ts b/hivemq-edge-frontend/src/modules/Workspace/hooks/useWorkspaceStore.ts
@@ -5,7 +5,6 @@ import type { Group, WorkspaceState, WorkspaceAction, DeviceMetadata } from '@/m
 import { NodeTypes } from '@/modules/Workspace/types.ts'
 import { persist, createJSONStorage } from 'zustand/middleware'
 import type { Adapter } from '@/api/__generated__'
-import config from '@/config'
 import { LayoutType, LayoutMode, type LayoutPreset, type LayoutHistoryEntry, type LayoutOptions } from '../types/layout'
 
 // define the initial state
@@ -222,13 +221,9 @@ const useWorkspaceStore = create<WorkspaceState & WorkspaceAction>()(
           edges: state.edges,
         }
 
-        // Only persist layout config if feature is enabled
-        // This prevents breaking existing installations when flag is off
-        if (config.features.WORKSPACE_AUTO_LAYOUT) {
-          persisted.layoutConfig = state.layoutConfig
-          persisted.isAutoLayoutEnabled = state.isAutoLayoutEnabled
-          // Don't persist layoutHistory - it's ephemeral
-        }
+        persisted.layoutConfig = state.layoutConfig
+        persisted.isAutoLayoutEnabled = state.isAutoLayoutEnabled
+        // Don't persist layoutHistory - it's ephemeral
 
         return persisted
       },
