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
98 changes: 0 additions & 98 deletions app/components/JenkinsJobs.tsx

This file was deleted.

16 changes: 0 additions & 16 deletions app/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -151,19 +151,3 @@ export interface instListEntryWithRunstatePVandValue extends instListEntry {
}

export type instList = Array<instListEntryWithRunstatePVandValue>;

export interface IfcWallDisplayJob {
_class: string;
color: string;
name: string;
url: string;
}

export interface IfcWallDisplayResponse {
_class: string;
description?: string;
name: string;
property: Array<string>;
url: string;
jobs: Array<IfcWallDisplayJob>;
}
10 changes: 5 additions & 5 deletions app/wall/page.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import GithubActionsScheduledJobs from "@/app/components/GithubActionsScheduledJobs";
import InstrumentsDisplay from "@/app/components/InstrumentsDisplay";
import JenkinsJobs from "../components/JenkinsJobs";

export default function WallDisplay() {
return (
Expand All @@ -17,10 +16,11 @@ export default function WallDisplay() {
<InstrumentsDisplay />
</div>
</div>
<h1 className="w-full text-left text-black dark:text-white font-semibold text-2xl p-2">
Jenkins jobs:
</h1>
<JenkinsJobs />
<a href="https://epics-jenkins.isis.rl.ac.uk/view/WallDisplay/">
<h1 className="w-full text-left text-black dark:text-white font-semibold text-2xl p-2 underline">
Jenkins jobs (external)
</h1>
</a>
<h1 className="w-full text-left text-black dark:text-white font-semibold text-2xl p-2">
Github actions scheduled workflows:
</h1>
Expand Down
3 changes: 1 addition & 2 deletions jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@ const config: Config = {
"app/**/*.{ts,tsx}",
"!**/*layout.tsx",
"!app/_app.tsx",
"!app/components/JenkinsJobs.tsx", // relies on an external fetch
"!app/components/GithubActionsScheduledJobs.tsx", // relies on an external image (CI badge)
"!app/components/InstrumentData.tsx", // relies on websocket
"!app/wall/page.tsx", // relies on JenkinsJobs
"!app/wall/page.tsx", // don't need to test the wall display
"!app/instruments/page.tsx", // no logic here
"!app/instrument/page.tsx", // no logic here - all in instrumentdata / instrument.ts
],
Expand Down