Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update the UI to work with newer changes in cube #1156

Draft
wants to merge 62 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
e2dd7a3
rebase
PintoGideon Jul 2, 2024
4acf313
rebase
PintoGideon Jul 2, 2024
743586f
feat: Add types to folders, links and files
PintoGideon Apr 17, 2024
edffa81
feat: Update the browser in the feeds view
PintoGideon Apr 17, 2024
92bbe69
fix: Add a unique key to the table row
PintoGideon Apr 17, 2024
efc9097
feat: Update the file browser code for the Directory Tree
PintoGideon Apr 18, 2024
24eaf83
rebase
PintoGideon Jul 2, 2024
3896e57
feat: Update the code for file downloads in the File Browser Component
PintoGideon Apr 19, 2024
628af0b
refactor: Cleanup
PintoGideon Apr 19, 2024
a010767
feat: Create a utility hook for file downloads that can be used in an…
PintoGideon Apr 19, 2024
a3cc99f
refactor: cleanup
PintoGideon Apr 19, 2024
8f69407
refactor: Cleanup
PintoGideon Apr 19, 2024
ab855b1
fix: Minor cleanup
PintoGideon Apr 19, 2024
14edc16
add push for staging and and linux/arm64 platform
chhsiao1981 Apr 19, 2024
c608c69
build in amd64 and push with amd64 and arm64
chhsiao1981 Apr 22, 2024
bd7eb83
bug: Fix the checked keys bug in the file browser in the Library Page
PintoGideon Apr 22, 2024
419209a
refactor: Cleanup
PintoGideon Apr 22, 2024
bc3ef10
Build only in amd64 and copy-and-push in amd64/arm64
chhsiao1981 Apr 22, 2024
9b527a3
remove multi-stage build
chhsiao1981 Apr 23, 2024
dd7a17c
use actions/setup-node@v4 to build dist in github workflows
chhsiao1981 Apr 24, 2024
89f9271
add postfix after version-string to differentiate the date-based tags…
chhsiao1981 Apr 24, 2024
5d3504f
add comments to the top of Dockerfile_cp
chhsiao1981 Apr 25, 2024
0fa28e7
ignore: Create an empty file for the Card functionality
PintoGideon Apr 22, 2024
162f490
feat: search
PintoGideon Apr 23, 2024
12fa0ff
feat: rebase
PintoGideon Apr 30, 2024
d6c0d2f
rebase
PintoGideon Jul 2, 2024
703729e
feat: Rebase
PintoGideon Apr 30, 2024
d880118
feat: Rebase
PintoGideon Apr 30, 2024
650f7ce
feat: Rebase
PintoGideon Apr 30, 2024
83f867e
feat: Rebase
PintoGideon Apr 30, 2024
36db767
feat: Rebase
PintoGideon Apr 30, 2024
3bc4b17
feat: Rebase
PintoGideon Apr 30, 2024
b38a2f2
feat: Rebase
PintoGideon Apr 30, 2024
92ccf10
feat: Rebase
PintoGideon Apr 30, 2024
c7a307f
refactor: Restore lost changes during rebase
PintoGideon Apr 30, 2024
bed7e78
fix: Fix how token is passed to the download url
PintoGideon Apr 30, 2024
ad124a7
feat: Restore downloads
PintoGideon May 1, 2024
30246e7
feat: Minimal work version for the cart feature
PintoGideon May 1, 2024
21b61e8
feat: Implement file downloads in the cart
PintoGideon May 3, 2024
dfd3bd9
feat: Minimum viable implementation for file and folder downloads
PintoGideon May 6, 2024
e4f18ce
Fix: Update the file previews for jpg, jpeg, and png file formats
PintoGideon May 7, 2024
474898f
rebase
PintoGideon Jul 2, 2024
a0540eb
rebase
PintoGideon Jul 2, 2024
82eabff
feat: Update how the user interacts with the breadcrumbs in the feed …
PintoGideon May 10, 2024
f6c819f
Rebase Folder-Links
PintoGideon May 7, 2024
98d05d7
feat: Improve error handling for folder downloads in the Cart
PintoGideon May 10, 2024
53c936b
feat: Create feeds with the paths in the cart and improve error handling
PintoGideon May 10, 2024
484219c
rebase
PintoGideon Jul 2, 2024
42b0cda
feat: Add filters to the SERVICES/ path
PintoGideon May 13, 2024
dc733ba
rebase
PintoGideon Jul 2, 2024
1444914
feat: Save a copy of the state of the cart in cube
PintoGideon May 17, 2024
c67ee8b
feat: Use cookies to store cart operations state
PintoGideon May 20, 2024
159866c
rebase
PintoGideon Jul 2, 2024
62734ee
feat: Parallel cart operations with Promise.all
PintoGideon May 30, 2024
193fab5
feat: Improve error handling
PintoGideon May 30, 2024
365ea76
feat: Use session storage instead of cookies due to memory limitations
PintoGideon May 31, 2024
445416c
feat: cleanup
PintoGideon Jun 4, 2024
14168d0
rebase
PintoGideon Jul 2, 2024
3edb29e
rebase
PintoGideon Jul 2, 2024
671d3e5
rebase
PintoGideon Jul 2, 2024
c681974
fix: Update the code for running pipelines:
PintoGideon Jun 6, 2024
b12c5b4
feat: cleanup
PintoGideon Jul 2, 2024
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
34 changes: 26 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: build

