Merge pull request #6 from netgrif/next

Release 1.1.0
netgrif · Nov 5, 2023 · 13765ba · 13765ba
2 parents 66112ae + 719f362
commit 13765ba
Show file tree

Hide file tree

Showing 68 changed files with 1,621 additions and 1,167 deletions.
diff --git a/.github/workflows/master-build.yml b/.github/workflows/master-build.yml
@@ -9,13 +9,13 @@ jobs:
         name: Build
         runs-on: ubuntu-latest
         steps:
-            -   uses: actions/checkout@v2
+            -   uses: actions/checkout@v3
                 with:
                     fetch-depth: 0
-            -   name: Use Node.js 16
-                uses: actions/setup-node@v2
+            -   name: Use Node.js 18
+                uses: actions/setup-node@v3
                 with:
-                    node-version: 16
+                    node-version: 18
             -   run: |
                     npm i --legacy-peer-deps
                     cd projects/petri-svg
@@ -49,7 +49,7 @@ jobs:
                     cp -r projects/petri-svg/docs/* docs/petri.svg/
                     cp -r projects/petriflow-svg/docs/* docs/petriflow.svg/
                     cp -r dist/example-app/* docs/
-            -   uses: EndBug/add-and-commit@v8
+            -   uses: EndBug/add-and-commit@v9
                 with:
                     add: docs
                     pathspec_error_handling: exitImmediately

diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
@@ -7,13 +7,13 @@ jobs:
         name: Test
         runs-on: ubuntu-latest
         steps:
-            -   uses: actions/checkout@v2
+            -   uses: actions/checkout@v3
                 with:
                     fetch-depth: 0
-            -   uses: actions/setup-node@v2
-                name: Use Node.js 16
+            -   uses: actions/setup-node@v3
+                name: Use Node.js 18
                 with:
-                    node-version: 16
+                    node-version: 18
             -   run: |
                     npm i --legacy-peer-deps
                     cd projects/petri-svg

diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
@@ -6,10 +6,10 @@ jobs:
     build:
         runs-on: ubuntu-latest
         steps:
-            -   uses: actions/checkout@v2
-            -   uses: actions/setup-node@v2
+            -   uses: actions/checkout@v3
+            -   uses: actions/setup-node@v3
                 with:
-                    node-version: 16
+                    node-version: 18
             -   name: Build & test libraries
                 run: |
                     npm i --legacy-peer-deps
@@ -27,10 +27,10 @@ jobs:
         needs: build
         runs-on: ubuntu-latest
         steps:
-            -   uses: actions/checkout@v2
-            -   uses: actions/setup-node@v2
+            -   uses: actions/checkout@v3
+            -   uses: actions/setup-node@v3
                 with:
-                    node-version: 16
+                    node-version: 18
                     registry-url: https://registry.npmjs.org/
             -   run: |
                     npm i --legacy-peer-deps
@@ -60,10 +60,10 @@ jobs:
             contents: read
             packages: write
         steps:
-            -   uses: actions/checkout@v2
-            -   uses: actions/setup-node@v2
+            -   uses: actions/checkout@v3
+            -   uses: actions/setup-node@v3
                 with:
-                    node-version: 16
+                    node-version: 18
                     registry-url: https://npm.pkg.github.com
             -   run: |
                     npm i --legacy-peer-deps

diff --git a/.gitignore b/.gitignore
@@ -247,7 +247,6 @@ Thumbs.db
 
 # Sonar bullshit
 .scannerwork/
-out/
 /.npmrc
 **/package-lock.json
 

diff --git a/LICENSE → LICENSE.txt b/LICENSE → LICENSE.txt
@@ -175,18 +175,7 @@
 
    END OF TERMS AND CONDITIONS
 
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2022 NETGRIF,s.r.o.
+   Copyright 2023 NETGRIF,s.r.o.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/localbuild.sh b/localbuild.sh
@@ -0,0 +1,26 @@
+# Build & test libraries
+npm i --legacy-peer-deps
+cd projects/petri-svg || exit
+npm i
+cd ../..
+npm run petrisvg:build
+npm run petrisvg:test:full
+npm i ./dist/petri-svg --save-optional --legacy-peer-deps
+npm run petriflowsvg:build
+npm run petriflowsvg:test:full
+npm i ./dist/petriflow-svg --save-optional --legacy-peer-deps
+npm run example:build:prod
+npm i --legacy-peer-deps
+cd projects/petri-svg || exit
+npm i
+cd ../..
+# Build petri.svg
+npm run petrisvg:build
+npm i ./dist/petri-svg --save-optional --legacy-peer-deps
+cd dist/petri-svg || exit
+npm publish --registry http://localhost:4873
+cd ../..
+# Build petriflow.svg
+npm run petriflowsvg:build
+cd dist/petriflow-svg || exit
+npm publish --registry http://localhost:4873
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@netgrif/petriflow.svg-project",
-    "version": "1.0.0",
+    "version": "1.1.0",
     "description": "Netgrif Petriflow SVG example for drawing of the Petri Net SVG elements.",
     "homepage": "https://netgrif.github.io/petriflow.svg",
     "repository": {
@@ -42,6 +42,7 @@
         "petriflowsvg:doc": "typedoc --tsconfig projects/petriflow-svg/tsconfig.lib.json --entryPoints projects/petriflow-svg/src/lib/public-api.ts --exclude **/*.spec.* --out projects/petriflow-svg/docs --theme default",
         "example:build:prod": "ng build example-app --configuration production --base-href /petriflow.svg/",
         "example:start": "ng serve example-app",
+        "project:start": "npm run petrisvg:build:local && npm run petriflowsvg:build:local && npm run example:build:prod && npm run example:start",
         "ng-high-memory": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng serve"
     },
     "private": true,
