Skip to content

[NAE-1862] Frontend update #186

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

Open
wants to merge 2 commits into
base: release/8.0.0
Choose a base branch
from
Open

[NAE-1862] Frontend update #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aab88d3
[NAE-1862] Frontend update
renczesstefan Apr 15, 2023
1525893
[NAE-1862] Frontend update
renczesstefan Apr 24, 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
6 changes: 3 additions & 3 deletions docs/compodoc/components-core/coverage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@






<ol class="breadcrumb">
Expand Down Expand Up @@ -7088,7 +7088,7 @@
<tr class="low">
<td>
<!-- miscellaneous -->
<a href="./interfaces/DataFieldResource.html">projects/netgrif-components-core/src/lib/task-content/model/resource-interface.ts</a>
<a href="./interfaces/DataFieldResource.html">projects/netgrif-components-core/src/lib/task-content/model/resource-interfaces.ts</a>
</td>
<td>interface</td>
<td>DataFieldResource</td>
Expand Down Expand Up @@ -9133,7 +9133,7 @@ <h1 class="search-results-title">No results matching "<span class='search-query'

<script src="./js/libs/custom-elements.min.js"></script>
<script src="./js/libs/lit-html.js"></script>

<script type="module" src="./js/menu-wc.js" defer></script>
<script nomodule src="./js/menu-wc_es5.js" defer></script>

Expand Down
52 changes: 26 additions & 26 deletions docs/compodoc/components-core/interfaces/DataFieldResource.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<h3>File</h3>
</p>
<p class="comment">
<code>projects/netgrif-components-core/src/lib/task-content/model/resource-interface.ts</code>
<code>projects/netgrif-components-core/src/lib/task-content/model/resource-interfaces.ts</code>
</p>


Expand All @@ -84,156 +84,156 @@ <h6><b>Properties</b></h6>
<ul class="index-list">
<li>
<span class="modifier">Optional</span>
<a href="#allowedNets"
<a href="#allowedNets"
>
allowedNets
</a>
</li>
<li>
<a href="#behavior"
<a href="#behavior"
>
behavior
</a>
</li>
<li>
<span class="modifier">Optional</span>
<a href="#choices"
<a href="#choices"
>
choices
</a>
</li>
<li>
<span class="modifier">Optional</span>
<a href="#component"
<a href="#component"
>
component
</a>
</li>
<li>
<span class="modifier">Optional</span>
<a href="#defaultValue"
<a href="#defaultValue"
>
defaultValue
</a>
</li>
<li>
<span class="modifier">Optional</span>
<a href="#description"
<a href="#description"
>
description
</a>
</li>
<li>
<span class="modifier">Optional</span>
<a href="#filterMetadata"
<a href="#filterMetadata"
>
filterMetadata
</a>
</li>
<li>
<span class="modifier">Optional</span>
<a href="#formatFilter"
<a href="#formatFilter"
>
formatFilter
</a>
</li>
<li>
<span class="modifier">Optional</span>
<a href="#formatting"
<a href="#formatting"
>
formatting
</a>
</li>
<li>
<span class="modifier">Optional</span>
<a href="#layout"
<a href="#layout"
>
layout
</a>
</li>
<li>
<span class="modifier">Optional</span>
<a href="#minDate"
<a href="#minDate"
>
minDate
</a>
</li>
<li>
<span class="modifier">Optional</span>
<a href="#minValue"
<a href="#minValue"
>
minValue
</a>
</li>
<li>
<a href="#name"
<a href="#name"
>
name
</a>
</li>
<li>
<span class="modifier">Optional</span>
<a href="#options"
<a href="#options"
>
options
</a>
</li>
<li>
<a href="#order"
<a href="#order"
>
order
</a>
</li>
<li>
<span class="modifier">Optional</span>
<a href="#parentTaskId"
<a href="#parentTaskId"
>
parentTaskId
</a>
</li>
<li>
<span class="modifier">Optional</span>
<a href="#placeholder"
<a href="#placeholder"
>
placeholder
</a>
</li>
<li>
<span class="modifier">Optional</span>
<a href="#roles"
<a href="#roles"
>
roles
</a>
</li>
<li>
<a href="#stringId"
<a href="#stringId"
>
stringId
</a>
</li>
<li>
<span class="modifier">Optional</span>
<a href="#subType"
<a href="#subType"
>
subType
</a>
</li>
<li>
<a href="#type"
<a href="#type"
>
type
</a>
</li>
<li>
<span class="modifier">Optional</span>
<a href="#validations"
<a href="#validations"
>
validations
</a>
</li>
<li>
<span class="modifier">Optional</span>
<a href="#value"
<a href="#value"
>
value
</a>
Expand Down Expand Up @@ -1144,7 +1144,7 @@ <h3 id="inputs">Properties</h3>
</div>






Expand Down Expand Up @@ -1172,7 +1172,7 @@ <h1 class="search-results-title">No results matching "<span class='search-query'

<script src="../js/libs/custom-elements.min.js"></script>
<script src="../js/libs/lit-html.js"></script>

<script type="module" src="../js/menu-wc.js" defer></script>
<script nomodule src="../js/menu-wc_es5.js" defer></script>

