Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion backstage/packages/app/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ import {
convertLegacyAppOptions,
convertLegacyAppRoot,
} from '@backstage/core-compat-api';
import { createFrontendModule } from '@backstage/frontend-plugin-api';
import { PagerDutyPage } from '@pagerduty/backstage-plugin';

interface SignInProviderConfig {
id: string;
Expand Down Expand Up @@ -190,6 +190,7 @@ const routes = (
/>
<Route path="/rbac" element={<RBACRoot />} />
<Route path="/copilot" element={<CopilotIndexPage />} />
<Route path="/pagerduty" element={<PagerDutyPage />} />
</FlatRoutes>
);

Expand Down
12 changes: 10 additions & 2 deletions backstage/packages/app/src/components/Root/Root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,16 @@ export const Root = ({ children }: PropsWithChildren<{}>) => (
/>
{/* <SidebarItem icon={MoneyIcon} to="cost-insights" text="Cost Insights" /> */}
<CopilotSidebar />
<SidebarItem icon={SchoolIcon} to="skill-exchange" text="Skill Exchange" />
<SidebarItem icon={DoneAllIcon} to='soundcheck' text='Soundcheck' />
<SidebarItem
icon={SchoolIcon}
to="skill-exchange"
text="Skill Exchange"
/>
<SidebarItem
icon={DoneAllIcon}
to="soundcheck"
text="Soundcheck"
/>
<InsightsSidebarItem />
<RBACSidebarItem />
</SidebarScrollWrapper>
Expand Down
22 changes: 9 additions & 13 deletions backstage/packages/app/src/components/catalog/EntityPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ import { EntityGithubPullRequestsOverviewCard } from '@roadiehq/backstage-plugin
import { EntityTeamPullRequestsContent } from '@backstage-community/plugin-github-pull-requests-board';
import {
isPluginApplicableToEntity as isPagerDutyAvailable,
EntityPagerDutyCard,
EntityPagerDutySmallCard,
} from '@pagerduty/backstage-plugin';
const techdocsContent = (
<EntityTechdocsContent>
Expand Down Expand Up @@ -167,21 +167,19 @@ const overviewContent = (
<Grid item md={8} xs={12}>
<EntityHasSubcomponentsCard />
</Grid>
<Grid container spacing={3}>
<Grid item md={6}>
<EntityGithubPullRequestsOverviewCard />
</Grid>
</Grid>
<Grid item md={6} xs={12}>
<EntitySoundcheckCard />
</Grid>
<EntitySwitch>
<EntitySwitch.Case if={isPagerDutyAvailable}>
<Grid item md={6}>
<EntityPagerDutyCard />
<Grid item md={6} xs={12}>
<EntityPagerDutySmallCard />
</Grid>
</EntitySwitch.Case>
</EntitySwitch>
<Grid item md={6} xs={12}>
<EntityGithubPullRequestsOverviewCard />
</Grid>
</Grid>
);

Expand All @@ -190,7 +188,9 @@ const serviceEntityPage = (
<EntityLayout.Route path="/" title="Overview">
{overviewContent}
</EntityLayout.Route>

<EntityLayout.Route path="/docs" title="Docs">
{techdocsContent}
</EntityLayout.Route>
<EntityLayout.Route path="/ci-cd" title="CI/CD">
{cicdContent}
</EntityLayout.Route>
Expand Down Expand Up @@ -223,10 +223,6 @@ const serviceEntityPage = (
</Grid>
</Grid>
</EntityLayout.Route>

<EntityLayout.Route path="/docs" title="Docs">
{techdocsContent}
</EntityLayout.Route>
<EntityLayout.Route path="/kubernetes" title="Kubernetes">
<EntityKubernetesContent refreshIntervalMs={30000} />
</EntityLayout.Route>
Expand Down
108 changes: 54 additions & 54 deletions backstage/packages/app/src/components/home/HomePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -127,69 +127,69 @@ export const HomePage = () => {
placeholder="Search"
/>
</Grid>
<Grid container item xs={12}>
<Grid item xs={12} md={6}>
<HomePageTopVisited />
</Grid>
<Grid item xs={12} md={6}>
<HomePageRecentlyVisited />
</Grid>
<Grid item xs={12} md={6}>
<InfoCard title="Getting Started Documentation">
Pages to get started
<ul>
<li>
<a href="/docs/default/system/backstage">
Getting started with Backstage
</a>
</li>
<li>
<a href="/docs/default/component/bits-adr">
Getting started with Architecture
Decision Records (ADRs)
</a>
</li>

<li>
<a href="/docs/default/component/kubernetes-configs">
Getting started with Kubernetes
</a>
</li>
<li>
<a href="/docs/default/component/shared-workflows">
Getting started with Broad curated
GitHub Actions
</a>
</li>
<li>
<a href="/docs/default/component/bits-packaging-pipeline/spack-quickstart">
Getting started with Spack Packages
</a>
</li>
<li>
<a href="/docs/default/component/ge-user-docs">
Getting started with Grid Engine
</a>
</li>

<li>
<a href="/docs/default/component/disco-docs">
Getting started with DISCO (Being
retired)
</a>
</li>
</ul>
</InfoCard>
</Grid>

<Grid container item xs={12}>
<Grid item xs={6} md={6}>
<HomePageStarredEntities />
</Grid>
<Grid item xs={6} md={6}>
<HomePageToolkit tools={tools} />
</Grid>
<Grid item xs={12} md={6}>
<InfoCard title="Getting Started Documentation">
Pages to get started
<ul>
<li>
<a href="/docs/default/system/backstage">
Getting started with Backstage
</a>
</li>
<li>
<a href="/docs/default/component/bits-adr">
Getting started with
Architecture Decision Records
(ADRs)
</a>
</li>

<li>
<a href="/docs/default/component/kubernetes-configs">
Getting started with Kubernetes
</a>
</li>
<li>
<a href="/docs/default/component/shared-workflows">
Getting started with Broad
curated GitHub Actions
</a>
</li>
<li>
<a href="/docs/default/component/bits-packaging-pipeline/spack-quickstart">
Getting started with Spack
Packages
</a>
</li>
<li>
<a href="/docs/default/component/ge-user-docs">
Getting started with Grid Engine
</a>
</li>

<li>
<a href="/docs/default/component/disco-docs">
Getting started with DISCO
(Being retired)
</a>
</li>
</ul>
</InfoCard>
<Grid container item xs={12}>
<Grid item xs={12} md={6}>
<HomePageTopVisited />
</Grid>
<Grid item xs={12} md={6}>
<HomePageRecentlyVisited />
</Grid>
</Grid>
</Grid>
</Grid>
Expand Down
2 changes: 1 addition & 1 deletion catalog-info.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ metadata:
- bits-tools
annotations:
backstage.io/kubernetes-id: backstage
pagerduty.com/integration-key: 2dfe75f325ae4b0bd0735b72b4c08f32
pagerduty.com/service-id: PZN5Q22
github.com/project-slug: broadinstitute/backstage
google.com/cloudbuild-project-slug: bits-gke-clusters
google.com/cloudbuild-repo-name: backstage
Expand Down
Loading