Skip to content

Commit c3d1e1e

Browse files
Merge pull request #250 from ISISComputingGroup/link_to_jenkins
link to wall display externally
2 parents be5c8a7 + f72a4d0 commit c3d1e1e

4 files changed

Lines changed: 6 additions & 121 deletions

File tree

app/components/JenkinsJobs.tsx

Lines changed: 0 additions & 98 deletions
This file was deleted.

app/types.ts

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -151,19 +151,3 @@ export interface instListEntryWithRunstatePVandValue extends instListEntry {
151151
}
152152

153153
export type instList = Array<instListEntryWithRunstatePVandValue>;
154-
155-
export interface IfcWallDisplayJob {
156-
_class: string;
157-
color: string;
158-
name: string;
159-
url: string;
160-
}
161-
162-
export interface IfcWallDisplayResponse {
163-
_class: string;
164-
description?: string;
165-
name: string;
166-
property: Array<string>;
167-
url: string;
168-
jobs: Array<IfcWallDisplayJob>;
169-
}

app/wall/page.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import GithubActionsScheduledJobs from "@/app/components/GithubActionsScheduledJobs";
22
import InstrumentsDisplay from "@/app/components/InstrumentsDisplay";
3-
import JenkinsJobs from "../components/JenkinsJobs";
43

54
export default function WallDisplay() {
65
return (
@@ -17,10 +16,11 @@ export default function WallDisplay() {
1716
<InstrumentsDisplay />
1817
</div>
1918
</div>
20-
<h1 className="w-full text-left text-black dark:text-white font-semibold text-2xl p-2">
21-
Jenkins jobs:
22-
</h1>
23-
<JenkinsJobs />
19+
<a href="https://epics-jenkins.isis.rl.ac.uk/view/WallDisplay/">
20+
<h1 className="w-full text-left text-black dark:text-white font-semibold text-2xl p-2 underline">
21+
Jenkins jobs (external)
22+
</h1>
23+
</a>
2424
<h1 className="w-full text-left text-black dark:text-white font-semibold text-2xl p-2">
2525
Github actions scheduled workflows:
2626
</h1>

jest.config.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@ const config: Config = {
1616
"app/**/*.{ts,tsx}",
1717
"!**/*layout.tsx",
1818
"!app/_app.tsx",
19-
"!app/components/JenkinsJobs.tsx", // relies on an external fetch
2019
"!app/components/GithubActionsScheduledJobs.tsx", // relies on an external image (CI badge)
2120
"!app/components/InstrumentData.tsx", // relies on websocket
22-
"!app/wall/page.tsx", // relies on JenkinsJobs
21+
"!app/wall/page.tsx", // don't need to test the wall display
2322
"!app/instruments/page.tsx", // no logic here
2423
"!app/instrument/page.tsx", // no logic here - all in instrumentdata / instrument.ts
2524
],

0 commit comments

Comments
 (0)