Skip to content

Commit 4bc1346

Browse files
kamransaleemkamransaleem
committed
-move nav search results into component
-some indentation tidy up -css style name changes #331
1 parent a042593 commit 4bc1346

9 files changed

Lines changed: 125 additions & 124 deletions

File tree

waltz-ng/client/navbar/directives/nav-search-results.html renamed to waltz-ng/client/navbar/components/nav-search-results.html

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
1-
<div class="waltz-nav-search-results">
1+
<div class="wns-results">
22
<h3 style="border-bottom: 1px solid #ccc">
3-
Search Results: {{query}}
3+
Search Results: {{$ctrl.query}}
44
<small class="pull-right">
5-
<a class="clickable" ng-click="dismiss()">
5+
<a class="clickable" ng-click="$ctrl.dismiss()">
66
<waltz-icon name="close"></waltz-icon>
77
</a>
88
</small>
99
</h3>
1010

1111
<h4><waltz-icon name="desktop"></waltz-icon> Applications</h4>
1212
<ul class="list-unstyled">
13-
<li ng-repeat="app in results.apps">
13+
<li ng-repeat="app in $ctrl.results.apps">
1414
<a ui-sref="main.app.view ({id: app.id})">
1515
{{app.name}}
1616
<small>
1717
( {{ app.assetCode }} <span ng-if="app.parentAssetCode"> / {{ app.parentAssetCode }} </span> )
1818
</small>
1919
</a>
2020
</li>
21-
<li ng-show="results.apps.length == 0" class="text-muted">No results...</li>
21+
<li ng-show="$ctrl.results.apps.length == 0" class="text-muted">No results...</li>
2222

2323
</ul>
2424

2525
<hr/>
2626

2727
<h4><waltz-icon name="users"></waltz-icon> People</h4>
2828
<ul class="list-unstyled">
29-
<li ng-repeat="person in results.people">
29+
<li ng-repeat="person in $ctrl.results.people">
3030
<a ui-sref="main.person.view ({empId: person.employeeId})">
3131
{{ person.displayName }}
3232
</a>
3333
<small>{{ person.title }}</small>
3434
</li>
35-
<li ng-show="results.people.length == 0" class="text-muted">No results...</li>
35+
<li ng-show="$ctrl.results.people.length == 0" class="text-muted">No results...</li>
3636
</ul>
3737

3838
<hr/>
3939

4040
<h4><waltz-icon name="puzzle-piece"></waltz-icon> Capabilities</h4>
4141
<ul class="list-unstyled">
42-
<li ng-repeat="capability in results.capabilities">
42+
<li ng-repeat="capability in $ctrl.results.capabilities">
4343
<a ui-sref="main.capability.view ({id: capability.id})">
4444
{{ capability.name }}
4545
</a>
@@ -48,13 +48,13 @@ <h4><waltz-icon name="puzzle-piece"></waltz-icon> Capabilities</h4>
4848
<span ng-if="capability.description.length > 60">...</span>
4949
</small>
5050
</li>
51-
<li ng-show="results.capabilities.length == 0" class="text-muted">No results...</li>
51+
<li ng-show="$ctrl.results.capabilities.length == 0" class="text-muted">No results...</li>
5252
</ul>
5353
<hr/>
5454

5555
<h4><waltz-icon name="sitemap"></waltz-icon> Organisational Units</h4>
5656
<ul class="list-unstyled">
57-
<li ng-repeat="orgUnit in results.orgUnits">
57+
<li ng-repeat="orgUnit in $ctrl.results.orgUnits">
5858
<a ui-sref="main.org-unit.view ({id: orgUnit.id})">
5959
{{ orgUnit.name }}
6060
</a>
@@ -63,7 +63,7 @@ <h4><waltz-icon name="sitemap"></waltz-icon> Organisational Units</h4>
6363
<span ng-if="orgUnit.description.length > 60">...</span>
6464
</small>
6565
</li>
66-
<li ng-show="results.orgUnit.length == 0" class="text-muted">No results...</li>
66+
<li ng-show="$ctrl.results.orgUnit.length == 0" class="text-muted">No results...</li>
6767
</ul>
6868

6969

waltz-ng/client/navbar/directives/nav-search-results.js renamed to waltz-ng/client/navbar/components/nav-search-results.js

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,33 @@
1010
*
1111
*/
1212

