cleanup

Signed-off-by: Atif Ali <atali@redhat.com>

Author: aali309

plugin-metadata.ts

@@ -16,7 +16,7 @@ const metadata: ConsolePluginBuildMetadata = {
     ApplicationList: "./gitops/components/application/ApplicationListTab.tsx",
     ApplicationDetails: "./gitops/components/application/ApplicationNavPage.tsx",
     ApplicationSetList: "./gitops/components/application/ApplicationSetListTab.tsx",
-    ApplicationSetDetailsPage: "./gitops/components/application/ApplicationSetDetailsPage.tsx",
+    ApplicationSetDetailsPage: "./gitops/components/appset/ApplicationSetDetailsPage.tsx",
     yamlApplicationTemplates: "./gitops/components/application/templates/index.ts"
   }
 };

src/gitops/components/application/ApplicationSetDetailsPage.scss

@@ -1,18 +1,4 @@
 // Application Details Title Styles
-.argocd-application-icon {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  width: 32px;
-  height: 32px;
-  border-radius: 4px;
-  background-color: #E9654B;
-  color: white;
-  font-size: 16px;
-  font-weight: bold;
-  margin-right: var(--pf-v6-global--spacer--md);
-}
-
 .co-resource-item__resource-name {
   font-size: var(--pf-v6-global--font-size--2xl);
   font-weight: var(--pf-v6-global--font-weight--bold);

src/gitops/components/application/application-details-title.scss

@@ -7,11 +7,11 @@ import { useApplicationSetActionsProvider } from '../../hooks/useApplicationSetA
 import { ApplicationSetKind, ApplicationSetModel } from '../../models/ApplicationSetModel';
 import { useGitOpsTranslation } from '../../utils/hooks/useGitOpsTranslation';
 import DetailsPageHeader from '../shared/DetailsPageHeader/DetailsPageHeader';
+import EventsTab from '../shared/EventsTab/EventsTab';
 import ResourceYAMLTab from '../shared/ResourceYAMLTab/ResourceYAMLTab';
 
 import AppSetDetailsTab from './AppSetDetailsTab';
 import AppsTab from './AppsTab';
-import ApplicationSetEventsTab from './EventsTab';
 import GeneratorsTab from './GeneratorsTab';
 
 type AppSetPageProps = {
@@ -60,7 +60,7 @@ const AppSetNavPage: React.FC<AppSetPageProps> = ({ name, namespace, kind }) =>
       {
         href: 'events',
         name: t('Events'),
-        component: ApplicationSetEventsTab,
+        component: EventsTab,
       },
     ],
     [t],

src/gitops/components/appset/AppSetNavPage.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { useParams } from 'react-router-dom-v5-compat';
 
-import AppSetNavPage from '../appset/AppSetNavPage';
+import AppSetNavPage from './AppSetNavPage';
 
 const ApplicationSetDetailsPage: React.FC = () => {
   const { name, ns } = useParams<{ name: string; ns: string }>();

src/gitops/components/application/ApplicationSetDetailsPage.tsx renamed to src/gitops/components/appset/ApplicationSetDetailsPage.tsx

@@ -1,8 +1,6 @@
 import * as React from 'react';
 import { RouteComponentProps } from 'react-router';
 
-import { PageSection } from '@patternfly/react-core';
-
 import { ApplicationSetKind } from '../../models/ApplicationSetModel';
 import ApplicationList from '../shared/ApplicationList';
 
@@ -17,14 +15,12 @@ const AppsTab: React.FC<AppsTabProps> = ({ obj }) => {
   if (!obj || !namespace) return null;
 
   return (
-    <PageSection>
-      <ApplicationList
-        namespace={namespace}
-        hideNameLabelFilters={false}
-        showTitle={false}
-        appset={obj}
-      />
-    </PageSection>
+    <ApplicationList
+      namespace={namespace}
+      hideNameLabelFilters={false}
+      showTitle={false}
+      appset={obj}
+    />
   );
 };
 

src/gitops/components/appset/AppsTab.tsx

@@ -1,7 +1,6 @@
 export { default as AppSetDetailsTab } from './AppSetDetailsTab';
 export { default as AppSetNavPage } from './AppSetNavPage';
 export { default as AppsTab } from './AppsTab';
-export { default as EventsTab } from './EventsTab';
 export { default as Generators } from './Generators';
 export { default as GeneratorsTab } from './GeneratorsTab';