Skip to content

Commit d9feda5

Browse files
mazarijurajmazarijuraj
authored
Merge pull request #30 from netgrif/next
Release 2.1.0
2 parents 71a3a66 + e17a8b6 commit d9feda5

222 files changed

Lines changed: 2541 additions & 1469 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ Thumbs.db
5151
.scannerwork/
5252
out/
5353
package-lock.json
54+
pnpm-lock.yaml
5455
### JetBrains template
5556
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
5657
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

‎nae.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
"urls": {
106106
"netgrif": "https://netgrif.com",
107107
"bpmn2pn": "https://bpmn2pn.netgrif.cloud/bpmn2pn/",
108-
"engine": "https://demo.netgrif.com/",
108+
"engine": "https://etask.netgrif.cloud/",
109109
"youtube": "https://www.youtube.com/channel/UCNfqgnjskMMpy7QvOOKhKgw",
110110
"github": "https://github.com/netgrif",
111111
"issues": "https://github.com/netgrif/application-builder/issues"

‎package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@netgrif/application-builder",
3-
"version": "2.0.0",
3+
"version": "2.1.0",
44
"description": "Netgrif Application Builder for building, configuring and modeling applications for Application Engine.",
55
"homepage": "https://builder.netgrif.com",
66
"license": "SEE LICENSE IN LICENSE FILE",
@@ -58,9 +58,9 @@
5858
"@mdi/font": "^7.4.47",
5959
"@netgrif/components": "7.0.0-beta.1",
6060
"@netgrif/components-core": "7.0.0-beta.1",
61-
"@netgrif/petri.svg": "1.1.0",
62-
"@netgrif/petriflow": "2.2.0",
63-
"@netgrif/petriflow.svg": "1.1.0",
61+
"@netgrif/petri.svg": "1.1.1",
62+
"@netgrif/petriflow": "2.2.2",
63+
"@netgrif/petriflow.svg": "1.1.1",
6464
"@ngbracket/ngx-layout": "^17.0.1",
6565
"@ngx-translate/core": "~15.0.0",
6666
"@ngx-translate/http-loader": "~8.0.0",

‎src/app/app-builder-view.service.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import {ConfigurationService, LoggerService, ViewService} from '@netgrif/components-core';
2-
import {Router} from '@angular/router';
31
import {Injectable} from '@angular/core';
2+
import {Router} from '@angular/router';
3+
import {ConfigurationService, LoggerService, ViewService} from '@netgrif/components-core';
44

55
@Injectable({
66
providedIn: 'root',

‎src/app/app-routing.module.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { NgModule } from '@angular/core';
2-
import {RouterModule, Routes} from '@angular/router';
31
import {CommonModule} from '@angular/common';
2+
import {NgModule} from '@angular/core';
3+
import {RouterModule, Routes} from '@angular/router';
44

55
const routes: Routes = [];
66

‎src/app/app.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
text="{{tutorial.demo.text}}"
1212
stepPosition="{{tutorial.demo.position}}"
1313
(click)="openInTab(config.services.urls.engine)"
14-
matTooltip="Netgrif Demo" matTooltipPosition="right">
14+
matTooltip="Netgrif eTask" matTooltipPosition="right">
1515
<mat-icon>play_arrow</mat-icon>
1616
</mat-list-item>
1717
<mat-list-item class="field-list-mat-list-item"

‎src/app/app.component.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,4 +87,4 @@
8787
padding-right: 9px;
8888
height: 42px;
8989
}
90-
}
90+
}

‎src/app/app.component.spec.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
import {waitForAsync, TestBed} from '@angular/core/testing';
2-
import {AppComponent} from './app.component';
1+
import {HttpClientTestingModule} from '@angular/common/http/testing';
2+
import {NO_ERRORS_SCHEMA} from '@angular/core';
3+
import {TestBed, waitForAsync} from '@angular/core/testing';
4+
import {FlexLayoutModule} from '@angular/flex-layout';
5+
import {MatListModule} from '@angular/material/list';
36
import {BrowserModule} from '@angular/platform-browser';
47
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
5-
import {MaterialImportModule} from './material-import/material-import.module';
6-
import {FlexLayoutModule} from '@angular/flex-layout';
7-
import {FormBuilderModule} from './form-builder/form-builder.module';
88
import {RouterTestingModule} from '@angular/router/testing';
9-
import {MatListModule} from '@angular/material/list';
10-
import {JoyrideModule} from 'ngx-joyride';
119
import {AuthenticationModule, ConfigurationService} from '@netgrif/components-core';
10+
import {JoyrideModule} from 'ngx-joyride';
1211
import {AppBuilderConfigurationService} from './app-builder-configuration.service';
13-
import {HttpClientTestingModule} from '@angular/common/http/testing';
12+
import {AppComponent} from './app.component';
1413
import {AppModule} from './app.module';
15-
import {NO_ERRORS_SCHEMA} from '@angular/core';
14+
import {FormBuilderModule} from './form-builder/form-builder.module';
15+
import {MaterialImportModule} from './material-import/material-import.module';
1616