on:
push:
branches: [ master ]
branches: [ master, staging ]

jobs:
build:
Expand All @@ -29,24 +29,42 @@ jobs:
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}

- name: Login to GitHub Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and push
- name: Get postfix of latest
id: postfix_of_latest
run: |
if [[ $GITHUB_REF_TYPE == tag || $GITHUB_REF_NAME == master ]]; then
echo "Postfix of latest: ''"
echo "postfix_of_latest=" >> $GITHUB_OUTPUT
else
echo "Postfix of latest: -$GITHUB_REF_NAME"
echo "postfix_of_latest=-$GITHUB_REF_NAME" >> $GITHUB_OUTPUT
fi

- uses: actions/setup-node@v4
with:
node-version: 20.7
- run: npm ci
- run: npm run build

- name: Copy and push
uses: docker/build-push-action@v5
with:
tags: |
docker.io/fnndsc/chris_ui:latest
docker.io/fnndsc/chris_ui:${{ steps.info.outputs.version_string }}
ghcr.io/fnndsc/chris_ui:latest
ghcr.io/fnndsc/chris_ui:${{ steps.info.outputs.version_string }}
docker.io/fnndsc/chris_ui:latest${{ steps.postfix_of_latest.outputs.postfix_of_latest}}
docker.io/fnndsc/chris_ui:${{ steps.info.outputs.version_string }}${{ steps.postfix_of_latest.outputs.postfix_of_latest}}
ghcr.io/fnndsc/chris_ui:latest${{ steps.postfix_of_latest.outputs.postfix_of_latest}}
ghcr.io/fnndsc/chris_ui:${{ steps.info.outputs.version_string }}${{ steps.postfix_of_latest.outputs.postfix_of_latest}}
context: .
file: ./Dockerfile
platforms: linux/amd64
file: ./Dockerfile_cp
platforms: linux/amd64,linux/arm64
push: true
cache-from: type=gha
cache-to: type=gha,mode=max
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
/.pnp
.pnp.js

.vite/
# testing
/coverage
/test-results
Expand Down
21 changes: 21 additions & 0 deletions Dockerfile_cp
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Dockerfile for copying local `./dist` into the docker image.
#
# The goal of this dockerfile is to efficiently achieve
# multi-architectural build.
#
# The app should be built in the physical machine using `npm run build`
# before applying this dockerfile.
#
FROM node:20.7-alpine

RUN npm i -g sirv-cli

WORKDIR /app

COPY ./dist /app
COPY ./docker-entrypoint.sh /docker-entrypoint.sh

ENTRYPOINT ["/docker-entrypoint.sh"]
ENV HOST=0.0.0.0 PORT=3000
CMD ["sirv", "--etag", "--single"]
EXPOSE 3000
Loading
Loading