Pg warehouse

.dockerignore

@@ -0,0 +1 @@
+client

.gitattributes

@@ -0,0 +1 @@
+* text eol=lf

.github/workflows/01-dockerize.yml

@@ -2,12 +2,35 @@ name: Dockerize
 
 on:
   pull_request:
-    branches:
-      - main
 
 jobs:
+  # run tests before dockerizing
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.head_ref }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: geovbot
+          password: ${{ secrets.GEOVBOT_READ_WRITE_PACKAGES }}
+
+      # run database integration and unit tests
+      - name: run database tests
+        run: |
+          cd database
+          chmod -R 777 logs
+          export POSTGRES_PORT=5432
+          bash test.sh -i -u -p
+
   set-version:
     runs-on: ubuntu-latest
+    needs: [test]
     if: github.event_name == 'pull_request'
     outputs:
       version_tag: ${{steps.npm_version.outputs.tag}}
@@ -31,8 +54,8 @@ jobs:
         if: always()
         with:
           webhook: ${{ secrets.DISCORD_GITHUB_CHANNEL_WEBHOOK }}
-          title: "Dockerize Toolbox Server and Client"
-          description: "PR: ${{ steps.pull_request.outputs.number }}"
+          title: 'Dockerize Toolbox Server and Client'
+          description: 'PR: ${{ steps.pull_request.outputs.number }}'
           color: 0xffed2b
           username: GitHub Actions
 
@@ -46,8 +69,8 @@ jobs:
 
       - uses: actions/setup-node@v2
         with:
-          node-version: "16.13.2"
-          registry-url: "https://registry.npmjs.org"
+          node-version: '16.13.2'
+          registry-url: 'https://registry.npmjs.org'
 
       - name: Tag this commit with pr
         id: npm_version
@@ -61,11 +84,11 @@ jobs:
         run: echo your tag is '${{steps.npm_version.outputs.tag}}'
 
       - name: Update Lock file
-        run: "npm i --package-lock-only"
+        run: 'npm i --package-lock-only'
 
       - uses: EndBug/add-and-commit@v5
         with:
-          message: "chore(): update prerelease version"
+          message: 'chore(): update prerelease version'
           tag: v${{steps.npm_version.outputs.tag}}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -97,9 +120,9 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           # Location of Dockerfile, if not Dockerfile in root directory
-          file: server/webserver.dockerfile
+          file: webserver.dockerfile
           # Directory to run `docker build` from, if not project root
-          context: server
+          context: .
           push: true
           tags: ghcr.io/geovistory/toolbox-server:${{needs.set-version.outputs.version_tag}}
 
@@ -108,8 +131,8 @@ jobs:
         if: always()
         with:
           webhook: ${{ secrets.DISCORD_GITHUB_CHANNEL_WEBHOOK }}
-          title: "Dockerize Toolbox Server > Done"
-          description: "Image Tag: ${{needs.set-version.outputs.version_tag}}"
+          title: 'Dockerize Toolbox Server > Done'
+          description: 'Image Tag: ${{needs.set-version.outputs.version_tag}}'
           color: 0x0000ff
           username: GitHub Actions
 
@@ -125,12 +148,12 @@ jobs:
 
       - uses: actions/setup-node@v2
         with:
-          node-version: "16.13.2"
-          registry-url: "https://registry.npmjs.org"
+          node-version: '16.13.2'
+          registry-url: 'https://registry.npmjs.org'
 
       - name: Setup version info
         id: setup_version
-        run: "npm --prefix client run setup:version"
+        run: 'npm --prefix client run setup:version'
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -160,7 +183,7 @@ jobs:
         if: always()
         with:
           webhook: ${{ secrets.DISCORD_GITHUB_CHANNEL_WEBHOOK }}
-          title: "Dockerize Toolbox Client > Done"
-          description: "Image Tag: ${{needs.set-version.outputs.version_tag}}"
+          title: 'Dockerize Toolbox Client > Done'
+          description: 'Image Tag: ${{needs.set-version.outputs.version_tag}}'
           color: 0x0000ff
           username: GitHub Actions

.vscode/settings.json

@@ -1,8 +1,12 @@
 {
   "git.autofetch": true,
-  "editor.formatOnSave": true,
+  "editor.formatOnSave": false,
   "editor.codeActionsOnSave": {
     "source.organizeImports": "explicit",
     "source.fixAll": "explicit"
   },
+  "sqltools.format": {
+    "linesBetweenQueries": 2,
+    "language": "pl/sql"
+  }
 }

client/apps/app-toolbox/src/app/components/editor/add-entity-or-value-dialog/add-entity-or-value-dialog.component.ts

