diff --git a/package-lock.json b/package-lock.json index c4304fe96..e8ec2f785 100644 --- a/package-lock.json +++ b/package-lock.json @@ -41,7 +41,6 @@ "faker": "^5.1.0", "fast-array-diff": "^0.2.0", "find-test-names": "^1.17.1", - "flagsmith": "^3.15.1", "fuse.js": "^6.6.2", "fuzzaldrin": "^2.1.0", "graphql": "^15.4.0", @@ -19244,11 +19243,6 @@ "resolved": "https://registry.npmjs.org/first-match/-/first-match-0.0.1.tgz", "integrity": "sha1-pg7GQnAPD0NyNOu37D84JHblQv0=" }, - "node_modules/flagsmith": { - "version": "3.15.1", - "resolved": "https://registry.npmjs.org/flagsmith/-/flagsmith-3.15.1.tgz", - "integrity": "sha512-4OHVCCYuW1doYceEJbrQWJgefwRaC9oi2VeswVzCqCe0WCoT0pOIxgi14l3Am0a0fcN9wUd93Dv2OQaF6GqKjA==" - }, "node_modules/flat": { "version": "5.0.2", "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", @@ -53345,11 +53339,6 @@ "resolved": "https://registry.npmjs.org/first-match/-/first-match-0.0.1.tgz", "integrity": "sha1-pg7GQnAPD0NyNOu37D84JHblQv0=" }, - "flagsmith": { - "version": "3.15.1", - "resolved": "https://registry.npmjs.org/flagsmith/-/flagsmith-3.15.1.tgz", - "integrity": "sha512-4OHVCCYuW1doYceEJbrQWJgefwRaC9oi2VeswVzCqCe0WCoT0pOIxgi14l3Am0a0fcN9wUd93Dv2OQaF6GqKjA==" - }, "flat": { "version": "5.0.2", "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", diff --git a/package.json b/package.json index 3648d5b0c..aaac2560d 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,6 @@ "faker": "^5.1.0", "fast-array-diff": "^0.2.0", "find-test-names": "^1.17.1", - "flagsmith": "^3.15.1", "fuse.js": "^6.6.2", "fuzzaldrin": "^2.1.0", "graphql": "^15.4.0", diff --git a/src/hooks/useFlags/flagsService/flagsServiceProvider.tsx b/src/hooks/useFlags/flagsService/flagsServiceProvider.tsx index adc1ff567..f99316d12 100644 --- a/src/hooks/useFlags/flagsService/flagsServiceProvider.tsx +++ b/src/hooks/useFlags/flagsService/flagsServiceProvider.tsx @@ -1,27 +1,8 @@ -import flagsmith from "flagsmith"; -import { FlagsmithProvider as Provider } from "flagsmith/react"; import React from "react"; interface FlagsServiceProviderProps { children: React.ReactElement; } -export const FlagsServiceProvider = ({ - children, -}: FlagsServiceProviderProps) => { - if (!FLAGS_SERVICE_ENABLED) { - return children; - } - - return ( - - {children} - - ); -}; +export const FlagsServiceProvider = ({ children }: FlagsServiceProviderProps) => + children; diff --git a/src/hooks/useFlags/flagsService/useAllServiceFlags.test.tsx b/src/hooks/useFlags/flagsService/useAllServiceFlags.test.tsx index d6843277d..e114d60f8 100644 --- a/src/hooks/useFlags/flagsService/useAllServiceFlags.test.tsx +++ b/src/hooks/useFlags/flagsService/useAllServiceFlags.test.tsx @@ -2,22 +2,6 @@ import { renderHook } from "@testing-library/react-hooks"; import { useAllServiceFlags } from "./useAllServiceFlags"; -jest.mock("flagsmith/react", () => ({ - __esModule: true, - useFlagsmith: () => ({ - getAllFlags: () => ({ - flag_one: { - enabled: true, - value: "1", - }, - flag_two: { - enabled: true, - value: "2", - }, - }), - }), -})); - afterAll(() => { jest.clearAllMocks(); }); @@ -28,17 +12,6 @@ describe("useAllServiceFlags hook", () => { const { result } = renderHook(() => useAllServiceFlags()); // Assert - expect(result.current).toEqual([ - { - name: "flagOne", - enabled: true, - value: "1", - }, - { - name: "flagTwo", - enabled: true, - value: "2", - }, - ]); + expect(result.current).toEqual([]); }); }); diff --git a/src/hooks/useFlags/flagsService/useAllServiceFlags.ts b/src/hooks/useFlags/flagsService/useAllServiceFlags.ts index 6fbd31796..ae59c7a1c 100644 --- a/src/hooks/useFlags/flagsService/useAllServiceFlags.ts +++ b/src/hooks/useFlags/flagsService/useAllServiceFlags.ts @@ -1,15 +1,3 @@ -import { useFlagsmith } from "flagsmith/react"; -import camelCase from "lodash/camelCase"; - import { FlagWithName } from "../types"; -export const useAllServiceFlags = (): FlagWithName[] => { - const flagsmith = useFlagsmith(); - const flags = flagsmith.getAllFlags(); - - return Object.entries(flags).map(([name, { value, enabled }]) => ({ - name: camelCase(name), - value: value.toString() ?? "", - enabled, - })); -}; +export const useAllServiceFlags = (): FlagWithName[] => []; diff --git a/src/hooks/useFlags/flagsService/useServiceFlags.test.tsx b/src/hooks/useFlags/flagsService/useServiceFlags.test.tsx index 4033a7131..edf542188 100644 --- a/src/hooks/useFlags/flagsService/useServiceFlags.test.tsx +++ b/src/hooks/useFlags/flagsService/useServiceFlags.test.tsx @@ -2,24 +2,6 @@ import { renderHook } from "@testing-library/react-hooks"; import { useServiceFlags } from "./useServiceFlags"; -jest.mock("flagsmith/react", () => ({ - __esModule: true, - useFlags: () => ({ - flag_one: { - enabled: true, - value: "1", - }, - flag_two: { - enabled: true, - value: "2", - }, - }), -})); - -afterAll(() => { - jest.clearAllMocks(); -}); - describe("useServiceFlags", () => { test("should return flags with values", () => { // Arrange && Ac @@ -30,12 +12,12 @@ describe("useServiceFlags", () => { // Assert expect(result.current).toEqual({ flagOne: { - enabled: true, - value: "1", + enabled: false, + value: "", }, flag_two: { - enabled: true, - value: "2", + enabled: false, + value: "", }, }); }); diff --git a/src/hooks/useFlags/flagsService/useServiceFlags.ts b/src/hooks/useFlags/flagsService/useServiceFlags.ts index 149c149f9..4e35c9fa2 100644 --- a/src/hooks/useFlags/flagsService/useServiceFlags.ts +++ b/src/hooks/useFlags/flagsService/useServiceFlags.ts @@ -1,27 +1,13 @@ -import { useFlags } from "flagsmith/react"; -import snakeCase from "lodash/snakeCase"; - import { FlagsResults } from "../types"; export const useServiceFlags = ( flags: readonly [...T], - traits?: string[], -): FlagsResults => { - const flagsmithFlags = useFlags(transformFlagsToSnakeCase(flags), traits); - - return flags.reduce((acc, flag) => { - const flagName = snakeCase(flag); - if (flagsmithFlags[flagName]) { - acc[flag] = { - enabled: flagsmithFlags[flagName].enabled, - value: flagsmithFlags[flagName].value.toString() ?? "", - }; - } +): FlagsResults => + flags.reduce((acc, flag) => { + acc[flag] = { + enabled: false, + value: "", + }; return acc; }, {} as FlagsResults); -}; - -function transformFlagsToSnakeCase(flags: readonly string[]): string[] { - return flags.map(flag => snakeCase(flag)); -}