Skip to content

Commit

Permalink
this commit is integrated commit from 7336b14 to 02a0ddb
Browse files Browse the repository at this point in the history
- add restart functionality for loop and PS components

this commit is also merge commit from 7336b14 to 94c4a6e
- remove unused vars
- reduce failed task log
- add UT for projectOperator handler
- fix some bugs
- integrate project operation API
- add context menue to component, link, file-link
- remove delete button from componentProperty
- obsolute project controll APIs
- implement new updateComponent API
- fix package name
- add project readOnly operation API
- remove unused files, packages, and exported functions
- set readonly attribute if project is read-only
- updateComponent works on array property (ex. indexList, include, exclude and so on)
- copySelectedComponent is deeply copied from now
- move read-only release button to workflow screen
- show warning dialog which appears when user try to make wraitable read-only project
- remove read-only switch on text editor if project is read-only
- move regexp under common dir
- hange project finish message
- implement rwatchd based job manager (not finished)
- revamp jobManager
- add script to generate pdf document
- remove unused test
- update package-lock.json
- modify comment only
- support automatic changing functionality of job concurrency
- update dependent lib
- add axios and fix package-lock.json
- remove duplicated line which added by merge commit
- rename jobScheduler.json's property. {bulk,step}job is now support{Bulk,Step}job
- add supportWebAPI prop to jobScheduler.json
- modify conditional statement and message
- modify log message
- throw error insted of return Promise.reject
- exec() in _dispatchTask catch error and log, then re-throw error
- dont catch error in Executer.exec() and it's callee
- add webAPI based job register
- fix UT
- update packages
- rewrite release test scripts with docker-compose
- introduce perfect-debounce to fix race condition about PS template component
- fix some minor bugs
- add version info functionality
- introduce workspaces to avoid eslint conflict
- fix eslint setting
- refactor executers
- implement transferrers
- fix logging test
- wait until test server is up in release_test_local to gain remote exec test stability
- update github workflow
- implement removeAll() to executers and transferrers
- update package-lock.json
- use eslint stylistic package and update setting
- fix task cancel functionality
- component disable functionality works fine
- fix executer
- add aboutWheel() and it's API
- fix package include path
- use access token for web API (not finished)
- implement cycle graph detection
- highlight invalid components
- update docker related files
- update test script
- refactoring
- add validation error dialog
- check not only cycle graph but also component validation when check button clicked
- refactor validation check functions
- add UT for validation check
- refactor validation check routines
- add debug log (tmporary)
- refactor dispatcher
- support break and continue component (server side)
- support break and continue component (client side)
- fix table (#909)
- add test case of partial commit
- support committing specific files at unsaved files' dialog
- change break and continue color
- fix UT
- revertProject handler can get mode correctly
- update SBS to allow same operation as already finished last operation
- fix update position change
- remove debug output
- do not call updateComponent API if only position is changed
- show snackbar message when file is saved in text editor
- disappear snackbar message after saveFile succeeded
- support error log popup in home, remotehost, and viewer screen
- fix bugs
- add project-wide setting menu
- fix environment variable editor
- implement webhook editor
- update doc for developer
- remove @ alias
- add knip config file
- remove unused dependency
- fix packege setting and Dockerfile
- fix eslint setting
- fix snackbar
- fix remotehost test button
- fix import error
- remove unused files and rename realSocketIO.js to socketIOWrapper.js
- remove unused config variable
- rename function
- remove unused function isLocalComponent
- remove unused function getVersion
- fix import bug
- rename functions
- remove unused export
- remove unused function gatherFiles
- remove unused function forKeepLoopInstance, whileKeepLoopInstance
- remove unused functions getComponentRelativePath, removeInputFile, removeOutputFile, and renameInputFile
- fix package dependency setting
- fix some merge bug
- fix PS setting file schema
- make validate log bit verbose
- update validate component UT
- validation check function return Promise.reject instead of throw exception
- deliverFileFromRemote and deliverFileOnRemote return result object
- fix test scripts
- fix module path
- fix and modify test script
  • Loading branch information
so5 committed Oct 25, 2024
1 parent ed4a82d commit 88d7a84
Show file tree
Hide file tree
Showing 186 changed files with 27,313 additions and 26,868 deletions.
2 changes: 1 addition & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
docs
documentMD
*/node_modules
**/node_modules
bin
server/coverage
client/bin
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/run_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ jobs:
with:
node-version: ${{ matrix.node-version }}
- run: npm ci
working-directory: ./server
- run: npm run test
working-directory: ./server
- run: echo "VERSION_NUMBER=`date '+%Y-%m%d-%H%M%S'`" >>$GITHUB_ENV
Expand Down
9 changes: 7 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@ WORKDIR /usr/src/
# to install phantomjs
RUN apt-get update && apt -y install bzip2 python3 g++ build-essential
# build WHEEL
COPY package.json package.json
COPY common common
COPY server server
RUN cd server && npm install --omit=dev
COPY client client
RUN cd client; npm install; npm run build
RUN npm install
RUN npm install -w server -w client

#build base image to run WHEEL
FROM --platform=linux/amd64 node:20-slim AS base
Expand All @@ -18,12 +20,15 @@ RUN apt-get update && apt -y install curl git rsync openssh-server &&\
apt -y install git-lfs &&\
apt-get clean &&\
rm -rf /var/lib/apt/lists/*
COPY --from=builder /usr/src/node_modules /usr/src/node_modules
COPY --from=builder /usr/src/server /usr/src/server
COPY common common
RUN rm -fr server/app/config/*

# run UT
FROM base AS ut
WORKDIR /usr/src/server
RUN apt-get update && apt -y install python3 g++ build-essential
RUN npm install cross-env\
chai chai-as-promised chai-fs chai-iterator chai-json-schema deep-equal-in-any-order\
mocha nyc rewire sinon sinon-chai
Expand Down
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,29 +63,29 @@ RIKEN R-CCS forks it and continues the development

## For developpers
### Directory structure
we have 3 main directories at top level
we have 4 main directories at top level

- documentMD
- client
- server
- test

"documentMD" contains documents written in markdown.
Only files under `documentMD/user_guide` will be converted to html and be publishd at github.io pages
when pull request will be merged to master branch
Any other markdown files under documentMD is detailed informatin for developpers

"client" and "server" has client and server code respectively.
"test" contains E2E test code based on cypress, you can find server-side unit test code under server/test

### preparation
run following commands
1. npm install
2. npm run build (install dependent modules for server and client code)
3. cd test; npm install (install e2e test modules)

please read test/README.md for E2E test preparation

### How to run without docker
1. install and build
```
> npm build
```
2. start server
```
> cd server
> npm start
```

### CI/CD process
when you push new commit to github, server/app/db/version.json will be updated during CI/CD process.
Expand Down
Loading

0 comments on commit 88d7a84

Please sign in to comment.