@@ -139,7 +139,7 @@ export class AddEntityOrValueDialogComponent implements OnDestroy, OnInit {
 
     this.selectedInProject$ = this.state.data.war.entityPreview.getEntityPreview.byProjectIdPkEntity$(this.pkProject, d.pkEntity).pipe(
       filter(item => !!item),
-      map(item => item.project_id !== 0),
+      map(item => item.fk_project !== 0),
       startWith(false)
     )
 

client/apps/app-toolbox/src/app/components/editor/add-statement-dialog/add-statement-dialog.component.ts

@@ -336,7 +336,7 @@ export class AddStatementDialogComponent implements OnInit, OnDestroy {
     this.ap.streamEntityPreview(d.pkEntity)
 
     this.selectedInProject$ = this.state.data.war.entityPreview.getEntityPreview.byProjectIdPkEntity$(this.pkProject, d.pkEntity).pipe(
-      map(item => item?.project_id !== 0),
+      map(item => item?.fk_project !== 0),
       startWith(false)
     )
 

client/apps/app-toolbox/src/app/components/editor/ctrl-entity/ctrl-entity-dialog/ctrl-entity-dialog.component.ts

@@ -157,7 +157,7 @@ export class CtrlEntityDialogComponent implements OnDestroy, OnInit {
 
     this.selectedInProject$ = this.state.data.war.entityPreview.getEntityPreview.byProjectIdPkEntity$(this.pkProject, d.pkEntity).pipe(
       filter(item => !!item),
-      map(item => item.project_id !== 0),
+      map(item => item.fk_project !== 0),
       startWith(false)
     )
 

client/apps/app-toolbox/src/app/components/editor/ctrl-entity/ctrl-entity.component.ts

@@ -179,7 +179,7 @@ export class CtrlEntityComponent implements OnDestroy,
               class_label: label,
               entity_type: type,
               pk_entity: undefined,
-              project_id: undefined,
+              fk_project: undefined,
             }
             return e
           })

client/apps/app-toolbox/src/app/components/editor/search-existing-entity/search-existing-entity.component.ts

