Skip to content

Commit 86fb60e

Browse files
jrivardjrivard
authored
Merge branch 'master' into patch-12
2 parents cbb7c9f + 068891e commit 86fb60e

File tree

78 files changed

+2550
-1734
lines changed

Some content is hidden

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

78 files changed

+2550
-1734
lines changed

‎build/checkstyle-import.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
<allow pkg="com.github.tomakehurst.wiremock"/>
6565
<allow pkg="org.reflections"/>
6666
<allow pkg="org.bouncycastle.jce.provider"/>
67+
<allow pkg="org.openjdk.jmh"/>
6768

6869
<!-- gson -->
6970
<allow pkg="com.google.gson"/>

‎client/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
"clean": "rimraf dist/",
1313
"test": "karma start test/karma.conf.js",
1414
"test-single-run": "karma start test/karma.conf.js --singleRun --no-auto-watch",
15-
"start": "webpack-dev-server --mode=development --port 4000 --history-api-fallback --colors",
16-
"sync": "webpack --env.disableMinimize=true --mode=production --output-path=../webapp/target/pwm-1.8.0-SNAPSHOT/public/resources/webjars/pwm-client --watch --progress --colors"
15+
"start": "webpack-dev-server --mode=development --port 4000 --history-api-fallback --colors"
1716
},
1817
"author": "",
1918
"license": "ISC",

‎client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<plugin>
8080
<groupId>com.github.eirslett</groupId>
8181
<artifactId>frontend-maven-plugin</artifactId>
82-
<version>1.7.5</version>
82+
<version>1.7.6</version>
8383
<configuration>
8484
<nodeVersion>v8.9.4</nodeVersion>
8585
<npmVersion>5.6.0</npmVersion>

‎client/src/modules/helpdesk/helpdesk-search-table.component.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,15 @@ <h2 id="page-content-title" ng-if="!$ctrl.advancedSearch" translate="Title_Helpd
7676
<ias-icon icon="view_list_thin"></ias-icon>
7777
</ias-button>
7878
<div class="icon-divider vertical"></div>
79-
<ias-button class="ias-icon-button table-configuration-menu-toggle" ias-toggle="menu1">
79+
<ias-button class="ias-icon-button table-configuration-menu-toggle" ias-toggle="menu1"
80+
ng-attr-title="{{ 'Title_Settings' | translate }}">
8081
<ias-icon icon="configure_thick"></ias-icon>
8182
</ias-button>
8283
<ias-menu name="menu1" ias-align="end end" class="ias-styles-root">
8384
<div class="ias-input-container">
8485
<div class="checkbox-button" ng-repeat="(key, value) in $ctrl.columnConfiguration">
85-
<input type="checkbox" ng-checked="value.visible" aria-label="Toggle column visibility" disabled/>
86-
<ias-button ng-click="$ctrl.toggleColumnVisible($event, key)">{{value.label}}</ias-button>
86+
<input type="checkbox" ng-model="value.visible" aria-label="Toggle column visibility" />
87+
<ias-button class="toggle-column-btn" ng-click="value.visible = !value.visible; $event.stopImmediatePropagation();">{{value.label}}</ias-button>
8788
</div>
8889
</div>
8990
</ias-menu>

‎client/src/modules/helpdesk/helpdesk-search-table.component.ts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -106,18 +106,6 @@ export default class HelpDeskSearchTableComponent extends HelpDeskSearchBaseComp
106106
this.toggleView('search.cards');
107107
}
108108

109-
toggleColumnVisible(event, columnId): void {
110-
const visibleColumns = Object.keys(this.columnConfiguration).filter((columnId) => {
111-
return this.columnConfiguration[columnId].visible;
112-
});
113-
114-
if (!(visibleColumns.length === 1 && this.columnConfiguration[columnId].visible)) {
115-
this.columnConfiguration[columnId].visible = !this.columnConfiguration[columnId].visible;
116-
}
117-
118-
event.stopImmediatePropagation();
119-
}
120-
121109
private onSearchResult(searchResult: SearchResult): void {
122110
this.searchResult = searchResult;
123111
}

‎client/src/modules/helpdesk/helpdesk-search.component.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,4 +110,11 @@
110110
}
111111
}
112112
}
113+
114+
.ias-input-container > .checkbox-button > .ias-button.toggle-column-btn {
115+
&:focus, &:hover {
116+
background-color: transparent;
117+
box-shadow: none;
118+
}
119+
}
113120
}

‎client/src/modules/helpdesk/verifications-dialog.controller.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,13 @@ export default class VerificationsDialogController {
9696
this.status = STATUS_SELECT;
9797
this.determineAvailableVerificationMethods();
9898
}
99+
})
100+
.catch((reason: any) => {
101+
alert(reason);
102+
103+
this.status = STATUS_NONE;
104+
this.verificationStatus = STATUS_NONE;
105+
this.IasDialogService.close();
99106
});
100107
}
101108

‎client/src/modules/peoplesearch/peoplesearch-table.component.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,15 @@ <h2 id="page-content-title" translate="Title_PeopleSearch">People Search</h2>
8080
ng-attr-title="{{ 'Title_OrgChart' | translate }}">
8181
<ias-icon class="ias-selected" icon="orgchart_thin"></ias-icon>
8282
</ias-button>
83-
<ias-button class="ias-icon-button table-configuration-menu-toggle" ias-toggle="menu1">
83+
<ias-button class="ias-icon-button table-configuration-menu-toggle" ias-toggle="menu1"
84+
ng-attr-title="{{ 'Title_Settings' | translate }}">
8485
<ias-icon icon="configure_thick"></ias-icon>
8586
</ias-button>
8687
<ias-menu name="menu1" ias-align="end end" class="ias-styles-root">
8788
<div class="ias-input-container">
8889
<div class="checkbox-button" ng-repeat="(key, value) in $ctrl.columnConfiguration">
89-
<input type="checkbox" ng-checked="value.visible" aria-label="Toggle column visibility" disabled/>
90-
<ias-button ng-click="$ctrl.toggleColumnVisible($event, key)">{{value.label}}</ias-button>
90+
<input type="checkbox" ng-model="value.visible" aria-label="Toggle column visibility" />
91+
<ias-button class="toggle-column-btn" ng-click="value.visible = !value.visible; $event.stopImmediatePropagation();">{{value.label}}</ias-button>
9192
</div>
9293
</div>
9394
</ias-menu>

‎client/src/modules/peoplesearch/peoplesearch-table.component.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,11 @@
4343
}
4444
}
4545
}
46+
47+
.ias-input-container > .checkbox-button > .ias-button.toggle-column-btn {
48+
&:focus, &:hover {
49+
background-color: transparent;
50+
box-shadow: none;
51+
}
52+
}
4653
}

‎client/src/modules/peoplesearch/peoplesearch-table.component.ts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -116,18 +116,6 @@ export default class PeopleSearchTableComponent extends PeopleSearchBaseComponen
116116
}
117117
}
118118

119-
toggleColumnVisible(event, columnId): void {
120-
const visibleColumns = Object.keys(this.columnConfiguration).filter((columnId) => {
121-
return this.columnConfiguration[columnId].visible;
122-
});
123-
124-
if (!(visibleColumns.length === 1 && this.columnConfiguration[columnId].visible)) {
125-
this.columnConfiguration[columnId].visible = !this.columnConfiguration[columnId].visible;
126-
}
127-
128-
event.stopImmediatePropagation();
129-
}
130-
131119
private onSearchResult(searchResult: SearchResult): void {
132120
this.searchResult = searchResult;
133121
}

0 commit comments

Comments
 (0)