Skip to content

Commit

Permalink
Sync mains (pull) (#107)
Browse files Browse the repository at this point in the history
* finos#900 disable failing test

* Update check on viewport and context menu (finos#913)

* remove reprecated Portal, fixes in COntextMenu

* use woff2 font, fix portal

* make sure ContextMenu always has theme attributes

* type fixes

* Tidy package and type issues (finos#914)

* fix package references, type issues

* add typescript config for correct auto import resolution

* Layout Management (finos#916)

* fix vuu-filters types

* drawer and dialog fix

* drag drop flexbox editable

* Update vuu-ui/packages/vuu-filters/src/filter-utils.ts

Whitespace between guard clauses

Co-authored-by: Luke Vincent <[email protected]>

* layout header

* restore double quotes

* layout-provider

* layout-reducer

* layout-view

* palette

* palette

* placeholder

* layout-view decomment

* registry

* rollback multi filter dropdown

* stack

* tabs

* config wrapper

* tools

* utils

* layout top level

* revert flexbox layout change

* restore lost semicolon

* missing space

* change action to a type union

* Update README.md

* Sync with Finos main

* VUU-41 style fixes

* VUU-41 rename css variable to --vuu

* Manage layout persistence via interface (#55)

* VUU-27 interface to return promises

* VUU-47 add methods for loading and saving tempLayout

* VUU-47 use loadLayoutById in LayoutList

* VUU-47 remove unused files

* VUU-47 update other examples to use new hook

* Calculated column (finos#882)

* calculated column in settings, instrument search

* additional mock data sources

* instrument tiles

* calculated column editing

* measured-container

* Row used columnMap rathe than column key

* full keyboard nav for table

* fix drag drop in column group headerr

* use MeasuredContainer for Table List

* table cell editing updates datasource

* table editing

* fix type issues

* fix old background renderer

* remove outdated import in showcase story

* exclude PatternValidator from semgrep

* add vuu tooltip component (finos#885)

* VUU-47 improve naming

* VUU-47 use placeholder in defaultLayout

* VUU-47 update docs with new naming

* remove duplicate CSS

* VUU-47 fix layoutList styling

* VUU-47 add loaded layouts to layout view

* VUU-47 rename currentLayout to applicationLayout

* VUU-47 make defaultLayout closeable and update features

* VUU-27 interface to return promises

* VUU-54: Validate IDs in LocalLayoutPersistenceManager

* VUU-54: Mock get/saveLocalEntity

* VUU-54: Refactor promises

* VUU-54: Remove unnecessary asyncs

* VUU-54: Use string union to distinguish layouts/metadata

* VUU-54: Rename variables

* VUU-54: Convert layout types to interfaces

* VUU-54: Extract loadAndFilter method

* VUU-54: Replace filter with find

* VUU-54: Rename validateId variables

* VUU-54: Change vars to lets

* VUU-54: Update imports for consistency

* VUU-54: Add comment to explain filter(Boolean)

* VUU-54: Refactor tests

* VUU-54: Extract expectError

* VUU-54: Remove loadAndFilter method

* VUU-54: Remove removeEntry method

* VUU-52: Add E2E tests to CI

* VUU-52: Use commit hash for cypress-io

* VUU-52: Add comment to explain full SHA

* VUU-47 rename imports

* VUU-59 set up notification context

* VUU-47 fix cypress test

* Update vuu-ui/packages/vuu-layout/src/layout-persistence/LayoutPersistenceManager.ts

Co-authored-by: Cara <[email protected]>

* VUU-47 remove unused import

* VUU-59 notifications with animation

* VUU-59 revert changes to imports

* VUU-59 change toast timeout

* VUU-59 change notificationType to enum

* VUU-59 improvements to example and add comments

---------

Co-authored-by: harryhartley <[email protected]>
Co-authored-by: Luke Vincent <[email protected]>
Co-authored-by: Joe Dunleavy <[email protected]>
Co-authored-by: Joe Dunleavy <[email protected]>
Co-authored-by: cfisher-scottlogic <[email protected]>
Co-authored-by: Cara <[email protected]>
Co-authored-by: Peter Ling <[email protected]>
Co-authored-by: pling-scottlogic <[email protected]>
Co-authored-by: heswell <[email protected]>

* add Layout Management Provider to sample apps (finos#917)

* add Layout Management Provider to sample apps

* fix test dependencies

* Drag drop provider (finos#918)

* add DragDrop example, resume drag in DragProvider

* full flow for remote drag

* fix type issues

* fix post rebase conflicts, type issues

* ignore type issue in drag drop code for now, so packages build

* Filterbar styling (finos#919)

* improve the keyboards navigation in Toolbar

* fix form control styling, uennecessaryb layout rerenders, table resize bug

* make sure all table config setting changes are saved, style tweaks

* calculated columns

* fix dropdown width

* fix width of combo in SaveLayout Panel

* remove console.log

* fix bug in OverflowContainer when orientation vertical

* remove global error listener, leave this to cypress

* move test schemas out of showcase (finos#920)

* Update dependency electron to v22 [SECURITY] (finos#894)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* bump vite, vitest versions to latest (finos#921)

* Instrument picker (finos#923)

* make instrument-picker more generic

* refactor Table navigation, preparing for row highlighting

* fix broken import paths

* add empty inlined worker as vitext mocj fails otherwise

* reinstate ignore for inlined-wotker so stub file doesn't get overwritten (finos#924)

* disable basket functionality in showcase while we wait for full server (finos#925)

* disable basket functionality in showcase while we wait for server implementation

* remove console log

* fix styling of main tabs during drag (finos#929)

* wiring together calculated column pieces (finos#931)

* wiring together calculated column pieces

* remove logging

* re-enable all tests

* fix FilterTable resize bug (finos#932)

* move table height fix to measured container (finos#933)

* type fixes (finos#934)

* final styling for calculated column input (finos#935)

* connect filterbar to persistence (finos#936)

* connect filterbar to persistence

* skip test for missing TreeWalker finctionality until its there

* final adjustments to table column header styling (finos#937)

* move date generators to test data package (finos#938)

* Bump postcss from 8.4.27 to 8.4.31 in /vuu-ui (finos#926)

Bumps [postcss](https://github.com/postcss/postcss) from 8.4.27 to 8.4.31.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](postcss/postcss@8.4.27...8.4.31)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* finos#850 added for functionality to the rpc service, not ready for the big time yet, but not far off.

* finos#850 added ability to reference tables in separate modules.

* finos#850 refactored simul module to take prices out to prices module

* finos#850 refactored tableDefContainer to make it an implicit, otherwise it is re-used in the tests causing issues.

* finos#850 found a bug with basket constituents, not resolved as of this commit.

* finos#850 found a bug with basket constituents, not resolved as of this commit.

* Update basket tables UI (finos#940)

* update all basket tables, integrate basket server changes

* filter basket tables when loading

* connect cell editing

* remove console log

* fix newFeature story

* remove console log

* fix for dropdown width error

* remove console.log

* basket workflow (finos#941)

* Login panel (finos#942)

* login panel

* WIP

* tidy up type issues etc

* import fixes

* remove deprecated example

* finos#944 Added fix for threading related issue in ViewPortContainer.scala when change was called.

* finos#944 Reduced logging

* Switch UI to new Theme (finos#943)

* remove sample app

* rename basket trading app to sample-app

* fix broken inmports

* fix bugs persistning table settings

* 862 create a basketdesign table that represents the specific instance of a basket that we are modifying it will be based on a basket entry but can be customized to what the user needs (finos#948)

* finos#862 Fixed test versions to abstract out clock.

* finos#862 Added Viewport scoped rpc service to test.

* finos#862 Added ability to edit baskets join service.

* Fix minor UI issues (finos#949)

* fix UI dataTable issue - bugs after resize

A column resize operation populates the ColumnState state value. From
this point on columnState shadows modelColumns so subsequent changes
to modelColumns are not rendered.

* enable custom editors for cell renderers

Column Settings Panel allows a custom renderer to be selected.
Some renderers will have settings of their own. This enables
editors form those settings to be made available.

* fix type issue

* update baskets used in showcase examples to match server tables (finos#950)

* add initial support for columns backed by lookup tables (finos#951)

* move basket data generation into simulated vuu module to pave way for rpc support

* add updater for prices, insert for array data source

* create Table for test data in modules

* fix scrolling issue in table when focusing edit fields

* add initial support for table columns backed by lookup tables

* wire table cell editing to server calls (finos#953)

* Schema load sequence (finos#955)

* cache table meta requests with promise to avoid multiple server requests

* ensure table meta is loaded before client is notified of subcribe

table meta for all tables was being requested from server every
time any hook asked for the table data. This was happening twice
at startup. Now we cache the metadata.
If we didn't have table meta at point where CREATE_VP_SUCCESS was
handled, we notified client anyway. This caused tables to be rendered
with no type information, so alignment was wrong on numerics.

* fix all data tests

* Issue 850 added the first example module test for rpc services  (finos#954)

* finos#850 Refactored example code so that simulation is in its own module

* finos#850 Refactored example code into its own module

* finos#850 updated documentation

* finos#850 organized imports

* finos#850 added first consumer test outline

* finos#850 added ability to create viewport in test easily

* finos#850 added ability to create viewport in test easily

* finos#850 added first example working test calling viewport Rpc call.

* finos#850 renamed test case.

* finos#850 Added example flow for baskets

* finos#850 Added additional example for editRowAction

* finos#850 Added additional methods for editable example.

* finos#850 Added additional methods for editable example.

* finos#850 Added more functionality to the demo basket app.

* finos#850 Added thorough test of basket functionality.

* finos#850 Fixed test assert which accidentally changed contract in test.

* finos#850 Fixed test assert which accidentally changed contract in test.

* finos#850 Fixed test assert which accidentally changed contract in test.

* finos#850 fixed the bad pom definition.

* finos#850 deleted duplicate and not required config and updated semgrep.

* Release 0.9.20 beta (finos#956)

* [maven-release-plugin] prepare release vuu-parent-0.9.20-beta

* [maven-release-plugin] prepare for next development iteration

---------

Co-authored-by: GitHub Actions <[email protected]>

* finos#957 added all projects to release build. (finos#960)

* finos#957 added all projects to release build.

* finos#957 added all projects to release build.

* finos#957 added all projects to release build.

* Release 0.9.33 beta (finos#961)

* [maven-release-plugin] prepare release vuu-parent-0.9.33-beta

* [maven-release-plugin] prepare for next development iteration

---------

Co-authored-by: GitHub Actions <[email protected]>

* finos#957 fixed issue with javadoc. (finos#963)

* Release 0.9.35 beta (finos#964)

* [maven-release-plugin] prepare release vuu-parent-0.9.35-beta

* [maven-release-plugin] prepare for next development iteration

---------

Co-authored-by: GitHub Actions <[email protected]>

* enable context menu on basket constituents (finos#965)

* fix behaviour in baskets module in data-test

* fix pinned column rendering gap

* enable context menu in basket constituent table in basket feature

* remove console log

* Fix conflict resolutions

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: keikeicheung <[email protected]>
Co-authored-by: heswell <[email protected]>
Co-authored-by: Vasco <[email protected]>
Co-authored-by: harryhartley <[email protected]>
Co-authored-by: Luke Vincent <[email protected]>
Co-authored-by: Joe Dunleavy <[email protected]>
Co-authored-by: Joe Dunleavy <[email protected]>
Co-authored-by: Peter Ling <[email protected]>
Co-authored-by: pling-scottlogic <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: chris <[email protected]>
Co-authored-by: chrisjstevo <[email protected]>
Co-authored-by: GitHub Actions <[email protected]>
  • Loading branch information
15 people authored Nov 14, 2023
1 parent a863c9f commit eea27db
Show file tree
Hide file tree
Showing 176 changed files with 7,065 additions and 3,446 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/legal-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
java-version: 1.16
cache: maven
- name: Build with Maven
run: mvn clean install -Dmaven.test.skip=true
run: mvn clean install
- name: License report
run: mvn org.apache.maven.plugins:maven-site-plugin:3.12.1:site org.apache.maven.plugins:maven-project-info-reports-plugin:3.4.1:licenses -P legal-report

Expand All @@ -37,7 +37,7 @@ jobs:
- name: Install XQ
run: pip install xq
- name: Build with Maven
run: mvn clean install -Dmaven.test.skip=true
run: mvn clean install
- name: License XML report
run: mvn org.codehaus.mojo:license-maven-plugin:2.0.0:download-licenses
- name: Validate XML report
Expand Down
3 changes: 3 additions & 0 deletions .semgrepignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
.github/workflows/release-mvn-central.yml
vuu/src/main/resources/certs/key.pem
example/main/src/main/resources/certs/key.pem
example/main/src/main/resources/certs/cert.pem
vuu/src/main/resources/www/ws-example.html
example/order/src/main/scala/org/finos/vuu/provider/simulation/SimulatedBigInstrumentsProvider.scala
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
Expand Down
4 changes: 2 additions & 2 deletions benchmark/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.finos.vuu</groupId>
<artifactId>vuu-parent</artifactId>
<version>0.5.09-SNAPSHOT</version>
<version>0.9.36-SNAPSHOT</version>
</parent>

<properties>
Expand All @@ -22,7 +22,7 @@
<dependency>
<groupId>org.finos.vuu</groupId>
<artifactId>vuu</artifactId>
<version>0.5.09-SNAPSHOT</version>
<version>0.9.36-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion docs/getting_started/developing.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ cd vuu
#run the maven compile step
mvn compile
#cd into vuu, child in repo
cd vuu
cd example/main
#The server should now be started on your machine with Simulation module
mvn exec:exec
```
Expand Down
271 changes: 271 additions & 0 deletions example/basket/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,271 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.finos.vuu</groupId>
<artifactId>example</artifactId>
<version>0.9.36-SNAPSHOT</version>
</parent>

<artifactId>basket</artifactId>

<dependencies>
<dependency>
<groupId>org.finos.vuu</groupId>
<artifactId>vuu</artifactId>
<version>0.9.36-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.finos.vuu</groupId>
<artifactId>vuu</artifactId>
<version>0.9.36-SNAPSHOT</version>
<classifier>tests</classifier>
<type>test-jar</type>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.finos.vuu</groupId>
<artifactId>price</artifactId>
<version>0.9.36-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.finos.vuu</groupId>
<artifactId>order</artifactId>
<version>0.9.36-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>${scala.version}</version>
</dependency>

<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-reflect</artifactId>
<version>${scala.version}</version>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_2.13</artifactId>
<version>${scalatest.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
</exclusion>
<exclusion>
<groupId>org.scala-lang</groupId>
<artifactId>scala-reflect</artifactId>
</exclusion>
</exclusions>
</dependency>


</dependencies>

<profiles>

<profile>
<id>sign-it</id>
<activation>
<property>
<name>sign</name>
<value>true</value>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.0.1</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
<configuration>
<gpgArguments>
<arg>--pinentry-mode</arg>
<arg>loopback</arg>
</gpgArguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>

<profile>
<id>legal-report</id>
<reporting>
<plugins>
<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
<version>${maven.scala.plugin}</version>
<configuration>
<excludes>
<exclude>**/*.scala</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</reporting>
</profile>
</profiles>

<build>
<sourceDirectory>src/main/java</sourceDirectory>
<testSourceDirectory>src/test/java</testSourceDirectory>

<plugins>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>

<phase>compile</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<!--version>3.0.0-M4</version-->
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<source>${maven.compiler.source}</source>
<release>${maven.compiler.target}</release>
</configuration>
<dependencies>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>6.2</version> <!-- Use newer version of ASM -->
</dependency>

</dependencies>
</plugin>

<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
<version>${maven.scala.plugin}</version>
<executions>
<execution>
<goals>
<goal>compile</goal>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
<configuration>
<sourceDir>src/main/scala</sourceDir>
<testSourceDir>src/test/scala</testSourceDir>
<jvmArgs>
<jvmArg>-Xms64m</jvmArg>
<jvmArg>-Xmx1024m</jvmArg>
</jvmArgs>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>

<!-- disable surefire -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.7</version>
<configuration>
<!--skipTests>true</skipTests-->
</configuration>
</plugin>
<!-- enable scalatest -->
<plugin>
<groupId>org.scalatest</groupId>
<artifactId>scalatest-maven-plugin</artifactId>
<version>2.0.2</version>
<configuration>
<reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
<junitxml>.</junitxml>
<filereports>test-reports.txt</filereports>
</configuration>
<executions>
<execution>
<id>test</id>
<goals>
<goal>test</goal>
</goals>
</execution>
</executions>
</plugin>

</plugins>
</build>
<reporting>
<plugins>
<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
<version>${maven.scala.plugin}</version>
<configuration>
<scalaVersion>${scala.version}</scalaVersion>
</configuration>
</plugin>
</plugins>
</reporting>

</project>
2 changes: 2 additions & 0 deletions example/basket/src/main/java/Dummy4JavaDoc.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
public class Dummy4JavaDoc {
}
Loading

0 comments on commit eea27db

Please sign in to comment.