Merge pull request #84 from polypheny/refactor

Introduction of Allocationlayer, new Catalog/Snapshot Logic, PolyValues, new UI/UI-Logic and Various Refactorings

.github/workflows/publish-refactor.yml

@@ -0,0 +1,32 @@
+name: Publish refactor to DBIS Nexus
+
+on:
+  push:
+    branches:
+      - refactor
+
+jobs:
+  publish:
+    if: ${{ github.repository_owner == 'polypheny' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: 17
+      - name: Build with Gradle
+        run: ./gradlew --no-daemon build generatePom
+      - name: Publish JAR to DBIS Nexus
+        uses: sonatype-nexus-community/nexus-repo-github-action@master
+        with:
+          serverUrl: https://dbis-nexus.dmi.unibas.ch/
+          username: ${{ secrets.DBIS_NEXUS_USERNAME }}
+          password: ${{ secrets.DBIS_NEXUS_PASSWORD }}
+          format: maven2
+          repository: maven-snapshots
+          coordinates: groupId=org.polypheny artifactId=polypheny-ui version=2.0-SNAPSHOT
+          assets: extension=jar
+          filename: ./build/libs/polypheny-ui-2.0-SNAPSHOT.jar

.github/workflows/publish.yml

@@ -11,12 +11,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
-          distribution: 'zulu'
-          java-version: 8
+          distribution: 'temurin'
+          java-version: 17
       - name: Build with Gradle
         run: ./gradlew --no-daemon build generatePom
       - name: Publish JAR to DBIS Nexus

.gitignore

@@ -8,6 +8,7 @@
 
 # dependencies
 /node_modules
+.angular
 
 # IDEs and editors
 /.idea
@@ -27,6 +28,7 @@
 !.vscode/extensions.json
 
 # misc
+/.angular/cache
 /.sass-cache
 /connect.lock
 /coverage

README.md

@@ -1,6 +1,7 @@
 # Polypheny-UI
 
-_Polypheny-UI_ is a powerful and easy to use browser-based user interface for Polypheny. The UI is deployed together with Polypheny-DB and can (by default) be accessed via port 8080.
+_Polypheny-UI_ is a powerful and easy to use browser-based user interface for Polypheny. The UI is deployed together
+with Polypheny-DB and can (by default) be accessed via port 7659.
 
 
 ## Features ##
@@ -14,7 +15,6 @@ Polypheny-UI supports a wide range of features including:
 * Execute arbitrary queries
 * Analyze query execution
 * Graphically build query plans
-* Import and export data from [Polypheny-Hub](https://github.com/polypheny/Polypheny-Hub)
 * Explore-by-example based data exploration
 
 
@@ -33,4 +33,4 @@ Polypheny-UI is based on the beautiful [CoreUI](https://coreui.io/angular/) temp
 
 
 ## License ##
-The MIT License (MIT)
+The MIT License (MIT)

angular.json

@@ -9,8 +9,12 @@
       "projectType": "application",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:browser",
+          "builder": "@angular-builders/custom-webpack:browser",
           "options": {
+            "customWebpackConfig": {
+              "path": "./webpack.config.js",
+              "replaceDuplicatePlugins": true
+            },
             "allowedCommonJsDependencies": [
               "lodash",
               "jquery",
@@ -19,9 +23,13 @@
               "chart.js",
               "graphlib-dot",
               "dagre-d3",
-              "ansi_up"
+              "ansi_up",
+              "ace-builds",
+              "mobx",
+              "flatpickr",
+              "plyr",
+              "moment"
             ],
-            "aot": true,
             "outputPath": "dist",
             "index": "src/index.html",
             "main": "src/main.ts",
@@ -31,14 +39,17 @@
               "src/assets"
             ],
             "styles": [
+              "node_modules/@coreui/coreui/scss/coreui.scss",
+              "./node_modules/@coreui/coreui/scss/coreui.scss",
               "./node_modules/bootstrap/dist/css/bootstrap.min.css",
               "node_modules/@coreui/icons/css/free.css",
-              "node_modules/flag-icon-css/css/flag-icon.css",
+              "node_modules/flag-icons/css/flag-icons.css",
               "node_modules/font-awesome/css/font-awesome.css",
               "node_modules/simple-line-icons/css/simple-line-icons.css",
               "src/scss/style.scss",
               "node_modules/flatpickr/dist/flatpickr.min.css",
               "node_modules/plyr/dist/plyr.css",
+              "node_modules/@ali-hm/angular-tree-component/css/angular-tree-component.css",
               "node_modules/katex/dist/katex.min.css",
               "node_modules/prismjs/themes/prism-okaidia.css"
             ],
@@ -48,18 +59,24 @@
               ]
             },
             "scripts": [
-              "node_modules/chart.js/dist/Chart.min.js",
-              "node_modules/katex/dist/katex.min.js",
-              "node_modules/prismjs/prism.js",
-              "node_modules/prismjs/components/prism-css.min.js",
-              "node_modules/prismjs/components/prism-cypher.min.js",
-              "node_modules/prismjs/components/prism-python.min.js",
-              "node_modules/prismjs/components/prism-sql.min.js",
-              "node_modules/prismjs/components/prism-java.min.js",
-              "node_modules/prismjs/components/prism-mongodb.min.js",
-              "node_modules/prismjs/components/prism-bash.min.js",
-              "node_modules/prismjs/components/prism-markdown.min.js"
-            ]
+              "node_modules/chart.js/dist/chart.min.js",
+                "node_modules/katex/dist/katex.min.js",
+                "node_modules/prismjs/prism.js",
+                "node_modules/prismjs/components/prism-css.min.js",
+                "node_modules/prismjs/components/prism-cypher.min.js",
+                "node_modules/prismjs/components/prism-python.min.js",
+                "node_modules/prismjs/components/prism-sql.min.js",
+                "node_modules/prismjs/components/prism-java.min.js",
+                "node_modules/prismjs/components/prism-mongodb.min.js",
+                "node_modules/prismjs/components/prism-bash.min.js",
+                "node_modules/prismjs/components/prism-markdown.min.js"
+            ],
+            "vendorChunk": true,
+            "extractLicenses": false,
+            "buildOptimizer": false,
+            "sourceMap": true,
+            "optimization": false,
+            "namedChunks": true
           },
           "configurations": {
             "production": {
@@ -72,9 +89,7 @@
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
-              "extractCss": true,
               "namedChunks": false,
-              "aot": true,
               "extractLicenses": true,
               "vendorChunk": false,
               "buildOptimizer": true,
@@ -85,23 +100,24 @@
                 }
               ]
             }