1717
describe('AppComponent', () => {
1818
beforeEach(waitForAsync(() => {

‎src/app/app.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ import {AfterViewInit, Component, HostListener} from '@angular/core';
22
import {MatDialog} from '@angular/material/dialog';
33
import {Router} from '@angular/router';
44
import {NetgrifApplicationEngine} from '@netgrif/components-core/';
5+
import {JoyrideService} from 'ngx-joyride';
56
import {AppBuilderConfigurationService} from './app-builder-configuration.service';
67
import {DialogConfirmComponent} from './dialogs/dialog-confirm/dialog-confirm.component';
78
import {
8-
DialogLocalStorageModelComponent,
9+
DialogLocalStorageModelComponent,
910
} from './dialogs/dialog-local-storage-model/dialog-local-storage-model.component';
1011
import {ModelImportService} from './modeler/model-import-service';
1112
import {ModelerConfig} from './modeler/modeler-config';
1213
import {MortgageService} from './modeler/mortgage.service';
1314
import {ModelService} from './modeler/services/model/model.service';
1415
import {TutorialService} from './tutorial/tutorial-service';
15-
import {JoyrideService} from 'ngx-joyride';
1616

1717
@Component({
1818
selector: 'nab-root',

‎src/app/app.module.ts‎

Lines changed: 37 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,50 @@
1-
import {BrowserModule, DomSanitizer} from '@angular/platform-browser';
1+
import {CommonModule, NgOptimizedImage} from '@angular/common';
22
import {NgModule} from '@angular/core';
3-
import {AppComponent} from './app.component';
3+
import {MAT_FORM_FIELD_DEFAULT_OPTIONS} from '@angular/material/form-field';
4+
import {MatIconRegistry} from '@angular/material/icon';
5+
import {MatPaginatorIntl} from '@angular/material/paginator';
6+
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
7+
import {BrowserModule, DomSanitizer} from '@angular/platform-browser';
48
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
5-
import {MaterialImportModule} from './material-import/material-import.module';
6-
import {FormBuilderModule} from './form-builder/form-builder.module';
79
import {RouterModule, Routes} from '@angular/router';
8-
import {FormBuilderComponent} from './form-builder/form-builder.component';
9-
import {ModelerComponent} from './modeler/modeler.component';
10-
import {ModelerModule} from './modeler/modeler.module';
11-
import {EditModeComponent} from './modeler/edit-mode/edit-mode.component';
12-
import {DataModeComponent} from './modeler/data-mode/data-mode.component';
13-
import {RoleModeComponent} from './modeler/role-mode/role-mode.component';
14-
import {ActionsModeComponent} from './modeler/actions-mode/actions-mode.component';
15-
import {MatIconRegistry} from '@angular/material/icon';
10+
import {TaskContentComponentModule} from '@netgrif/components';
11+
import {AuthenticationMethodService, ConfigurationService, NullAuthenticationService} from '@netgrif/components-core';
12+
import {ExportService, ImportService} from '@netgrif/petriflow';
13+
import {JoyrideModule} from 'ngx-joyride';
1614
import {environment} from '../environments/environment';
15+
import {AppBuilderConfigurationService} from './app-builder-configuration.service';
16+
import {AppRoutingModule} from './app-routing.module';
17+
import {AppComponent} from './app.component';
18+
import {DialogArcEditComponent} from './dialogs/dialog-arc-edit/dialog-arc-edit.component';
19+
import {DialogChangeDataComponent} from './dialogs/dialog-change-data/dialog-change-data.component';
1720
import {DialogConfirmComponent} from './dialogs/dialog-confirm/dialog-confirm.component';
18-
import {DialogRefactorComponent} from './dialogs/dialog-refactor/dialog-refactor.component';
19-
import {DialogErrorsComponent} from './dialogs/dialog-errors/dialog-errors.component';
20-
import {ExportService, ImportService} from '@netgrif/petriflow';
21-
import {SelectedTransitionService} from './modeler/selected-transition.service';
22-
import {I18nModeComponent} from './modeler/i18n-mode/i18n-mode.component';
2321
import {DialogDeadNetComponent} from './dialogs/dialog-dead-net/dialog-dead-net.component';
24-
import {AppRoutingModule} from './app-routing.module';
25-
import {DialogPlaceRefDeleteComponent} from './dialogs/dialog-place-ref-delete/dialog-place-ref-delete.component';
26-
import {DialogPlaceEditComponent} from './dialogs/dialog-place-edit/dialog-place-edit.component';
2722
import {DialogDeleteModelComponent} from './dialogs/dialog-delete-model/dialog-delete-model.component';
28-
import {DialogArcEditComponent} from './dialogs/dialog-arc-edit/dialog-arc-edit.component';
29-
import {DialogTransitionEditComponent} from './dialogs/dialog-transition-edit/dialog-transition-edit.component';
30-
import {SimulationModeComponent} from './modeler/simulation-mode/simulation-mode.component';
23+
import {DialogErrorsComponent} from './dialogs/dialog-errors/dialog-errors.component';
3124
import {
32-
DialogLocalStorageModelComponent
25+
DialogLocalStorageModelComponent,
3326
} from './dialogs/dialog-local-storage-model/dialog-local-storage-model.component';
34-
import {HistoryModeComponent} from './modeler/history-mode/history-mode.component';
35-
import {DialogChangeDataComponent} from './dialogs/dialog-change-data/dialog-change-data.component';
27+
import {DialogMarkingChangeComponent} from './dialogs/dialog-marking-change/dialog-marking-change.component';
3628
import {DialogModelEditComponent} from './dialogs/dialog-model-edit/dialog-model-edit.component';
37-
import {MaterialIconPickerComponent} from './modeler/components/material-icon-picker/material-icon-picker.component';
38-
import {CommonModule, NgOptimizedImage} from '@angular/common';
39-
import {MAT_FORM_FIELD_DEFAULT_OPTIONS} from '@angular/material/form-field';
40-
import {TaskContentComponentModule} from '@netgrif/components';
41-
import {JoyrideModule} from 'ngx-joyride';
42-
import {AuthenticationMethodService, ConfigurationService, NullAuthenticationService} from '@netgrif/components-core';
43-
import {AppBuilderConfigurationService} from './app-builder-configuration.service';
44-
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
45-
import {MatPaginatorIntl} from '@angular/material/paginator';
29+
import {DialogPlaceEditComponent} from './dialogs/dialog-place-edit/dialog-place-edit.component';
30+
import {DialogPlaceRefDeleteComponent} from './dialogs/dialog-place-ref-delete/dialog-place-ref-delete.component';
31+
import {DialogRefactorComponent} from './dialogs/dialog-refactor/dialog-refactor.component';
32+
import {DialogTransitionEditComponent} from './dialogs/dialog-transition-edit/dialog-transition-edit.component';
33+
import {FormBuilderComponent} from './form-builder/form-builder.component';
34+
import {FormBuilderModule} from './form-builder/form-builder.module';
35+
import {MaterialImportModule} from './material-import/material-import.module';
36+
import {ActionsModeComponent} from './modeler/actions-mode/actions-mode.component';
4637
import {BuilderPaginatorIntl} from './modeler/components/master-detail/main-master/builder-paginator-inpl';
38+
import {MaterialIconPickerComponent} from './modeler/components/material-icon-picker/material-icon-picker.component';
39+
import {DataModeComponent} from './modeler/data-mode/data-mode.component';
40+
import {EditModeComponent} from './modeler/edit-mode/edit-mode.component';
41+
import {HistoryModeComponent} from './modeler/history-mode/history-mode.component';
42+
import {I18nModeComponent} from './modeler/i18n-mode/i18n-mode.component';
43+
import {ModelerComponent} from './modeler/modeler.component';
44+
import {ModelerModule} from './modeler/modeler.module';
45+
import {RoleModeComponent} from './modeler/role-mode/role-mode.component';
46+
import {SelectedTransitionService} from './modeler/selected-transition.service';
47+
import {SimulationModeComponent} from './modeler/simulation-mode/simulation-mode.component';
4748

4849
const appRoutes: Routes = [
4950
{
@@ -77,6 +78,7 @@ const appRoutes: Routes = [
7778
DialogModelEditComponent,
7879
MaterialIconPickerComponent,
7980
DialogLocalStorageModelComponent,
81+
DialogMarkingChangeComponent
8082
],
8183
imports: [
8284
BrowserModule,

0 commit comments

Comments
 (0)