Skip to content

Commit

Permalink
Merge branch 'finos-main' into sl-main
Browse files Browse the repository at this point in the history
  • Loading branch information
cfisher-scottlogic committed Sep 14, 2023
2 parents 8d38575 + 28180cd commit 096c613
Show file tree
Hide file tree
Showing 1,538 changed files with 138,231 additions and 43,421 deletions.
18 changes: 18 additions & 0 deletions .github/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
changelog:
exclude:
labels:
- ignore-for-release
authors:
- octocat
categories:
- title: Breaking Changes 🛠
labels:
- Semver-Major
- breaking-change
- title: Exciting New Features 🎉
labels:
- Semver-Minor
- enhancement
- title: Other Changes
labels:
- "*"
25 changes: 25 additions & 0 deletions .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Benchmarks

on:
schedule:
- cron: '0 5,18 * * *'

jobs:
build:
runs-on: ubuntu-latest-16-cores

steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: "16.x"
- name: Set up JDK 1.16
uses: actions/setup-java@v3
with:
java-version: '16'
distribution: 'adopt'
cache: 'maven'
- name: Install Modules
run: mvn -B install --file pom.xml
- name: Run Microbenchmarks
run: mvn exec:exec -pl benchmark
14 changes: 6 additions & 8 deletions .github/workflows/build-ui.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,11 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: "16"
# Enable node module caching only when yarn.lock is available
- name: Cache node modules
- name: Cache dependencies
uses: actions/cache@v2
with:
path: node_modules
key: yarn-deps-${{ hashFiles('yarn.lock') }}
restore-keys: |
yarn-deps-${{ hashFiles('yarn.lock') }}
- run: cd ./vuu-ui && yarn
- run: cd ./vuu-ui && yarn build
path: ~/.npm
key: npm-${{ hashFiles('package-lock.json') }}
restore-keys: npm-
- run: cd ./vuu-ui && npm install
- run: cd ./vuu-ui && npm run build
10 changes: 5 additions & 5 deletions .github/workflows/cve-scanning-node.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ name: Node CVE Scanning
on:
push:
paths:
- '**/package.json'
- '.github/workflows/cve-scanning-node.yml'
- 'vuu-ui/allow-list.json'
- "**/package.json"
- ".github/workflows/cve-scanning-node.yml"
- "vuu-ui/allow-list.json"

jobs:
scan-packages:
Expand All @@ -19,7 +19,7 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
- run: yarn install --production --frozen-lockfile
- run: npm install --production
working-directory: vuu-ui
- run: npx --yes auditjs ossi --whitelist allow-list.json
working-directory: vuu-ui
working-directory: vuu-ui
35 changes: 25 additions & 10 deletions .github/workflows/cve-scanning.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,33 @@ name: Maven CVE Scanning
on:
push:
paths:
- '**/pom.xml'
- 'allow-list.xml'
- '.github/workflows/cve-scanning.yml'
- "**/pom.xml"
- "allow-list.xml"
- ".github/workflows/cve-scanning.yml"

jobs:
scan:
depchecktest:
runs-on: ubuntu-latest
name: depecheck_test
steps:
- uses: actions/checkout@v3
- name: Set up JDK 1.16
uses: actions/setup-java@v1
- name: Checkout
uses: actions/checkout@v2
- name: Build project with Maven
run: mvn clean install
- name: Depcheck
uses: dependency-check/Dependency-Check_Action@78155aab85e9867e3c35f533e9ddad8ba7cdad7b # v2
id: Depcheck
with:
java-version: 1.16
- name: Build with Maven
run: mvn clean org.owasp:dependency-check-maven:check -DfailBuildOnCVSS=7 -DsuppressionFile="allow-list.xml"
project: "vuu"
path: "./vuu"
format: "HTML"
out: "reports" # this is the default, no need to specify unless you wish to override it
args: >
--failOnCVSS 5
--enableRetired
- name: Upload Test results
if: ${{ always() }}
uses: actions/upload-artifact@v2
with:
name: Depcheck report
path: ${{ github.workspace }}/reports
8 changes: 4 additions & 4 deletions .github/workflows/legal-report-node.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ name: Legal report with Node
on:
push:
paths:
- '**/package.json'
- '.github/workflows/legal-report-node.yml'
- "**/package.json"
- ".github/workflows/legal-report-node.yml"

jobs:
scan-packages:
Expand All @@ -18,7 +18,7 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
- run: yarn install --production --frozen-lockfile
- run: npm install --production
working-directory: vuu-ui
- run: npx node-license-validator . --allow-licenses MIT ISC 0BSD BSD BSD-3-Clause Apache-2.0
working-directory: vuu-ui
working-directory: vuu-ui
1 change: 0 additions & 1 deletion .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ on: [push]

jobs:
build:

runs-on: ubuntu-latest

steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish-npm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ jobs:
with:
node-version: "16.x"
registry-url: "https://registry.npmjs.org"
- run: cd ./vuu-ui && yarn
- run: cd ./vuu-ui && yarn build
- run: cd ./vuu-ui && yarn pub
- run: cd ./vuu-ui && npm install
- run: cd ./vuu-ui && npm run build
- run: cd ./vuu-ui && npm run pub
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
22 changes: 11 additions & 11 deletions .github/workflows/test-ui.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,15 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: "16"
# Enable node module caching only when yarn.lock is available
- name: Cache node modules
- name: Cache dependencies
uses: actions/cache@v2
with:
path: node_modules
key: yarn-deps-${{ hashFiles('yarn.lock') }}
restore-keys: |
yarn-deps-${{ hashFiles('yarn.lock') }}
path: ~/.npm
key: npm-${{ hashFiles('package-lock.json') }}
restore-keys: npm-
- name: Install dependencies
run: cd ./vuu-ui && yarn
- run: cd ./vuu-ui && yarn test:vite
run: cd ./vuu-ui && npm install
- run: cd ./vuu-ui && npm run test:vite