Expand Down
25 changes: 17 additions & 8 deletions projects/nae-example-app/src/app/doc/case-view/case-view.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,12 @@ import {
defaultCaseSearchCategoriesFactory,
NAE_BASE_FILTER,
AllowedNetsServiceFactory,
AllowedNetsService, UserFilterConstants, TaskSetDataRequestFields
AllowedNetsService,
UserFilterConstants,
DataSet,
FieldTypeResource,
DataFieldResource,
DataFieldValue
} from '@netgrif/components-core';
import {HeaderComponent} from '@netgrif/components';

Expand Down Expand Up @@ -50,7 +55,7 @@ export class CaseViewComponent extends AbstractCaseViewComponent implements Afte

@ViewChild('header') public caseHeaderComponent: HeaderComponent;

additionalFilterData: TaskSetDataRequestFields;
additionalFilterData: DataSet;

constructor(caseViewService: CaseViewService, @Optional() overflowService: OverflowService) {
super(caseViewService, overflowService, undefined, {
Expand All @@ -61,12 +66,16 @@ export class CaseViewComponent extends AbstractCaseViewComponent implements Afte
createCaseButtonIcon: 'home'
}
});
this.additionalFilterData = {
[UserFilterConstants.ORIGIN_VIEW_ID_FIELD_ID]: {
type: 'text',
value: 'override'
}
};
this.additionalFilterData = { fields :
{
[UserFilterConstants.ORIGIN_VIEW_ID_FIELD_ID]: {
type: FieldTypeResource.TEXT,
value: {
value: 'override'
} as DataFieldValue
} as DataFieldResource
}
} as DataSet;
}

ngAfterViewInit(): void {
Expand Down
2 changes: 1 addition & 1 deletion projects/nae-example-app/src/app/doc/tree-view-example/tree-view-example.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export class TreeViewExampleComponent {
};
this._caseResource.createCase(newCaseRequest).subscribe(newCase => {
this.filter = new SimpleFilter('id', FilterType.CASE, {
query: 'stringId:' + (newCase.outcome as CreateCaseEventOutcome).aCase.stringId
query: 'stringId:' + (newCase.outcome as CreateCaseEventOutcome).case.stringId
});
this.loading = false;
});
Expand Down
10 changes: 5 additions & 5 deletions projects/netgrif-components-core/src/lib/authorization/permission/permission.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export class PermissionService {
constructor(protected userComparator: UserComparatorService, protected _userService: UserService) {
}

public hasTaskPermission(task: Task | undefined, permission: string): boolean {
public hasTaskPermission(task: Task | undefined, permission: PermissionType): boolean {
if (!task) {
return false;
}
Expand All @@ -25,7 +25,7 @@ export class PermissionService {
return this.resolvePermissions(rolePermValue, userPermValue);
}

public hasCasePermission(case_: Case | undefined, permission: string): boolean {
public hasCasePermission(case_: Case | undefined, permission: PermissionType): boolean {
if (!case_) {
return false;
}
Expand All @@ -39,7 +39,7 @@ export class PermissionService {
return userPermValue === undefined ? (!!rolePermValue) : userPermValue;
}

public hasNetPermission(action: string, net: PetriNetReferenceWithPermissions): boolean {
public hasNetPermission(action: PermissionType, net: PetriNetReferenceWithPermissions): boolean {
if (!net
|| !net.permissions
|| !action
Expand Down Expand Up @@ -93,7 +93,7 @@ export class PermissionService {
&& task.assignPolicy === AssignPolicy.manual;
}

public checkRolePerms(roles: Permissions, permission: string): boolean | undefined {
public checkRolePerms(roles: Permissions, permission: PermissionType): boolean | undefined {
let rolePermValue: boolean;
if (!!roles) {
Object.keys(roles).forEach(role => {
Expand All @@ -105,7 +105,7 @@ export class PermissionService {
return rolePermValue;
}

public checkUserPerms(users: UserPermissions, permission): boolean | undefined {
public checkUserPerms(users: UserPermissions, permission: PermissionType): boolean | undefined {
let userPermValue: boolean;
if (!!users) {
const loggedUserId = this._userService.user.getSelfOrImpersonated().id;
Expand Down
2 changes: 1 addition & 1 deletion ...if-components-core/src/lib/event/model/event-outcomes/case-outcomes/case-event-outcome.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ import {Case} from '../../../../resources/interface/case';

export interface CaseEventOutcome extends PetriNetEventOutcome {

aCase: Case;
case: Case;
}
3 changes: 2 additions & 1 deletion ...ts-core/src/lib/event/model/event-outcomes/data-outcomes/get-data-groups-event-outcome.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import {DataGroup} from '../../../../resources/interface/data-groups';
import {TaskEventOutcome} from '../task-outcomes/task-event-outcome';
import {DataGroupResource} from "../../../../task-content/model/resource-interfaces";

export interface GetDataGroupsEventOutcome extends TaskEventOutcome {

data: Array<DataGroup>;
data: Array<DataGroupResource>;
}
3 changes: 2 additions & 1 deletion ...omponents-core/src/lib/event/model/event-outcomes/data-outcomes/set-data-event-outcome.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import {ChangedFieldContainer} from '../../../../resources/interface/changed-field-container';
import {TaskEventOutcome} from '../task-outcomes/task-event-outcome';
import {DataSet} from "../../../../resources/interface/task-data-sets";

export interface SetDataEventOutcome extends TaskEventOutcome {

changedFields: ChangedFieldContainer;
changedFields: DataSet;
}
Loading