-          }
+          },
+          "defaultConfiguration": ""
         },
         "serve": {
-          "builder": "@angular-devkit/build-angular:dev-server",
+          "builder": "@angular-builders/custom-webpack:dev-server",
           "options": {
-            "browserTarget": "ng:build"
+            "buildTarget": "ng:build"
           },
           "configurations": {
             "production": {
-              "browserTarget": "ng:build:production"
+              "buildTarget": "ng:build:production"
             }
           }
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "browserTarget": "ng:build"
+            "buildTarget": "ng:build"
           }
         },
         "test": {
@@ -112,11 +128,11 @@
             "polyfills": "src/polyfills.ts",
             "tsConfig": "src/tsconfig.spec.json",
             "scripts": [
-              "node_modules/chart.js/dist/Chart.min.js"
+              "node_modules/chart.js/dist/chart.min.js"
             ],
             "styles": [
               "./node_modules/bootstrap/dist/css/bootstrap.min.css",
-              "node_modules/flag-icon-css/css/flag-icon.css",
+              "node_modules/flag-icons/css/flag-icon.css",
               "node_modules/font-awesome/css/font-awesome.css",
               "node_modules/simple-line-icons/css/simple-line-icons.css",
               "src/scss/style.scss"
@@ -131,18 +147,6 @@
               "src/favicon.ico"
             ]
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "src/tsconfig.app.json",
-              "src/tsconfig.spec.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
         }
       }
     },
@@ -157,22 +161,10 @@
             "protractorConfig": "./protractor.conf.js",
             "devServerTarget": "ng:serve"
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "e2e/tsconfig.e2e.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
         }
       }
     }
   },
-  "defaultProject": "ng",
   "schematics": {
     "@schematics/angular:component": {
       "prefix": "app",
@@ -184,7 +176,6 @@
       "skipTests": true
     },
     "@schematics/angular:module": {
-      "skipTests": true
     },
     "@schematics/angular:service": {
       "skipTests": true

build.gradle

@@ -1,44 +1,23 @@
 
-group 'org.polypheny'
-description = "The user interface for Polypheny-DB"
-
-def versionMajor = 1
-def versionMinor = 0
-def versionQualifier = "-SNAPSHOT"
-version = versionMajor + "." + versionMinor + versionQualifier
-
-
-buildscript {
-    repositories {
-        mavenCentral()
-        maven {
-            url "https://plugins.gradle.org/m2/"
-        }
-    }
-    dependencies {
-		classpath "com.github.node-gradle:gradle-node-plugin:3.0.1"
-    }
+plugins {
+  id "java"
+  id "maven-publish"
+  id "com.github.node-gradle.node" version "7.0.1"
 }
 
 
-repositories {
-
-}
-
-
-apply plugin: 'java'
-apply plugin: 'maven-publish'
-apply plugin: 'com.github.node-gradle.node'
-
-
+group 'org.polypheny'
+description = 'The user interface for Polypheny-DB'
 
-dependencies {
 
-}
+def versionMajor = 2
+def versionMinor = 0
+def versionQualifier = "-SNAPSHOT"
+version = versionMajor + "." + versionMinor + versionQualifier
 
 
 node {
-  version = '16.3.0'
+  version = '20.11.0'
   //npmVersion = '6.14.11'
   download = true
 }
@@ -79,8 +58,8 @@ task generatePom(group: 'publishing', dependsOn: "generatePomFileFor${project.na
 
 
 task licenseReport(type: NpxTask) {
-  command = 'license-checker'
-  args = ['--json']
+  command = 'license-checker-rseidelsohn'
+  args = ['--json', '--production', '--files', 'build/reports/licenses/files', '--out', 'build/reports/licenses/licenseReport.json']
 }