@@ -63,6 +64,7 @@
         "@mdi/font": "~7.0.96",
         "@ngx-translate/core": "~13.0.0",
         "@ngx-translate/http-loader": "~6.0.0",
+        "@panzoom/panzoom": "~4.5.1",
         "@types/mousetrap": "1.6.3",
         "angular-gridster2": "~14.1.1",
         "angular-resizable-element": "~6.0.0",
@@ -76,7 +78,6 @@
         "ngx-joyride": "~2.5.0",
         "ngx-monaco-editor": "~12.0.0",
         "ngx-quill": "~18.0.0",
-        "panzoom": "~9.4.3",
         "quill": "~1.3.7",
         "rxjs": "~7.5.6",
         "tslib": "~2.4.0",

diff --git a/projects/example-app/src/app/app.component.html b/projects/example-app/src/app/app.component.html
@@ -1,12 +1,15 @@
 <mat-toolbar fxLayout="row" class="app-container mat-toolbar mat-toolbar-single-row">
     <mat-toolbar-row fxFlex>
         <mat-icon id="netgrif-icon" svgIcon="netgrif_logo"></mat-icon>
-        <mat-button-toggle-group [value]="_mode" fxLayoutAlign="start end">
+        <mat-button-toggle-group [(ngModel)]="_mode" fxLayoutAlign="start end">
             <mat-button-toggle mat-button [value]="canvasMode.SELECT" (click)="changeCanvasMode(canvasMode.SELECT)">
+                <mat-icon svgIcon="cursor-default-outline"></mat-icon>
+            </mat-button-toggle>
+            <mat-button-toggle mat-button [value]="canvasMode.PANNING" (click)="changeCanvasMode(canvasMode.PANNING)">
                 <mat-icon>open_with</mat-icon>
             </mat-button-toggle>
             <mat-button-toggle mat-button [value]="canvasMode.LASSO"
-                               (click)="changeCanvasMode(canvasMode.LASSO, false)">
+                               (click)="changeCanvasMode(canvasMode.LASSO)">
                 <mat-icon>tab_unselected</mat-icon>
             </mat-button-toggle>
             <mat-button-toggle mat-button [value]="canvasMode.CREATE_TRANSITION"
@@ -42,6 +45,9 @@
             <mat-button-toggle mat-button (click)="openDialog()">
                 <mat-icon>info</mat-icon>
             </mat-button-toggle>
+            <mat-button-toggle mat-button (click)="petriflowCanvasService.gridOnOff()">
+                <mat-icon>clear</mat-icon>
+            </mat-button-toggle>
             <mat-button-toggle mat-button id="reset-zoom-button" (click)="resetPanZoom()">
                 <mat-icon>clear</mat-icon>
             </mat-button-toggle>
@@ -68,5 +74,6 @@
     </mat-toolbar-row>
 </mat-toolbar>
 <div class="outer">
-    <petriflow-svg-canvas class="canvas"></petriflow-svg-canvas>
+    <petriflow-svg-canvas class="canvas" [panzoomConfiguration]="panzoomConfiguration"
+                          [gridConfiguration]="petriflowCanvasService.gridConfiguration"></petriflow-svg-canvas>
 </div>
diff --git a/projects/example-app/src/app/app.component.scss b/projects/example-app/src/app/app.component.scss
@@ -8,20 +8,14 @@
     background-color: map-get($netgrif-blue, 600);;
 }
 
-.canvas {
-    width: 10000px;
-    height: 10000px;
-}
-
 .inner {
     display: block;
 }
 
 .outer {
     display: flex;
-    overflow: scroll;
-    min-height: 100%;
-
+    height: inherit;
+    width: inherit;
 }
 
 .link-icon-button {