@@ -147,7 +147,7 @@ export class SearchExistingEntityComponent implements OnInit, OnDestroy {
       map(([resp, selected]) => {
         const res: EntitySearchHit[] = resp.data;
         const hits: EntityAddExistingHit[] = res.map(r => {
-          const isInProject = r.project_id !== 0;
+          const isInProject = r.fk_project !== 0;
           const confirmBtnDisabled = (this.disableIfHasStatement && r.related_statements.length >= this.disableIfHasStatement.maxQuantity);
           const confirmBtnTooltip = confirmBtnDisabled ?
             `This ${r.class_label} can't be selected because it is already related to ${r.related_statements.length} ${this.disableIfHasStatement.sourceClassLabel} via '${this.disableIfHasStatement.propertyLabel}'.`

client/apps/app-toolbox/src/app/components/editor/view-field-body/view-field-body.component.ts

@@ -141,7 +141,7 @@ export class ViewFieldBodyComponent implements OnInit, OnDestroy {
      * For UX-Performance: trigger field load with limit 0 to get the total count of statements
      * in that field (without the need to query nested fields)
      */
-    this.loadFieldCount(until$);
+    //this.loadFieldCount(until$);
 
     const page$ = pagination$.pipe(
       delay(0),

client/apps/app-toolbox/src/app/components/editor/view-field-item-class-info/view-field-item-class-info.component.html

@@ -1,11 +1,11 @@
 <!-- MENU FOR CLASS INFO -->
 <mat-menu #classInfoMenu="matMenu">
-  <button mat-menu-item [disabled]="(preview$|async)?.project_id === 0"
+  <button mat-menu-item [disabled]="(preview$|async)?.fk_project === 0"
     (click)="item.component.openInNewTabFromEntity(resource)">
     <mat-icon>tab</mat-icon>
     Open {{classLabel}} in new Tab
   </button>
-  <button mat-menu-item *ngIf="(preview$|async)?.project_id === 0"
+  <button mat-menu-item *ngIf="(preview$|async)?.fk_project === 0"
     (click)="item.component.addAndOpenInNewTabFromEntity(resource)">
     <mat-icon>add</mat-icon>
     Add {{classLabel}} to project and open

client/apps/app-toolbox/src/app/components/layout/left-drawer/components/entity-search-hit/entity-search-hit.component.ts

@@ -50,7 +50,7 @@ export class EntitySearchHitComponent implements OnInit {
   ngOnInit() {
     this.projectsCount = this.hit.projects ? this.hit.projects.length : undefined;
 
-    if (this.hit.project_id > 0) {
+    if (this.hit.fk_project > 0) {
       this.isInProject = true;
     } else {
       this.repositorySearch = true;
@@ -59,7 +59,7 @@ export class EntitySearchHitComponent implements OnInit {
 
     this.entityPreview = {
       pk_entity: this.hit.pk_entity,
-      project_id: this.hit.project_id,
+      fk_project: this.hit.fk_project,
       fk_class: this.hit.fk_class,
       entity_label: this.hit.entity_label,
       entity_type: this.hit.entity_type,

client/apps/app-toolbox/src/app/components/misc/core-table/filter/filter.component.html

@@ -1,25 +1,25 @@
-<ng-content></ng-content>
-
-<mat-menu #filterMenu="matMenu">
-  <div
-    class="container"
-    (click)="$event.stopPropagation()"
-    (keyup)="$event.stopPropagation()"
-    (keydown)="$event.stopPropagation()"
-  >
-    <mat-form-field>
-      <mat-select [formControl]="operation">
-        <mat-option *ngFor="let op of operations" [value]="op">
-          {{ op.text }}
-        </mat-option>
-      </mat-select>
-    </mat-form-field>
-    <mat-form-field *ngIf="needsFilter">
-      <input matInput [formControl]="filter" />
-    </mat-form-field>
-  </div>
-</mat-menu>
-
-<span class="trigger" [matMenuTriggerFor]="filterMenu">
-  <mat-icon>filter_list</mat-icon>
-</span>
+<ng-content></ng-content>
+
+<mat-menu #filterMenu="matMenu">
+  <div
+    class="container"
+    (click)="$event.stopPropagation()"
+    (keyup)="$event.stopPropagation()"
+    (keydown)="$event.stopPropagation()"
+  >
+    <mat-form-field>
+      <mat-select [formControl]="operation">
+        <mat-option *ngFor="let op of operations" [value]="op">
+          {{ op.text }}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
+    <mat-form-field *ngIf="needsFilter">
+      <input matInput [formControl]="filter" />
+    </mat-form-field>
+  </div>
+</mat-menu>
+
+<span class="trigger" [matMenuTriggerFor]="filterMenu">
+  <mat-icon>filter_list</mat-icon>
+</span>

client/apps/app-toolbox/src/app/components/misc/core-table/filter/filter.component.scss

@@ -1,35 +1,35 @@
-:host {
-  display: flex;
-  align-items: center;
-}
-
-.trigger {
-  color: rgba(0, 0, 0, 0.3);
-  cursor: pointer;
-  display: flex;
-  margin-left: 4px;
-  opacity: 0;
-  transform: translateY(-5px);
-
-  transition-duration: 0.2s;
-  transition-property: opacity, transform;
-
-  :host.has-value & {
-    color: rgba(0, 0, 0, 0.54);
-  }
-
-  :host:hover &,
-  :host.show-trigger & {
-    opacity: 1;
-    transform: translateY(-1px);
-  }
-}
-
-.container {
-  padding: 0 16px;
-
-  mat-form-field {
-    margin: -8px 0;
-    width: 100%;
-  }
-}
+:host {
+  display: flex;
+  align-items: center;
+}
+
+.trigger {
+  color: rgba(0, 0, 0, 0.3);
+  cursor: pointer;
+  display: flex;
+  margin-left: 4px;
+  opacity: 0;
+  transform: translateY(-5px);
+
+  transition-duration: 0.2s;
+  transition-property: opacity, transform;
+
+  :host.has-value & {
+    color: rgba(0, 0, 0, 0.54);
+  }
+
+  :host:hover &,
+  :host.show-trigger & {
+    opacity: 1;
+    transform: translateY(-1px);
+  }
+}
+
+.container {
+  padding: 0 16px;
+
+  mat-form-field {
+    margin: -8px 0;
+    width: 100%;
+  }
+}

client/apps/app-toolbox/src/app/components/misc/core-table/menu/menu.component.html

@@ -1,10 +1,10 @@
-<mat-menu #menu="matMenu">
-  <button mat-menu-item (click)="clear.next()">
-    <mat-icon style="margin-top: -3px">clear</mat-icon>
-    <span>Clear filters</span>
-  </button>
-</mat-menu>
-
-<button class="clear" mat-icon-button [matMenuTriggerFor]="menu">
-  <mat-icon>more_vert</mat-icon>
-</button>
+<mat-menu #menu="matMenu">
+  <button mat-menu-item (click)="clear.next()">
+    <mat-icon style="margin-top: -3px">clear</mat-icon>
+    <span>Clear filters</span>
+  </button>
+</mat-menu>
+
+<button class="clear" mat-icon-button [matMenuTriggerFor]="menu">
+  <mat-icon>more_vert</mat-icon>
+</button>

client/apps/app-toolbox/src/app/components/misc/core-table/menu/menu.component.scss

@@ -1,9 +1,9 @@
-:host {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
-
-mat-icon {
-  margin-top: -2px;
-}
+:host {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+mat-icon {
+  margin-top: -2px;
+}