feat: optimize code

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
opensearch-project · Jul 17, 2024 · 8506b42 · 8506b42
1 parent c9441dd
commit 8506b42
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/plugins/management/public/components/feature_cards/feature_cards.tsx b/src/plugins/management/public/components/feature_cards/feature_cards.tsx
@@ -43,6 +43,8 @@ export const FeatureCards = ({
   const itemsPerRow = 4;
   const groupedCardForDisplay = useMemo(() => {
     const grouped: Array<{ category?: AppCategory; navLinks: ChromeNavLink[][] }> = [];
+    // The navLinks has already been sorted based on link / category's order,
+    // so it is safe to group the links here.
     navLinks.forEach((link) => {
       let lastGroup = grouped.length ? grouped[grouped.length - 1] : undefined;
       if (!lastGroup || lastGroup.category !== link.category) {

diff --git a/src/plugins/management/public/plugin.ts b/src/plugins/management/public/plugin.ts
@@ -125,9 +125,9 @@ export class ManagementPlugin implements Plugin<ManagementSetup, ManagementStart
           .toPromise();
         const navLinks = navGroupMap[DEFAULT_NAV_GROUPS.settingsAndSetup.id]?.navLinks;
         const fulfilledNavLink = fulfillRegistrationLinksToChromeNavLinks(
-          (navLinks || []).filter((navLink) => navLink.id !== settingsLandingPageId),
+          navLinks || [],
           coreStart.chrome.navLinks.getAll()
-        );
+        ).filter((navLink) => navLink.id !== settingsLandingPageId && !navLink.hidden);
 
         return renderApp({
           mountElement: params.element,
@@ -157,9 +157,9 @@ export class ManagementPlugin implements Plugin<ManagementSetup, ManagementStart
           .toPromise();
         const navLinks = navGroupMap[DEFAULT_NAV_GROUPS.dataAdministration.id]?.navLinks;
         const fulfilledNavLink = fulfillRegistrationLinksToChromeNavLinks(
-          (navLinks || []).filter((navLink) => navLink.id !== dataAdministrationLandingPageId),
+          navLinks || [],
           coreStart.chrome.navLinks.getAll()
-        );
+        ).filter((navLink) => navLink.id !== dataAdministrationLandingPageId && !navLink.hidden);
 
         return renderApp({
           mountElement: params.element,