clean up

packages/app/src/App.tsx

@@ -33,19 +33,7 @@ import { AppRouter, FlatRoutes } from '@backstage/core-app-api';
 import { CatalogGraphPage } from '@backstage/plugin-catalog-graph';
 import { RequirePermission } from '@backstage/plugin-permission-react';
 import { catalogEntityCreatePermission } from '@backstage/plugin-catalog-common/alpha';
-//import LightIcon from '@material-ui/icons/WbSunny';
-/*import {
-  CNOEHomepage,
-  cnoeLightTheme,
-  cnoeDarkTheme,
-} from '@internal/plugin-cnoe-ui';*/
 import {configApiRef, useApi} from "@backstage/core-plugin-api";
-//import { ArgoWorkflowsPage } from '@internal/plugin-argo-workflows';
-//import { ApacheSparkPage } from '@internal/plugin-apache-spark';
-/*import {
-  UnifiedThemeProvider
-} from "@backstage/theme";*/
-//import { TerraformPluginPage } from '@internal/plugin-terraform';
 
 const app = createApp({
   apis,
@@ -84,33 +72,12 @@ const app = createApp({
     bind(orgPlugin.externalRoutes, {
       catalogIndex: catalogPlugin.routes.catalogIndex,
     });
-  },
-  /*themes: [
-    {
-      id: 'cnoe-light-theme',
-      title: 'Light Theme',
-      variant: 'light',
-      icon: <LightIcon />,
-      Provider: ({ children }) => (
-        <UnifiedThemeProvider theme={cnoeLightTheme} children={children} />
-      ),
-    },
-    {
-      id: 'cnoe-dark-theme',
-      title: 'Dark Theme',
-      variant: 'dark',
-      icon: <LightIcon />,
-      Provider: ({ children }) => (
-        <UnifiedThemeProvider theme={cnoeDarkTheme} children={children} />
-      ),
-    },
-  ],*/
+  }
 });
 
 const routes = (
   <FlatRoutes>
     <Route path="/" element={<Navigate to="home" />} />
-    {/*<Route path="/home" element={<CNOEHomepage />} />*/}
     <Route path="/catalog" element={<CatalogIndexPage />} />
     <Route
       path="/catalog/:namespace/:kind/:name"
@@ -146,9 +113,6 @@ const routes = (
     </Route>
     <Route path="/settings" element={<UserSettingsPage />} />
     <Route path="/catalog-graph" element={<CatalogGraphPage />} />
-    {/*<Route path="/argo-workflows" element={<ArgoWorkflowsPage />} />*/}
-    {/*<Route path="/apache-spark" element={<ApacheSparkPage />} />*/}
-    {/*<Route path="/terraform" element={<TerraformPluginPage />} />*/}
   </FlatRoutes>
 );
 
@@ -161,6 +125,3 @@ export default app.createRoot(
     </AppRouter>
   </>,
 );
-
-
-

packages/app/src/components/Root/Root.tsx

@@ -5,7 +5,6 @@ import ExtensionIcon from '@material-ui/icons/Extension';
 import MapIcon from '@material-ui/icons/MyLocation';
 import LibraryBooks from '@material-ui/icons/LibraryBooks';
 import CreateComponentIcon from '@material-ui/icons/AddCircleOutline';
-//import {LogoFull, LogoIcon} from '@internal/plugin-cnoe-ui';
 import {
   Settings as SidebarSettings,
   UserSettingsSignInAvatar,
@@ -20,7 +19,6 @@ import {
   SidebarPage,
   SidebarScrollWrapper,
   SidebarSpace,
-  //useSidebarOpenState,
   Link,
 } from '@backstage/core-components';
 import MenuIcon from '@material-ui/icons/Menu';
@@ -43,12 +41,10 @@ const useSidebarLogoStyles = makeStyles({
 
 const SidebarLogo = () => {
   const classes = useSidebarLogoStyles();
-//  const { isOpen } = useSidebarOpenState();
 
   return (
     <div className={classes.root}>
       <Link to="/" underline="none" className={classes.link} aria-label="Home">
-        {/*isOpen ? <LogoFull /> : <LogoIcon />*/}
       </Link>
     </div>
   );

packages/app/src/components/catalog/EntityPage.tsx

@@ -58,13 +58,6 @@ import {
   isArgocdAvailable
 } from '@roadiehq/backstage-plugin-argo-cd';
 
-/*import {
-  EntityArgoWorkflowsOverviewCard,
-  isArgoWorkflowsAvailable,
-} from '@internal/plugin-argo-workflows';*/
-//import {ApacheSparkPage, isApacheSparkAvailable} from "@internal/plugin-apache-spark";
-//import { isTerraformAvailable, TerraformPluginPage } from '@internal/plugin-terraform';
-
 const techdocsContent = (
   <EntityTechdocsContent>
     <TechDocsAddons>
@@ -75,10 +68,6 @@ const techdocsContent = (
 
 const cicdContent = (
   <EntitySwitch>
-    {/*<EntitySwitch.Case if={e => isArgoWorkflowsAvailable(e)}>
-      <EntityArgoWorkflowsOverviewCard title="Workflows"/>
-    </EntitySwitch.Case>*/}
-
     <EntitySwitch.Case>
       <EmptyState
         title="No CI/CD available for this entity"
@@ -139,13 +128,6 @@ const overviewContent = (
         </Grid>
       </EntitySwitch.Case>
     </EntitySwitch>
-    {/*<EntitySwitch>
-      <EntitySwitch.Case if={e => isTerraformAvailable(e)}>
-        <Grid item md={6}>
-          <TerraformPluginPage />
-        </Grid>
-      </EntitySwitch.Case>
-    </EntitySwitch>*/}
     <Grid item md={6} xs={12}>
       <EntityCatalogGraphCard variant="gridItem" height={400} />
     </Grid>
@@ -169,10 +151,6 @@ const serviceEntityPage = (
       <EntityKubernetesContent refreshIntervalMs={30000} />
     </EntityLayout.Route>
 
-    {/*<EntityLayout.Route path="/apache-spark" title="Spark" if={isApacheSparkAvailable}>
-      <ApacheSparkPage />
-    </EntityLayout.Route>*/}
-
     <EntityLayout.Route path="/api" title="API">
       <Grid container spacing={3} alignItems="stretch">
         <Grid item md={6}>

packages/backend/src/index.ts

@@ -1,24 +1,18 @@
 
-import { legacyPlugin } from '@backstage/backend-common';
+//import { legacyPlugin } from '@backstage/backend-common';
 
-//import { createBackend } from '@backstage/backend-defaults/dist';
 import { createBackend } from '@backstage/backend-defaults';
-//import { authModuleKeycloakOIDCProvider } from './plugins/auth';
 import { cnoeScaffolderActions } from './plugins/scaffolder';
 
 
 const backend = createBackend();
 
 // core plugins
-//backend.add(import('@backstage/plugin-app-backend/alpha'));
 backend.add(import('@backstage/plugin-app-backend'));
-//backend.add(import('@backstage/plugin-catalog-backend/dist/alpha'));
 backend.add(import('@backstage/plugin-catalog-backend'));
-//backend.add(import('@backstage/plugin-proxy-backend/dist/alpha'));
 backend.add(import('@backstage/plugin-proxy-backend'));
 backend.add(import('@backstage/plugin-techdocs-backend/alpha'));
 // auth plugins
-//backend.add(import('@backstage/plugin-auth-backend/dist'));
 backend.add(import('@backstage/plugin-auth-backend'));
 backend.add(import('@backstage/plugin-auth-backend-module-guest-provider'));
 // scaffolder plugins
@@ -29,22 +23,20 @@ backend.add(
 backend.add(import('@backstage/plugin-scaffolder-backend-module-github'));
 // search plugins
 backend.add(import('@backstage/plugin-search-backend/alpha'));
-//backend.add(import('@backstage/plugin-search-backend-module-catalog/alpha')); 
-//backend.add(import('@backstage/plugin-search-backend-module-catalog/dist'));  //TODO: correct?
+
 backend.add(import('@backstage/plugin-search-backend-module-catalog')); 
 backend.add(import('@backstage/plugin-search-backend-module-techdocs/alpha'));
 // other @backstage plugins
-//backend.add(import('@backstage/plugin-kubernetes-backend/dist/alpha'));
+
 backend.add(import('@backstage/plugin-kubernetes-backend'));
 // non-core plugins
 // roadie plugins
 //backend.add(import('@roadiehq/scaffolder-backend-module-utils/new-backend'));   //TODO: incompatible? why??
-backend.add(legacyPlugin('argocd', import('./plugins/argocd')));
+//backend.add(legacyPlugin('argocd', import('./plugins/argocd')));                //TODO: createRouter has no call signatures
 backend.add(
   import('@roadiehq/scaffolder-backend-module-http-request/new-backend'),
 );
 // cnoe plugins
-//backend.add(authModuleKeycloakOIDCProvider);
 backend.add(cnoeScaffolderActions);
 
 backend.start();

packages/backend/src/plugins/argocd.ts

@@ -5,16 +5,16 @@ import { Logger } from 'winston';
 
 import { ArgoService } from '@roadiehq/backstage-plugin-argo-cd-backend';
 
-//import { createRouter } from '@roadiehq/backstage-plugin-argo-cd-backend';  //TODO: warum wird Fehler geworfen bei 'yarn run start-backend' ?
-import createRouter from '@roadiehq/backstage-plugin-argo-cd-backend';
-import { PluginEnvironment } from '../types';
+//import { createRouter } from '@roadiehq/backstage-plugin-argo-cd-backend';  //TODO: createRouter has no call signatures
+//import createRouter from '@roadiehq/backstage-plugin-argo-cd-backend';
+//import { PluginEnvironment } from '../types';
 
-export default async function createPlugin({
+/*export default async function createPlugin({
   logger,
   config,
 }: PluginEnvironment) {
   return await createRouter({ logger, config });
-}
+}*/
 
 export function createArgoCDApp(options: { config: Config; logger: Logger }) {
   const { config, logger } = options;

packages/backend/src/plugins/auth.ts

@@ -1,4 +1,4 @@
-/*import {
+import {
   DEFAULT_NAMESPACE,
   stringifyEntityRef,
 } from '@backstage/catalog-model';
@@ -12,9 +12,9 @@ import {
 import {
   oidcAuthenticator,
   OidcAuthResult,
-} from '@backstage/plugin-auth-backend-module-oidc-provider';*/
+} from '@backstage/plugin-auth-backend-module-oidc-provider';
 
-/*export const authModuleKeycloakOIDCProvider = createBackendModule({
+export const authModuleKeycloakOIDCProvider = createBackendModule({
   pluginId: 'auth',
   moduleId: 'keycloak-oidc',
   register(reg) {
@@ -65,4 +65,4 @@ import {
       },
     });
   },
-});*/
+});

packages/backend/src/types.ts

@@ -5,7 +5,6 @@ import {
   PluginDatabaseManager,
   PluginEndpointDiscovery,
   TokenManager,
-  //UrlReader,
 } from '@backstage/backend-common/dist';  //TODO: deprecated
 import { PluginTaskScheduler } from '@backstage/backend-tasks/dist';
 import { PermissionEvaluator } from '@backstage/plugin-permission-common';
@@ -16,7 +15,6 @@ export type PluginEnvironment = {
   database: PluginDatabaseManager;
   cache: PluginCacheManager;
   config: Config;
-  //reader: UrlReader;
   discovery: PluginEndpointDiscovery;
   tokenManager: TokenManager;
   scheduler: PluginTaskScheduler;