From 9f4c06badb5013c68b039fd3f20ef023d5ba3b64 Mon Sep 17 00:00:00 2001 From: zcason Date: Tue, 27 Dec 2022 17:48:34 -0600 Subject: [PATCH 1/7] feature flag filter replacement Signed-off-by: zcason --- .../FeatureFlags/UserSettingsFeatureFlags.tsx | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/plugins/user-settings/src/components/FeatureFlags/UserSettingsFeatureFlags.tsx b/plugins/user-settings/src/components/FeatureFlags/UserSettingsFeatureFlags.tsx index 21aafc089e..29b2e141b5 100644 --- a/plugins/user-settings/src/components/FeatureFlags/UserSettingsFeatureFlags.tsx +++ b/plugins/user-settings/src/components/FeatureFlags/UserSettingsFeatureFlags.tsx @@ -73,25 +73,17 @@ export const UserSettingsFeatureFlags = () => { inputRef?.current?.focus(); }; - let filteredFeatureFlags = Array.from(featureFlags); - - const filterInputParts = filterInput - .split(/\s/) - .map(part => part.trim().toLocaleLowerCase('en-US')); - - filterInputParts.forEach( - part => - (filteredFeatureFlags = filteredFeatureFlags.filter(featureFlag => - featureFlag.name.toLocaleLowerCase('en-US').includes(part), - )), - ); + const filteredFeatureFlags = featureFlags.filter(featureFlag => { + const featureFlagName = featureFlag.name.toLocaleLowerCase('en-US'); + return featureFlagName.includes(filterInput.toLocaleLowerCase('en-US')); + }); const Header = () => ( Feature Flags - {featureFlags.length >= 10 && ( + {10 && ( Date: Tue, 27 Dec 2022 18:08:35 -0600 Subject: [PATCH 2/7] restored filter render condition Signed-off-by: zcason --- .../src/components/FeatureFlags/UserSettingsFeatureFlags.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/user-settings/src/components/FeatureFlags/UserSettingsFeatureFlags.tsx b/plugins/user-settings/src/components/FeatureFlags/UserSettingsFeatureFlags.tsx index 29b2e141b5..a3b5f593ae 100644 --- a/plugins/user-settings/src/components/FeatureFlags/UserSettingsFeatureFlags.tsx +++ b/plugins/user-settings/src/components/FeatureFlags/UserSettingsFeatureFlags.tsx @@ -83,7 +83,7 @@ export const UserSettingsFeatureFlags = () => { Feature Flags - {10 && ( + {featureFlags.length >= 10 && ( Date: Wed, 28 Dec 2022 12:48:55 -0600 Subject: [PATCH 3/7] added changeset Signed-off-by: zcason --- .changeset/loud-beds-occur.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/loud-beds-occur.md diff --git a/.changeset/loud-beds-occur.md b/.changeset/loud-beds-occur.md new file mode 100644 index 0000000000..585a4799b6 --- /dev/null +++ b/.changeset/loud-beds-occur.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-user-settings': major +--- + +Rafector for the feature flag filter functionality From 8e073173daadf0c16dd7a03608a93580e8e065ff Mon Sep 17 00:00:00 2001 From: zcason Date: Wed, 28 Dec 2022 12:56:34 -0600 Subject: [PATCH 4/7] new changeset Signed-off-by: zcason --- .changeset/sixty-suits-battle.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/sixty-suits-battle.md diff --git a/.changeset/sixty-suits-battle.md b/.changeset/sixty-suits-battle.md new file mode 100644 index 0000000000..f8eaf2ed17 --- /dev/null +++ b/.changeset/sixty-suits-battle.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-user-settings': major +--- + +Feature flag filter functionality refactor From 3285590de4532fcb6fc73dd46e9636533542cd8b Mon Sep 17 00:00:00 2001 From: zcason Date: Wed, 28 Dec 2022 13:01:07 -0600 Subject: [PATCH 5/7] Revert "new changeset" This reverts commit 54dc33e6d6d98196c509dbe5353efec7bea20a52. Signed-off-by: zcason --- .changeset/sixty-suits-battle.md | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 .changeset/sixty-suits-battle.md diff --git a/.changeset/sixty-suits-battle.md b/.changeset/sixty-suits-battle.md deleted file mode 100644 index f8eaf2ed17..0000000000 --- a/.changeset/sixty-suits-battle.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/plugin-user-settings': major ---- - -Feature flag filter functionality refactor From 4c0c2d3a1f641bcb7d75a079ce72b88e49f6524b Mon Sep 17 00:00:00 2001 From: zcason Date: Wed, 28 Dec 2022 13:03:23 -0600 Subject: [PATCH 6/7] updated change set summary Signed-off-by: zcason --- .changeset/loud-beds-occur.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/loud-beds-occur.md b/.changeset/loud-beds-occur.md index 585a4799b6..cad6ccf139 100644 --- a/.changeset/loud-beds-occur.md +++ b/.changeset/loud-beds-occur.md @@ -2,4 +2,4 @@ '@backstage/plugin-user-settings': major --- -Rafector for the feature flag filter functionality +Refactor for the feature flag filter functionality From 14f3ffb6631283724a32cf42a565b0dcda32ca0c Mon Sep 17 00:00:00 2001 From: zcason Date: Thu, 29 Dec 2022 10:33:23 -0600 Subject: [PATCH 7/7] updated changeset bump Signed-off-by: zcason --- .changeset/loud-beds-occur.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/loud-beds-occur.md b/.changeset/loud-beds-occur.md index cad6ccf139..546805e592 100644 --- a/.changeset/loud-beds-occur.md +++ b/.changeset/loud-beds-occur.md @@ -1,5 +1,5 @@ --- -'@backstage/plugin-user-settings': major +'@backstage/plugin-user-settings': patch --- Refactor for the feature flag filter functionality