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.

Sign up for GitHub

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

Sync mains (pull) #107

Merged
merged 51 commits into from
Nov 14, 2023
Merged

Sync mains (pull) #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
9f78c50
#900 disable failing test
keikeicheung Oct 17, 2023
79f7190
Merge pull request #910 from keikeicheung/main
keikeicheung Oct 17, 2023
4131a4b
Update check on viewport and context menu (#913)
heswell Oct 18, 2023
f68ef1c
Tidy package and type issues (#914)
heswell Oct 18, 2023
b09a523
Layout Management (#916)
vferraro-scottlogic Oct 18, 2023
09ea1af
add Layout Management Provider to sample apps (#917)
heswell Oct 18, 2023
f4255bd
Drag drop provider (#918)
heswell Oct 19, 2023
b96066d
Filterbar styling (#919)
heswell Oct 22, 2023
c189ec0
move test schemas out of showcase (#920)
heswell Oct 22, 2023
a745b49
Update dependency electron to v22 [SECURITY] (#894)
renovate[bot] Oct 23, 2023
1108a5f
bump vite, vitest versions to latest (#921)
heswell Oct 23, 2023
674dde2
Instrument picker (#923)
heswell Oct 23, 2023
ee5d06a
reinstate ignore for inlined-wotker so stub file doesn't get overwrit…
heswell Oct 23, 2023
177deb7
disable basket functionality in showcase while we wait for full serve…
heswell Oct 24, 2023
ba1c0af
fix styling of main tabs during drag (#929)
heswell Oct 24, 2023
39cf5c0
wiring together calculated column pieces (#931)
heswell Oct 26, 2023
eeaed14
fix FilterTable resize bug (#932)
heswell Oct 27, 2023
aefab9b
move table height fix to measured container (#933)
heswell Oct 27, 2023
e2470d6
type fixes (#934)
heswell Oct 27, 2023
84a4770
final styling for calculated column input (#935)
heswell Oct 27, 2023
2e450d9
connect filterbar to persistence (#936)
heswell Oct 27, 2023
3cd0826
final adjustments to table column header styling (#937)
heswell Oct 27, 2023
211fbf9
move date generators to test data package (#938)
heswell Oct 27, 2023
b1b95aa
Bump postcss from 8.4.27 to 8.4.31 in /vuu-ui (#926)
dependabot[bot] Oct 27, 2023
8322b7d
#850 added for functionality to the rpc service, not ready for the bi…
chrisjstevo Oct 26, 2023
460b7f4
#850 added ability to reference tables in separate modules.
chrisjstevo Oct 29, 2023
ab48cf1
#850 refactored simul module to take prices out to prices module
chrisjstevo Oct 29, 2023
8275aeb
#850 refactored tableDefContainer to make it an implicit, otherwise i…
chrisjstevo Oct 29, 2023
5bdb34e
#850 found a bug with basket constituents, not resolved as of this co…
chrisjstevo Oct 29, 2023
a0fde7d
#850 found a bug with basket constituents, not resolved as of this co…
chrisjstevo Oct 29, 2023
f2dbf70
Update basket tables UI (#940)
heswell Oct 30, 2023
fbeb82a
basket workflow (#941)
heswell Oct 31, 2023
12a5ff9
Login panel (#942)
heswell Nov 1, 2023
bfebfd7
#944 Added fix for threading related issue in ViewPortContainer.scala…
chrisjstevo Nov 1, 2023
e55617d
#944 Reduced logging
chrisjstevo Nov 1, 2023
76d1ad2
Switch UI to new Theme (#943)
heswell Nov 4, 2023
3e272a6
862 create a basketdesign table that represents the specific instance…
chrisjstevo Nov 5, 2023
bf96238
Fix minor UI issues (#949)
heswell Nov 7, 2023
5389536
update baskets used in showcase examples to match server tables (#950)
heswell Nov 7, 2023
cba592b
add initial support for columns backed by lookup tables (#951)
heswell Nov 8, 2023
3f5b47d
wire table cell editing to server calls (#953)
heswell Nov 10, 2023
8e9ffff
Schema load sequence (#955)
heswell Nov 12, 2023
f9e76db
Issue 850 added the first example module test for rpc services (#954)
chrisjstevo Nov 13, 2023
a261699
Release 0.9.20 beta (#956)
chrisjstevo Nov 13, 2023
debb9a3
#957 added all projects to release build. (#960)
chrisjstevo Nov 13, 2023
faf05e7
Release 0.9.33 beta (#961)
chrisjstevo Nov 13, 2023
918c551
#957 fixed issue with javadoc. (#963)
chrisjstevo Nov 13, 2023
631b394
Release 0.9.35 beta (#964)
chrisjstevo Nov 13, 2023
8753c6f
enable context menu on basket constituents (#965)
heswell Nov 14, 2023
2c305f7
Merge remote-tracking branch 'upstream/main' into sync-mains
cfisher-scottlogic Nov 14, 2023
ea0e97a
Fix conflict resolutions
cfisher-scottlogic Nov 14, 2023
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
4 changes: 2 additions & 2 deletions .github/workflows/legal-report.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
public class Dummy4JavaDoc {
}
Loading
Loading