diff --git a/js/apps/admin-ui/cypress/e2e/group_test.spec.ts b/js/apps/admin-ui/cypress/e2e/group_test.spec.ts
index 245c0a598815..f0539b21c111 100644
--- a/js/apps/admin-ui/cypress/e2e/group_test.spec.ts
+++ b/js/apps/admin-ui/cypress/e2e/group_test.spec.ts
@@ -144,42 +144,6 @@ describe("Group test", () => {
});
});
- describe("Search group under current group", () => {
- before(async () => {
- const createdGroups = await adminClient.createSubGroups(predefinedGroups);
- await Promise.all([
- range(5).map((index) => {
- adminClient.addUserToGroup(
- users[index].id!,
- createdGroups[index % 3].id,
- );
- }),
- adminClient.createUser({ username: "new", enabled: true }),
- ]);
- });
-
- it("Search child group in group", () => {
- groupPage
- .goToGroupChildGroupsTab(predefinedGroups[0])
- .searchGroup(predefinedGroups[1])
- .assertGroupItemExist(predefinedGroups[1], true);
- });
-
- it("Search non existing child group in group", () => {
- groupPage
- .goToGroupChildGroupsTab(predefinedGroups[0])
- .searchGroup("non-existent-sub-group")
- .assertNoSearchResultsMessageExist(true);
- });
-
- it("Empty search in group", () => {
- groupPage
- .goToGroupChildGroupsTab(predefinedGroups[0])
- .searchGroup(" ")
- .assertNoSearchResultsMessageExist(true);
- });
- });
-
describe("Group Actions", () => {
const groupNameDeleteHeaderAction = "group_test_delete_header_action";
diff --git a/js/apps/admin-ui/src/groups/GroupTable.tsx b/js/apps/admin-ui/src/groups/GroupTable.tsx
index 5beb69324d51..ee0ba444c885 100644
--- a/js/apps/admin-ui/src/groups/GroupTable.tsx
+++ b/js/apps/admin-ui/src/groups/GroupTable.tsx
@@ -122,21 +122,23 @@ export const GroupTable = ({ refresh: viewRefresh }: GroupTableProps) => {
isSearching={!!search}
toolbarItem={
<>
-
- {
- setSearch(value);
- }}
- onSearch={refresh}
- onClear={() => {
- setSearch("");
- refresh();
- }}
- />
-
+ {!id && (
+
+ {
+ setSearch(value);
+ }}
+ onSearch={refresh}
+ onClear={() => {
+ setSearch("");
+ refresh();
+ }}
+ />
+
+ )}