🐛 Hide hidden rulesets from seeded hub list

Signed-off-by: ibolton336 <ibolton@redhat.com>
konveyor · Jul 28, 2023 · c130a05 · c130a05
1 parent 55cff2f
commit c130a05
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 50 deletions.
diff --git a/client/src/app/pages/applications/analysis-wizard/set-targets.tsx b/client/src/app/pages/applications/analysis-wizard/set-targets.tsx
@@ -161,9 +161,9 @@ export const SetTargets: React.FC = () => {
               const matchingRuleset = rulesets.find(
                 (target) => target.id === id
               );
-              return (
-                <GalleryItem key={index}>
-                  {matchingRuleset && (
+              if (matchingRuleset) {
+                return (
+                  <GalleryItem key={index}>
                     <TargetCard
                       readOnly
                       item={matchingRuleset}
@@ -190,9 +190,11 @@ export const SetTargets: React.FC = () => {
                       }}
                       formTargets={formTargets}
                     />
-                  )}
-                </GalleryItem>
-              );
+                  </GalleryItem>
+                );
+              } else {
+                return null;
+              }
             })
           : null}
       </Gallery>

diff --git a/client/src/app/pages/migration-targets/migration-targets.tsx b/client/src/app/pages/migration-targets/migration-targets.tsx
@@ -44,11 +44,7 @@ export const MigrationTargets: React.FC = () => {
   const { t } = useTranslation();
   const { pushNotification } = React.useContext(NotificationsContext);
 
-  const {
-    rulesets,
-    isFetching: isFetchingrulesets,
-    refetch: refetchrulesets,
-  } = useFetchRulesets();
+  const { rulesets, refetch: refetchrulesets } = useFetchRulesets();
 
   const rulesetOrderSetting = useSetting("ui.ruleset.order");
   const rulesetOrderSettingMutation = useSettingMutation("ui.ruleset.order");
@@ -221,28 +217,34 @@ export const MigrationTargets: React.FC = () => {
         >
           <DndGrid>
             {rulesetOrderSetting.isSuccess &&
-              rulesetOrderSetting.data.map((id) => (
-                <SortableItem
-                  key={id}
-                  id={id}
-                  onEdit={() => {
-                    const matchingRuleset = rulesets.find(
-                      (Ruleset) => Ruleset.id === id
-                    );
-                    if (matchingRuleset) {
-                      setCreateUpdateModalState(matchingRuleset);
-                    }
-                  }}
-                  onDelete={() => {
-                    const matchingRuleset = rulesets.find(
-                      (Ruleset) => Ruleset.id === id
-                    );
-                    if (matchingRuleset?.id) {
-                      deleteRuleset(matchingRuleset.id);
-                    }
-                  }}
-                />
-              ))}
+              rulesetOrderSetting.data.map((id) => {
+                const matchingRuleset = rulesets.find(
+                  (Ruleset) => Ruleset.id === id
+                );
+                if (matchingRuleset) {
+                  return (
+                    <SortableItem
+                      key={id}
+                      id={id}
+                      onEdit={() => {
+                        if (matchingRuleset) {
+                          setCreateUpdateModalState(matchingRuleset);
+                        }
+                      }}
+                      onDelete={() => {
+                        const matchingRuleset = rulesets.find(
+                          (Ruleset) => Ruleset.id === id
+                        );
+                        if (matchingRuleset?.id) {
+                          deleteRuleset(matchingRuleset.id);
+                        }
+                      }}
+                    />
+                  );
+                } else {
+                  return null;
+                }
+              })}
             <div ref={targetsEndRef} />
           </DndGrid>
           <DragOverlay>{activeId ? <Item id={activeId} /> : null}</DragOverlay>

diff --git a/client/src/app/queries/rulesets.ts b/client/src/app/queries/rulesets.ts
@@ -19,25 +19,25 @@ export const useFetchRulesets = () => {
     {
       onError: (err) => console.log(err),
       select: (data) => {
-        return data.map((ruleset) => {
-          const mappedRules = ruleset.rules.map((rule) => {
-            if (ruleset?.name === "rule-example.yaml") {
-              debugger;
-            }
-            const labels = getLabels(rule.labels || []);
+        return data
+          .filter((ruleset) => !ruleset.name.startsWith("."))
+          .map((ruleset) => {
+            const mappedRules = ruleset.rules.map((rule) => {
+              const labels = getLabels(rule.labels || []);
 
-            const transformedMetadata: Metadata = {
-              source: labels.sourceLabel,
-              target: labels.targetLabel,
-              otherLabels: labels.otherLabels,
-            };
-            return {
-              ...rule,
-              metadata: transformedMetadata,
-            };
+              const transformedMetadata: Metadata = {
+                source: labels.sourceLabel,
+                target: labels.targetLabel,
+                otherLabels: labels.otherLabels,
+              };
+
+              return {
+                ...rule,
+                metadata: transformedMetadata,
+              };
+            });
+            return { ...ruleset, rules: mappedRules };
           });
-          return { ...ruleset, rules: mappedRules };
-        });
       },
     }
   );