circular dep, test fixes

cryostatio · Dec 16, 2022 · 18859f6 · 18859f6
1 parent cf5e30a
commit 18859f6
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 9 deletions.
diff --git a/src/app/AppLayout/AppLayout.tsx b/src/app/AppLayout/AppLayout.tsx
@@ -75,7 +75,8 @@ import cryostatLogo from '@app/assets/cryostat_logo_hori_rgb_reverse.svg';
 import { SessionState } from '@app/Shared/Services/Login.service';
 import { NotificationCategory } from '@app/Shared/Services/NotificationChannel.service';
 import { useSubscriptions } from '@app/utils/useSubscriptions';
-import { FeatureFlag, FeatureLevel } from '@app/Shared/FeatureFlag/FeatureFlag';
+import { FeatureLevel } from '@app/Shared/Services/Settings.service';
+import { FeatureFlag } from '@app/Shared/FeatureFlag/FeatureFlag';
 
 interface IAppLayout {
   children: React.ReactNode;

diff --git a/src/app/Settings/FeatureLevels.tsx b/src/app/Settings/FeatureLevels.tsx
@@ -40,7 +40,7 @@ import * as React from 'react';
 import { ServiceContext } from '@app/Shared/Services/Services';
 import { useSubscriptions } from '@app/utils/useSubscriptions';
 import { UserSetting } from './Settings';
-import { FeatureLevel } from '@app/Shared/FeatureFlag/FeatureFlag';
+import { FeatureLevel } from '@app/Shared/Services/Settings.service';
 import { Select, SelectOption } from '@patternfly/react-core';
 
 const Component = () => {

diff --git a/src/app/Shared/FeatureFlag/FeatureFlag.tsx b/src/app/Shared/FeatureFlag/FeatureFlag.tsx
@@ -37,14 +37,9 @@
  */
 import * as React from 'react';
 import { ServiceContext } from '@app/Shared/Services/Services';
+import { FeatureLevel } from '@app/Shared/Services/Settings.service';
 import { useSubscriptions } from '@app/utils/useSubscriptions';
 
-export enum FeatureLevel {
-  DEVELOPMENT = 0,
-  BETA = 1,
-  PRODUCTION = 2,
-}
-
 export interface FeatureFlagProps {
   level: FeatureLevel;
   children?: React.ReactNode | undefined;

diff --git a/src/app/Shared/Services/Settings.service.tsx b/src/app/Shared/Services/Settings.service.tsx
@@ -39,7 +39,6 @@
 import { DeleteWarningType } from '@app/Modal/DeleteWarningUtils';
 import { getFromLocalStorage, saveToLocalStorage } from '@app/utils/LocalStorage';
 import { BehaviorSubject, Observable } from 'rxjs';
-import { FeatureLevel } from '@app/Shared/FeatureFlag/FeatureFlag';
 import {
   AutomatedAnalysisRecordingConfig,
   automatedAnalysisRecordingName,
@@ -48,6 +47,12 @@ import {
 } from './Api.service';
 import { NotificationCategory } from './NotificationChannel.service';
 
+export enum FeatureLevel {
+  DEVELOPMENT = 0,
+  BETA = 1,
+  PRODUCTION = 2,
+}
+
 export function enumKeys<O extends Object, K extends keyof O = keyof O>(obj: O): K[] {
   return Object.keys(obj).filter((k) => Number.isNaN(+k)) as K[];
 }

diff --git a/src/test/Settings/Settings.test.tsx b/src/test/Settings/Settings.test.tsx
@@ -90,6 +90,14 @@ jest.mock('@app/Settings/AutoRefresh', () => ({
   },
 }));
 
+jest.mock('@app/Settings/FeatureLevels', () => ({
+  FeatureLevels: {
+    title: 'Feature Levels Title',
+    description: 'Feature Levels Description',
+    content: () => <Text>Feature Levels Component</Text>,
+  },
+}));
+
 describe('<Settings/>', () => {
   afterEach(cleanup);
 

diff --git a/src/test/Settings/__snapshots__/Settings.test.tsx.snap b/src/test/Settings/__snapshots__/Settings.test.tsx.snap
@@ -310,6 +310,53 @@ exports[`<Settings/> renders correctly 1`] = `
         </div>
       </article>
     </div>
+    <div
+      className="pf-l-stack__item"
+    >
+      <article
+        className="pf-c-card"
+        data-ouia-component-id="OUIA-Generated-Card-7"
+        data-ouia-component-type="PF4/Card"
+        data-ouia-safe={true}
+        id=""
+      >
+        <div
+          className="pf-c-card__title"
+        >
+          <p
+            className=""
+            data-ouia-component-id="OUIA-Generated-Text-19"
+            data-ouia-component-type="PF4/Text"
+            data-ouia-safe={true}
+            data-pf-content={true}
+          >
+            Feature Levels Title
+          </p>
+          <small
+            className=""
+            data-ouia-component-id="OUIA-Generated-Text-20"
+            data-ouia-component-type="PF4/Text"
+            data-ouia-safe={true}
+            data-pf-content={true}
+          >
+            Feature Levels Description
+          </small>
+        </div>
+        <div
+          className="pf-c-card__body"
+        >
+          <p
+            className=""
+            data-ouia-component-id="OUIA-Generated-Text-21"
+            data-ouia-component-type="PF4/Text"
+            data-ouia-safe={true}
+            data-pf-content={true}
+          >
+            Feature Levels Component
+          </p>
+        </div>
+      </article>
+    </div>
   </div>
 </section>
 `;