# ensure the vuu example and showcase still build
vuu-and-showcase-build:
Expand All @@ -36,8 +34,10 @@ jobs:
with:
node-version: "16"
- name: Install dependencies
run: cd ./vuu-ui && yarn
run: cd ./vuu-ui && npm install
- name: Build Vuu Libraries
run: cd ./vuu-ui && npm run build
- name: Build showcase
run: cd ./vuu-ui && yarn showcase:build
run: cd ./vuu-ui && npm run showcase:build
- name: Build Vuu app
run: cd ./vuu-ui && yarn build:app
run: cd ./vuu-ui && npm run build:app
8 changes: 6 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,20 @@ target/
/vuu/vuu.iml
/vuu-parent.iml
/vuu-book/src/.DS_Store
.DS_Store

.bloop/**
.metals/**

.vscode/**
node_modules
yarn-debug.log*
yarn-error.log*

/vuu-ui/showcase/src/examples/**/*.js

deployed_apps
dist
/vuu-ui-legacy/target/
/vuu-ui-legacy/vuu-ui-legacy.iml

# Docusaurus generated folders
website/translated_docs/
Expand Down
22 changes: 22 additions & 0 deletions .semgrepignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
.github/workflows/release-mvn-central.yml
vuu/src/main/resources/certs/key.pem
vuu/src/main/resources/www/ws-example.html
vuu/src/main/scala/org/finos/vuu/provider/simulation/SimulatedBigInstrumentsProvider.scala
vuu-ui/packages/vuu-data/src/array-data-source/group-utils.ts
vuu-ui/packages/vuu-datagrid-extras/src/column-expression-input/column-language-parser/walkExpressionTree.ts
vuu-ui/packages/vuu-popups/src/menu/useContextMenu.tsx
vuu-ui/packages/vuu-ui-controls/src/list/Highlighter.tsx
vuu-ui/packages/vuu-ui-controls/src/list/common-hooks/utils/filter-utils.ts
vuu-ui/showcase/src/index.tsx
vuu-ui/showcase/src/examples/Layout/Menu.examples.tsx
vuu-ui/tools/websocket-test.html
vuu/src/test/scala/org/finos/vuu/viewport/CreateViewPortScenarioTest.scala
vuu/src/test/scala/org/finos/vuu/net/ws/WebSocketServerClientTest.scala
vuu/src/test/scala/org/finos/vuu/net/rpc/RpcModuleTest.scala
vuu/src/test/resources/ws.html
vuu-ui/sample-apps/app-vuu-example/scripts/build.mjs
vuu-ui/showcase/scripts/build-docs.mjs
vuu-ui/showcase/scripts/build.mjs
vuu-ui/showcase/scripts/parse-stories.mjs
vuu-ui/showcase/scripts/utils.mjs
vuu-ui/scripts/utils.mjs
2 changes: 2 additions & 0 deletions .settings/org.eclipse.core.resources.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
4 changes: 4 additions & 0 deletions .settings/org.eclipse.m2e.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
55 changes: 47 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

## The Realtime View Server

Welcome. We maintain a docusaurus book containing all the details of the project. Why not get started there:
Welcome. We maintain a docusaurus site containing all the details of the project. Why not get started there:

https://vuu.finos.org/docs/introduction/intro

Expand All @@ -22,7 +22,7 @@ git clone https://github.com/finos/vuu.git
#cd into the repository
cd vuu
#run the maven compile step
mvn compile
mvn install
#cd into vuu, child in repo
cd vuu
#The server should now be started on your machine
Expand All @@ -42,14 +42,53 @@ The UI scripts all run from the vuu/vuu-ui directory.
```sh
#from top-level vuu repo (not vuu child directory in repo)
cd vuu-ui
yarn
yarn build
yarn build:app
cd packages/electron
#this should open an electron window pointing at https://localhost:8443/index.html
yarn start
npm install
npm run build
npm run build:app
```

You can now open the demo app in your browser at https://127.0.0.1:8443/index.html

Alternatively, you may choose to run the demo app in Electron. First install Electron in the tools/electron folder:

```sh
#from top-level vuu repo (not vuu child directory in repo)
cd vuu-ui/tools/electron
npm install
```

Then, back in vuu-ui, run the launch script"

```sh
#from vuu/vuu-ui
npm run launch:demo:electron
```

## Configuring IntelliJ

You may prefer to run the backend using the IntelliJ IDE, if so, you will need to follow the Client Installation above to ensure that the project has built correctly.

1. Install the Scala plugin: file -> settings -> plugins
2. Install Scala 2.13.10
3. Set project SDK version to 11: file -> project structure -> select an SDK -> require version 11
4. Enable 'Use plugin registry': file -> settings -> build, execution, deployment -> Maven
5. Open Maven tab on the right and click install on vuu-parent -> lifecycle -> install
6. In the terminal, navigate to

```sh
vuu-ui/sample-apps/app-vuu-example
```

7. Run

```sh
npm install
npm run build
```

8. In IntelliJ, select 'SimulMain' config and click run
9. If you get a 'certificate-unknown' error, set 'Allow invalid certificates for resources loaded from localhost' to 'Enabled' in your chrome settings

## Usage example

```
Expand Down
Loading

0 comments on commit 096c613

Please sign in to comment.