13-
export default () => ({
14-
restrict: 'E',
15-
replace: true,
16-
template: require('./nav-search-results.html'),
17-
scope: {
18-
query: '@',
19-
results: '=',
20-
onDismiss: '='
21-
},
22-
link: function(scope, elem) {
23-
scope.dismiss = () => {
24-
if (scope.onDismiss) {
25-
scope.onDismiss();
26-
} else {
27-
console.log('No dismiss handler registered');
28-
}
29-
};
13+
const bindings = {
14+
query: '@',
15+
results: '<',
16+
onDismiss: '<'
17+
};
18+
19+
const template = require('./nav-search-results.html');
20+
21+
22+
function controller() {
23+
const vm = this;
24+
25+
vm.dismiss = () => {
26+
if (vm.onDismiss) {
27+
vm.onDismiss();
28+
} else {
29+
console.log('No dismiss handler registered');
30+
}
3031
}
3132

33+
}
34+
35+
36+
const component = {
37+
template,
38+
bindings,
39+
controller,
40+
};
3241

33-
});
42+
export default component;

waltz-ng/client/navbar/directives/nav-search-results.scss renamed to waltz-ng/client/navbar/components/nav-search-results.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.waltz-nav-search-results-panel {
1+
.waltz-nav-search-panel {
22
top: 42px;
33
right: 100px;
44
position: absolute;
@@ -7,7 +7,7 @@
77
border: 1px solid #ccc;
88
box-shadow: 0px 4px 5px gray, -5px 4px 7px gray, 5px 4px 7px gray;
99

10-
.waltz-nav-search-results {
10+
.wns-results {
1111
margin: 10px;
1212
padding-right: 10px;
1313
overflow-y: auto;

‎waltz-ng/client/navbar/components/navbar-search-form.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
autocomplete="off"
1414
autofocus="autofocus"
1515
placeholder="Search">
16-
1716
</div>
1817
</div>
1918
</form>
2019
</li>
21-
<div class="waltz-nav-search-results-panel" ng-if="$ctrl.showSearch()">
2220
<waltz-nav-search-results results="$ctrl.searchResults"
2321
query="{{ $ctrl.query }}"
24-
on-dismiss="$ctrl.dismissResults"></waltz-nav-search-results>
25-
</div>
22+
on-dismiss="$ctrl.dismissResults"
23+
ng-if="$ctrl.showSearch()"
24+
class="waltz-nav-search-panel">
25+
</waltz-nav-search-results>
2626
</ul>

‎waltz-ng/client/navbar/directives/navbar-profile.html‎

Lines changed: 73 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
<li class="dropdown" uib-dropdown>
55
<a class="clickable"
66
uib-dropdown-toggle>
7-
<span waltz-if-anonymous="true">
8-
<waltz-icon name="user"></waltz-icon>
9-
Anonymous
10-
<b class="caret"></b>
11-
</span>
7+
<span waltz-if-anonymous="true">
8+
<waltz-icon name="user"></waltz-icon>
9+
Anonymous
10+
<b class="caret"></b>
11+
</span>
1212
<span waltz-if-anonymous="false">
13-
<waltz-icon name="user"></waltz-icon>
14-
Profile
15-
<b class="caret"></b>
16-
</span>
13+
<waltz-icon name="user"></waltz-icon>
14+
Profile
15+
<b class="caret"></b>
16+
</span>
1717
</a>
1818
<ul class="dropdown-menu"
1919
uib-dropdown-menu
@@ -23,28 +23,28 @@
2323

2424
<li style="margin: 4px"
2525
class="no-overflow">
26-
<span waltz-if-anonymous="false">
27-
<a ui-sref="main.profile.view ({userId: ctrl.user.userName})"
28-
ng-bind="ctrl.user.userName"></a>
29-
</span>
26+
<span waltz-if-anonymous="false">
27+
<a ui-sref="main.profile.view ({userId: ctrl.user.userName})"
28+
ng-bind="ctrl.user.userName"></a>
29+
</span>
3030
<span waltz-if-anonymous="true">Anonymous</span>
3131
</li>
3232
<li style="margin: 4px"
3333
ng-if="ctrl.allowDirectLogin"
3434
class="no-overflow">
35-
<span waltz-if-anonymous="true">
36-
<a class="clickable"
37-
ng-click="ctrl.login()">
38-
<waltz-icon name="sign-in"></waltz-icon>
39-
<span>Login</span>
40-
</a>
41-
</span>
35+
<span waltz-if-anonymous="true">
36+
<a class="clickable"
37+
ng-click="ctrl.login()">
38+
<waltz-icon name="sign-in"></waltz-icon>
39+
<span>Login</span>
40+
</a>
41+
</span>
4242
<span waltz-if-anonymous="false">
43-
<a class="clickable"
44-
ng-click="ctrl.logout()">
45-
<waltz-icon name="sign-out"></waltz-icon>
46-
Logout
47-
</a>
43+
<a class="clickable"
44+
ng-click="ctrl.logout()">
45+
<waltz-icon name="sign-out"></waltz-icon>
46+
Logout
47+
</a>
4848
</span>
4949

5050
</li>
@@ -54,74 +54,74 @@
5454
<li style="margin: 4px"
5555
ui-sref-active="side-active"
5656
class="no-overflow">
57-
<span waltz-has-role="ADMIN">
58-
<a ui-sref="main.traits">
59-
<waltz-icon class='text-muted small'
60-
fixed-width="true"
61-
name="cubes"></waltz-icon>
62-
Manage Traits
63-
</a>
64-
</span>
57+
<span waltz-has-role="ADMIN">
58+
<a ui-sref="main.traits">
59+
<waltz-icon class='text-muted small'
60+
fixed-width="true"
61+
name="cubes"></waltz-icon>
62+
Manage Traits
63+
</a>
64+
</span>
6565
</li>
6666
<li style="margin: 4px"
6767
ui-sref-active="side-active"
6868
class="no-overflow">
69-
<span waltz-has-role="ADMIN">
70-
<a ui-sref="main.user.management">
71-
<waltz-icon class='text-muted small'
72-
fixed-width="true"
73-
name="users"></waltz-icon>
74-
Manage Users
75-
</a>
76-
</span>
69+
<span waltz-has-role="ADMIN">
70+
<a ui-sref="main.user.management">
71+
<waltz-icon class='text-muted small'
72+
fixed-width="true"
73+
name="users"></waltz-icon>
74+
Manage Users
75+
</a>
76+
</span>
7777
</li>
7878
<li style="margin: 4px"
7979
ui-sref-active="side-active"
8080
class="no-overflow">
81-
<span waltz-has-role="APP_EDITOR">
82-
<a ui-sref="main.app.registration">
83-
<waltz-icon class='text-muted small'
84-
fixed-width="true"
85-
name="gift"></waltz-icon>
86-
Register App
87-
</a>
88-
</span>
81+
<span waltz-has-role="APP_EDITOR">
82+
<a ui-sref="main.app.registration">
83+
<waltz-icon class='text-muted small'
84+
fixed-width="true"
85+
name="gift"></waltz-icon>
86+
Register App
87+
</a>
88+
</span>
8989
</li>
9090
<li style="margin: 4px"
9191
ui-sref-active="side-active"
9292
class="no-overflow">
93-
<span waltz-has-role="ADMIN">
94-
<a ui-sref="main.settings">
95-
<waltz-icon class='text-muted small'
96-
fixed-width="true"
97-
name="cog"></waltz-icon>
98-
Settings
99-
</a>
100-
</span>
93+
<span waltz-has-role="ADMIN">
94+
<a ui-sref="main.settings">
95+
<waltz-icon class='text-muted small'
96+
fixed-width="true"
97+
name="cog"></waltz-icon>
98+
Settings
99+
</a>
100+
</span>
101101
</li>
102102
<li style="margin: 4px"
103103
ui-sref-active="side-active"
104104
class="no-overflow">
105-
<span waltz-has-role="ADMIN">
106-
<a ui-sref="main.source-data-ratings">
107-
<waltz-icon class='text-muted small'
108-
fixed-width="true"
109-
name="map-signs"></waltz-icon>
110-
Source Data Ratings
111-
</a>
112-
</span>
105+
<span waltz-has-role="ADMIN">
106+
<a ui-sref="main.source-data-ratings">
107+
<waltz-icon class='text-muted small'
108+
fixed-width="true"
109+
name="map-signs"></waltz-icon>
110+
Source Data Ratings
111+
</a>
112+
</span>
113113
</li>
114114
<li style="margin: 4px"
115115
ui-sref-active="side-active"
116116
class="no-overflow">
117-
<span waltz-has-role="ADMIN">
118-
<a ui-sref="main.user.log">
119-
<waltz-icon class='text-muted small'
120-
fixed-width="true"
121-
name="list-ul"></waltz-icon>
122-
User Logs
123-
</a>
124-
</span>
117+
<span waltz-has-role="ADMIN">
118+
<a ui-sref="main.user.log">
119+
<waltz-icon class='text-muted small'
120+
fixed-width="true"
121+
name="list-ul"></waltz-icon>
122+
User Logs
123+
</a>
124+
</span>
125125
</li>
126126

127127
</ul>

‎waltz-ng/client/navbar/directives/navbar-recently-viewed.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525

2626
<li class="text-muted"
2727
ng-if="ctrl.history.length == 0">
28-
<span style="margin: 4px">
29-
Recently viewed items will be added as you navigate through Waltz
30-
</span>
28+
<span style="margin: 4px">
29+
Recently viewed items will be added as you navigate through Waltz
30+
</span>
3131
</li>
3232
</ul>
3333
</li>

‎waltz-ng/client/navbar/directives/navbar.js‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
1-
import _ from "lodash";
2-
3-
4-
const initialState = {
5-
6-
};
7-
8-
91

102
function controller() {
11-
const vm = _.defaultsDeep(this, initialState);
123
}
134

145

0 commit comments

Comments
 (0)