Skip to content

Commit 8edc169

Browse files
renemadsenrenemadsen
committed
Merge branch 'masudul-tikweb-master'
2 parents 70f5b2a + fdf0fde commit 8edc169

File tree

9 files changed

+178
-143
lines changed

9 files changed

+178
-143
lines changed

‎eform-client/cypress/e2e/c/navigation-menu.delete-item.spec.cy.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ describe('Navigation menu - Delete item', function () {
1818

1919
navigationMenuPage.getMenuItems().its('length').then(initialCount => {
2020
navigationMenuPage.collapseTemplates(1);
21-
21+
2222
navigationMenuPage.createCustomDropdown(dropdown);
2323

2424
// Create 2 items from templates menu
@@ -52,12 +52,12 @@ describe('Navigation menu - Delete item', function () {
5252
navigationMenuPage.getMenuItems().its('length').then(menuItemsCount => {
5353
// Get count of elements in dropdown
5454
navigationMenuPage.getDropdownBodyChilds(menuItemsCount - 1).its('length').then(dropdownCount => {
55-
55+
5656
// Delete 3 elements from dropdown
5757
navigationMenuPage.deleteElementFromDropdown(menuItemsCount - 1, 0);
5858
navigationMenuPage.deleteElementFromDropdown(menuItemsCount - 1, 0);
5959
navigationMenuPage.deleteElementFromDropdown(menuItemsCount - 1, 0);
60-
60+
6161
cy.intercept('POST', '**/api/navigation-menu').as('saveMenu1');
6262
navigationMenuPage.clickSaveMenuBtn();
6363
cy.wait('@saveMenu1', { timeout: 30000 });
@@ -68,10 +68,10 @@ describe('Navigation menu - Delete item', function () {
6868
// Delete menu items
6969
navigationMenuPage.deleteElementFromMenuItems(0);
7070
navigationMenuPage.deleteElementFromMenuItems(0); // delete 2 template elements
71-
71+
7272
navigationMenuPage.getMenuItems().its('length').then(currentCount => {
7373
navigationMenuPage.deleteElementFromMenuItems(currentCount - 1); // delete created dropdown
74-
74+
7575
cy.intercept('POST', '**/api/navigation-menu').as('saveMenu2');
7676
navigationMenuPage.clickSaveMenuBtn();
7777
cy.wait('@saveMenu2', { timeout: 30000 });

‎eform-client/src/app/common/modules/eform-shared/components/eform-tree-view-picker/eform-tree-view-picker.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<small class="microting-uid">({{ node.microtingUId }})</small>
3737
<ng-container *ngIf="showActions">
3838
<button mat-icon-button [matMenuTriggerFor]="menu">
39-
<mat-icon>more_horiz</mat-icon>
39+
<mat-icon>more_vert</mat-icon>
4040
</button>
4141
<mat-menu #menu="matMenu">
4242
<ng-container *ngIf="showCreateAction">
@@ -83,7 +83,7 @@
8383
<small class="microting-uid">({{ node.microtingUId }})</small>
8484
<ng-container *ngIf="showActions">
8585
<button mat-icon-button [matMenuTriggerFor]="menu">
86-
<mat-icon>more_horiz</mat-icon>
86+
<mat-icon>more_vert</mat-icon>
8787
</button>
8888
<mat-menu #menu="matMenu">
8989
<ng-container *ngIf="showCreateAction">

‎eform-client/src/app/modules/advanced/advanced.module.ts‎

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -37,30 +37,34 @@ import {MatInputModule} from '@angular/material/input';
3737
import {MtxSelectModule} from '@ng-matero/extensions/select';
3838
import {MatSlideToggleModule} from '@angular/material/slide-toggle';
3939
import {MatChipsModule} from '@angular/material/chips';
40+
import {MatMenu, MatMenuItem, MatMenuTrigger} from "@angular/material/menu";
4041

4142
@NgModule({
42-
imports: [
43-
AdvancedRoutingModule,
44-
CommonModule,
45-
TranslateModule,
46-
EformSharedModule,
47-
NgSelectModule,
48-
FormsModule,
49-
EformImportedModule,
50-
ReactiveFormsModule,
51-
EformSharedTagsModule,
52-
MatSortModule,
53-
MatCardModule,
54-
MatIconModule,
55-
MatButtonModule,
56-
MatTooltipModule,
57-
MtxGridModule,
58-
MatDialogModule,
59-
MatInputModule,
60-
MtxSelectModule,
61-
MatSlideToggleModule,
62-
MatChipsModule,
63-
],
43+
imports: [
44+
AdvancedRoutingModule,
45+
CommonModule,
46+
TranslateModule,
47+
EformSharedModule,
48+
NgSelectModule,
49+
FormsModule,
50+
EformImportedModule,
51+
ReactiveFormsModule,
52+
EformSharedTagsModule,
53+
MatSortModule,
54+
MatCardModule,
55+
MatIconModule,
56+
MatButtonModule,
57+
MatTooltipModule,
58+
MtxGridModule,
59+
MatDialogModule,
60+
MatInputModule,
61+
MtxSelectModule,
62+
MatSlideToggleModule,
63+
MatChipsModule,
64+
MatMenu,
65+
MatMenuItem,
66+
MatMenuTrigger,
67+
],
6468
declarations: [
6569
EntitySearchComponent,
6670
EntitySelectComponent,

‎eform-client/src/app/modules/advanced/components/entity-search/entity-search/entity-search.component.html‎

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -45,37 +45,43 @@
4545
(sortChange)="sortTable($event)">
4646
</mtx-grid>
4747
<ng-template #microtingUUIDTpl let-row let-i="index">
48-
<div class="entitySearchMUid" id="entitySearchMUid">{{row.microtingUUID}}</div>
48+
<div class="entitySearchMUid" id="entitySearchMUid">{{ row.microtingUUID }}</div>
4949
</ng-template>
5050
<ng-template #entitySelectNameTpl let-row let-i="index">
51-
<div class="entitySearchName" id="entitySearchName">{{row.name}}</div>
51+
<div class="entitySearchName" id="entitySearchName">{{ row.name }}</div>
5252
</ng-template>
5353
<ng-template #entitySelectDescriptionTpl let-row let-i="index">
54-
<div class="entitySelectDescription" id="entitySelectDescription">{{row.description}}</div>
54+
<div class="entitySelectDescription" id="entitySelectDescription">{{ row.description }}</div>
5555
</ng-template>
5656

57-
58-
<ng-template #actionsTpl let-row>
59-
<div *ngIf="(selectCurrentUserClaimsEntitySearchDelete$ | async) || (selectCurrentUserClaimsEntitySearchUpdate$ | async)">
60-
<button
61-
mat-icon-button
62-
id="entitySearchUpdateBtn"
63-
matTooltip="{{ 'Edit' | translate }}"
64-
[disabled]="(selectCurrentUserClaimsEntitySearchUpdate$ | async) === false"
65-
[routerLink]="['/advanced/entity-search/edit/' + row.microtingUUID]"
66-
>
67-
<mat-icon>edit</mat-icon>
68-
</button>
69-
<button
70-
mat-icon-button
71-
color="warn"
72-
id="entitySearchDeleteBtn"
73-
(click)="openModalSearchRemove(row)"
74-
matTooltip="{{ 'Remove' | translate }}"
75-
[disabled]="(selectCurrentUserClaimsEntitySearchDelete$ | async) === false || row.isLocked"
76-
>
77-
<mat-icon>delete</mat-icon>
57+
<ng-template #actionsTpl let-row let-i="index">
58+
<div id="action-items-{{i}}"
59+
*ngIf="(selectCurrentUserClaimsEntitySearchDelete$ | async) || (selectCurrentUserClaimsEntitySearchUpdate$ | async)">
60+
<button id="actionMenu" mat-icon-button [matMenuTriggerFor]="menu" matTooltip="{{ 'Actions' | translate }}">
61+
<mat-icon>more_vert</mat-icon>
7862
</button>
63+
64+
<mat-menu #menu="matMenu">
65+
<button
66+
mat-menu-item
67+
id="entitySearchUpdateBtn-{{i}}"
68+
[disabled]="(selectCurrentUserClaimsEntitySearchUpdate$ | async) === false"
69+
[routerLink]="['/advanced/entity-search/edit/' + row.microtingUUID]"
70+
>
71+
<mat-icon>edit</mat-icon>
72+
<span>{{ 'Edit' | translate }}</span>
73+
</button>
74+
75+
<button
76+
mat-menu-item
77+
id="entitySearchDeleteBtn-{{i}}"
78+
(click)="openModalSearchRemove(row)"
79+
[disabled]="(selectCurrentUserClaimsEntitySearchDelete$ | async) === false || row.isLocked"
80+
>
81+
<mat-icon color="warn">delete</mat-icon>
82+
<span>{{ 'Remove' | translate }}</span>
83+
</button>
84+
</mat-menu>
7985
</div>
8086
</ng-template>
8187

‎eform-client/src/app/modules/advanced/components/entity-select/entity-select/entity-select.component.html‎

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -44,29 +44,34 @@
4444
[sortDirection]="selectEntitySelectIsSortDsc$ | async"
4545
(sortChange)="sortTable($event)">
4646
</mtx-grid>
47-
<ng-template #actionsTpl let-row>
48-
<div *ngIf="(selectCurrentUserClaimsEntitySelectDelete$ | async) || (selectCurrentUserClaimsEntitySelectUpdate$ | async)">
49-
<button
50-
class="entitySelectEditBtn"
51-
mat-icon-button
52-
id="entitySelectEditBtn"
53-
matTooltip="{{ 'Edit' | translate }}"
54-
[disabled]="(selectCurrentUserClaimsEntitySelectUpdate$ | async) === false"
55-
[routerLink]="['/advanced/entity-select/edit/' + row.microtingUUID]"
56-
>
57-
<mat-icon>edit</mat-icon>
58-
</button>
59-
<button
60-
class="entitySelectDeleteBtn"
61-
mat-icon-button
62-
color="warn"
63-
id="entitySelectDeleteBtn"
64-
(click)="openModalSelectRemove(row)"
65-
matTooltip="{{ 'Remove' | translate }}"
66-
[disabled]="(selectCurrentUserClaimsEntitySelectDelete$ | async) === false || row.isLocked"
67-
>
68-
<mat-icon>delete</mat-icon>
47+
48+
<ng-template #actionsTpl let-row let-i="index">
49+
<div id="action-items-{{i}}" *ngIf="(selectCurrentUserClaimsEntitySelectDelete$ | async) || (selectCurrentUserClaimsEntitySelectUpdate$ | async)">
50+
<button id="actionMenu" mat-icon-button [matMenuTriggerFor]="menu" matTooltip="{{ 'Actions' | translate }}">
51+
<mat-icon>more_vert</mat-icon>
6952
</button>
53+
54+
<mat-menu #menu="matMenu">
55+
<button
56+
mat-menu-item
57+
id="entitySelectEditBtn-{{i}}"
58+
[disabled]="(selectCurrentUserClaimsEntitySelectUpdate$ | async) === false"
59+
[routerLink]="['/advanced/entity-select/edit/' + row.microtingUUID]"
60+
>
61+
<mat-icon>edit</mat-icon>
62+
<span>{{ 'Edit' | translate }}</span>
63+
</button>
64+
65+
<button
66+
mat-menu-item
67+
id="entitySelectDeleteBtn-{{i}}"
68+
(click)="openModalSelectRemove(row)"
69+
[disabled]="(selectCurrentUserClaimsEntitySelectDelete$ | async) === false || row.isLocked"
70+
>
71+
<mat-icon color="warn">delete</mat-icon>
72+
<span>{{ 'Remove' | translate }}</span>
73+
</button>
74+
</mat-menu>
7075
</div>
7176
</ng-template>
7277

‎eform-client/src/app/modules/advanced/components/units/units.component.html‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<!-- {{ 'Create unit' | translate }}-->
1010
<!-- </button>-->
1111
<!--</eform-new-subheader>-->
12-
<br />
12+
<br/>
1313
<!--Here you can choose approach as you like: container-row, or flex, or just element with required styles and markup-->
1414

1515

@@ -61,16 +61,23 @@
6161
disabled="true"
6262
></mat-slide-toggle>
6363
</ng-template>
64-
<ng-template #actionsTpl let-row let-index="index">
65-
<div>
66-
<button
67-
mat-icon-button
68-
color="warn"
69-
id="moveBtn_{{ index }}"
70-
matTooltip="{{ 'Move unit' | translate }}"
71-
(click)="openMoveModal(row)"
72-
>
73-
<mat-icon>trolley</mat-icon>
64+
65+
<ng-template #actionsTpl let-row let-i="index">
66+
<div class="device-user-actions" id="action-items-{{i}}">
67+
<button id="actionMenu" mat-icon-button [matMenuTriggerFor]="menu" matTooltip="{{ 'Actions' | translate }}">
68+
<mat-icon>more_vert</mat-icon>
7469
</button>
70+
71+
<mat-menu #menu="matMenu">
72+
<button
73+
mat-menu-item
74+
id="moveBtn_{{i}}"
75+
(click)="openMoveModal(row)"
76+
>
77+
<mat-icon color="warn">trolley</mat-icon>
78+
<span>{{ 'Move unit' | translate }}</span>
79+
</button>
80+
</mat-menu>
7581
</div>
7682
</ng-template>
83+

‎eform-client/src/app/modules/eforms/components/eforms-page/eforms-page.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@
236236
<mat-icon>edit</mat-icon>
237237
</a>
238238
<button mat-icon-button [matMenuTriggerFor]="menu">
239-
<mat-icon>more_horiz</mat-icon>
239+
<mat-icon>more_vert</mat-icon>
240240
</button>
241241
<mat-menu #menu="matMenu">
242242
<button

‎eform-client/src/app/modules/plugins-management/components/installed/installed-plugins-page/installed-plugins-page.component.html‎

Lines changed: 49 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<eform-new-subheader>
2-
<!-- <button-->
3-
<!-- color="accent"-->
4-
<!-- mat-raised-button-->
5-
<!-- id="newSecurityGroupBtn"-->
6-
<!-- [routerLink]="['marketplace']"-->
7-
<!-- >-->
8-
<!-- {{ 'Marketplace' | translate }}-->
9-
<!-- </button>-->
2+
<!-- <button-->
3+
<!-- color="accent"-->
4+
<!-- mat-raised-button-->
5+
<!-- id="newSecurityGroupBtn"-->
6+
<!-- [routerLink]="['marketplace']"-->
7+
<!-- >-->
8+
<!-- {{ 'Marketplace' | translate }}-->
9+
<!-- </button>-->
1010
</eform-new-subheader>
1111

1212
<!--Here you can choose approach as you like: container-row, or flex, or just element with required styles and markup-->
@@ -21,47 +21,56 @@
2121
</mtx-grid>
2222

2323
<ng-template #idTpl let-row let-i="index">
24-
<div class="plugin-id" id="plugin-id{{i}}">{{row.id}}</div>
24+
<div class="plugin-id" id="plugin-id{{i}}">{{ row.id }}</div>
2525
</ng-template>
2626

2727
<ng-template #nameTpl let-row let-i="index">
28-
<div class="plugin-name" id="plugin-name{{i}}">{{row.name}}</div>
28+
<div class="plugin-name" id="plugin-name{{i}}">{{ row.name }}</div>
2929
</ng-template>
3030

3131
<ng-template #versionTpl let-row let-i="index">
32-
<div class="plugin-version" id="plugin-version{{i}}">{{row.version}}</div>
32+
<div class="plugin-version" id="plugin-version{{i}}">{{ row.version }}</div>
3333
</ng-template>
3434

35-
3635
<ng-template #actionsTpl let-row let-i="index">
37-
<div class="d-flex align-items-center">
38-
<button
39-
mat-icon-button
40-
color="{{row.status === statusEnum.Enabled ? 'accent' : ''}}"
41-
matTooltip="{{(row.status === statusEnum.Enabled ? 'Deactivate' : 'Activate') +' plugin' | translate}}"
42-
(click)="openPluginModal(row, row.status === statusEnum.Enabled ? statusEnum.Disabled : statusEnum.Enabled)"
43-
id="plugin-status-button{{i}}"
44-
>
45-
<mat-icon>{{row.status === statusEnum.Enabled ? 'toggle_on' : 'toggle_off'}}</mat-icon>
46-
</button>
47-
<button
48-
mat-icon-button
49-
color="accent"
50-
*ngIf="row.status == statusEnum.Enabled"
51-
matTooltip="{{ 'Edit Plugin Permissions' | translate }}"
52-
(click)="showPermissionsModal(row)"
53-
id="plugin-permissions-btn"
54-
>
55-
<mat-icon>lock_open</mat-icon>
36+
<div id="action-items-{{i}}">
37+
<button id="actionMenu" mat-icon-button [matMenuTriggerFor]="menu" matTooltip="{{ 'Actions' | translate }}">
38+
<mat-icon>more_vert</mat-icon>
5639
</button>
57-
<a
58-
mat-icon-button
59-
*ngIf="row.status == statusEnum.Enabled"
60-
matTooltip="{{ 'Plugin Settings Page' | translate }}"
61-
routerLink="/plugins/{{ row.baseUrl }}/settings"
62-
id="plugin-settings-link"
63-
>
64-
<mat-icon>settings</mat-icon>
65-
</a>
40+
41+
<mat-menu #menu="matMenu">
42+
43+
<button
44+
mat-menu-item
45+
(click)="openPluginModal(row, row.status === statusEnum.Enabled ? statusEnum.Disabled : statusEnum.Enabled)"
46+
id="plugin-status-button{{i}}"
47+
>
48+
<mat-icon
49+
color="{{row.status === statusEnum.Enabled ? 'accent' : ''}}">{{ row.status === statusEnum.Enabled ? 'toggle_on' : 'toggle_off' }}
50+
</mat-icon>
51+
<span>{{ (row.status === statusEnum.Enabled ? 'Deactivate' : 'Activate') + ' plugin' | translate }}</span>
52+
</button>
53+
54+
<button
55+
mat-menu-item
56+
*ngIf="row.status == statusEnum.Enabled"
57+
(click)="showPermissionsModal(row)"
58+
id="plugin-permissions-btn{{i}}"
59+
>
60+
<mat-icon color="accent">lock_open</mat-icon>
61+
<span>{{ 'Edit Plugin Permissions' | translate }}</span>
62+
</button>
63+
<a
64+
mat-menu-item
65+
*ngIf="row.status == statusEnum.Enabled"
66+
routerLink="/plugins/{{ row.baseUrl }}/settings"
67+
id="plugin-settings-link{{i}}"
68+
>
69+
<mat-icon>settings</mat-icon>
70+
<span>{{ 'Plugin Settings Page' | translate }}</span>
71+
</a>
72+
73+
</mat-menu>
6674
</div>
6775
</ng-template>
76+

0 commit comments

Comments
 (0)