Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
97f2725
Initial commit
callumforrester Jul 11, 2025
a81d394
Install and configure prettier
callumforrester Jul 11, 2025
38fd4bf
Add license
callumforrester Jul 14, 2025
2cf5687
Add CI
callumforrester Jul 14, 2025
619c8a7
Update node version in CI
callumforrester Jul 15, 2025
952bf7f
Generate JSON form using static count plan schema
callumforrester Jul 11, 2025
1ccb66d
Allow for multi-plan select
callumforrester Jul 11, 2025
f270631
Mock triggering of plan
callumforrester Jul 16, 2025
caf72b2
Migrate to pnpm
callumforrester Jul 21, 2025
85a0dd2
Add github action to create and push image on release (#4)
douglaswinter Jul 31, 2025
437d663
Replace hardcoded backend URL with relative /api/ proxy path (#5)
douglaswinter Aug 1, 2025
7a70266
Add non-jsonforms plan
VictoriaBeilsten-Edmands Aug 5, 2025
fd66536
Make spectroscopy plan top level
VictoriaBeilsten-Edmands Aug 6, 2025
3ca989c
Add colour scheme button
VictoriaBeilsten-Edmands Aug 6, 2025
2f690f6
Add breadcrumbs
VictoriaBeilsten-Edmands Aug 6, 2025
23d90dc
Update Diamond favicon
VictoriaBeilsten-Edmands Aug 6, 2025
0325db2
Merge pull request #6 from DiamondLightSource/vbe/spec-plan-ui
VictoriaBeilsten-Edmands Aug 7, 2025
afa39c7
Add dummy data view
callumforrester Aug 13, 2025
fc2abd9
Add instrument session context (#10)
douglaswinter Aug 28, 2025
624c014
Configure workflow_dispatch for manual triggering of container job
douglaswinter Sep 5, 2025
eb796b1
Add workflows page
douglaswinter Sep 10, 2025
c52fdd6
Improved generic Plan browser (#9)
douglaswinter Sep 11, 2025
21f176c
Add common layout route; others are children
douglaswinter Sep 11, 2025
7413a45
Mock instrument sessions query, change relay env to supergraph
EmsArnold Oct 3, 2025
1cda392
Add IS dropdown menu
EmsArnold Oct 20, 2025
ff86424
Restore repository to workflows, update schema
EmsArnold Oct 22, 2025
a385378
Merge pull request #16 from DiamondLightSource/populate_instrument_se…
EmsArnold Oct 24, 2025
338dc42
Update visualisation on Spectroscopy page with 'R', 'G', 'B' maps
EmsArnold Oct 30, 2025
f6ee83e
vitest-conf fixes
douglaswinter Nov 25, 2025
24c787a
Add 'apps/visr/' from commit '338dc4261148617661759f53be1de132bd9bcad1'
douglaswinter Nov 25, 2025
6cd410c
Integrate visr into atlas; add vitest-conf
douglaswinter Nov 25, 2025
c72f945
Configure top-level github actions
douglaswinter Nov 26, 2025
6d1e2e1
Fix vitest-conf tsconfig.json
douglaswinter Nov 26, 2025
f5e382b
Fix docker job
douglaswinter Nov 26, 2025
b46258b
Set up remote caching
douglaswinter Nov 28, 2025
3bfa0f4
Trivial change to test caching
douglaswinter Nov 28, 2025
ed7ffb9
Optimise docker/nginx.conf
douglaswinter Jan 26, 2026
e7030dc
Update lock file
douglaswinter Jan 26, 2026
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
40 changes: 40 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: CI

on:
push:
branches: ["main"]
pull_request:

jobs:
ci:
runs-on: ubuntu-latest
env:
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
TURBO_TEAM: ${{ secrets.TURBO_TEAM }}

steps:
- uses: actions/checkout@v4

- name: Setup pnpm
uses: pnpm/action-setup@v3
with:
version: 10

- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: 22
cache: "pnpm"
cache-dependency-path: "**/pnpm-lock.yaml"

- name: Install dependencies
run: pnpm install --frozen-lockfile

- name: Lint
run: pnpm lint

- name: Build
run: pnpm build

- name: test
run: pnpm test
58 changes: 58 additions & 0 deletions .github/workflows/publish_app.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: App Publisher

on:
workflow_call:
inputs:
app:
required: true
type: string
image:
required: true
type: string
branch:
required: false
type: string
default: main

jobs:
build:
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Log in to GHCR
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Docker metadata
id: meta
uses: docker/metadata-action@v5
with:
images: ${{ inputs.image }}
tags: |
${{ github.event_name == 'release' && 'type=semver,pattern={{version}}' || github.event.inputs.tag }}

- name: Build & push image
id: push
uses: docker/build-push-action@v6
with:
context: .
file: docker/Dockerfile.web-app
build-args: |
APP_NAME=${{ inputs.app }}
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}

- name: Generate attestation
if: startsWith(github.ref, 'refs/tags/')
uses: actions/attest-build-provenance@v1
with:
subject-name: ${{ inputs.image }}
subject-digest: ${{ steps.push.outputs.digest }}
push-to-registry: true
20 changes: 20 additions & 0 deletions .github/workflows/publish_visr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Publish ViSR Docker Image

on:
release:
types: [published]

workflow_dispatch:
inputs:
branch:
description: "Branch to build from"
default: "main"
required: true

jobs:
publish:
uses: ./.github/workflows/publish_app.yml
with:
app: visr
image: ghcr.io/DiamondLightSource/atlas/visr
branch: ${{ github.event.inputs.branch || 'main' }}
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,6 @@ dist-ssr
*.njsproj
*.sln
*.sw?

# Turborepo
.turbo
6 changes: 6 additions & 0 deletions apps/visr/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
.dockerignore
coverage
node_modules
dist
README.md
.git
22 changes: 22 additions & 0 deletions apps/visr/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*

node_modules
dist
dist-ssr
*.local

# Editor directories and files
.idea
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
5 changes: 5 additions & 0 deletions apps/visr/.prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.github
.yarn
dist
node_modules
yarn.lock
6 changes: 6 additions & 0 deletions apps/visr/.prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"arrowParens": "avoid",
"semi": true,
"singleQuote": false,
"trailingComma": "all"
}
3 changes: 3 additions & 0 deletions apps/visr/.vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"recommendations": ["esbenp.prettier-vscode"]
}
7 changes: 7 additions & 0 deletions apps/visr/.vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true,
"prettier.requireConfig": true,
"prettier.configPath": "./.prettierrc",
"prettier.prettierPath": "./node_modules/prettier"
}
201 changes: 201 additions & 0 deletions apps/visr/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "{}"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright {yyyy} {name of copyright owner}

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
1 change: 1 addition & 0 deletions apps/visr/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# ViSR UI
Loading