Skip to content

Commit d835048

Browse files
belaolsonNIHbelaolsonNIH
committed
(#144) Update people directory widget JS
* Renamed NCITABOrganizationDirectory to tab_html_prepOrgTabs * Renamed NCIGenericItemPropcallback to genericItem_data_setOrgDescription * Renamed NCIGenericSearchPropcallback to genericSearchList_query_setOrgSearch * OrganizationDirectorySearchResultsCallBack to genericSearchList_data_searchOrgs * LoadOrganizationDirectoryTreeFilter to peopleDirectory_html_loadOrgs * NCIDirectoryOrgCallBackUI to peopleDirectory_ui_addOrgDirTabs * Moved FireWhen into peopleDirectory_html_loadTabs function * renamed export function to peopleDirectoryWidget_callbacks * Updated imports Closes #144
1 parent d030b9e commit d835048

File tree

8 files changed

+77
-77
lines changed

8 files changed

+77
-77
lines changed

Diff for: ‎site/src/js/library/digitalworkplace.custom.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { blogDetailWidget_callbacks } from './modules/callbacks/BlogDetailWidget
22
import { employeeDetailWidget_helper } from './modules/EmployeeDetailWidget.js';
33
import { latestMediaWidget_helper } from './modules/LatestMediaWidget.js';
44
import { newsDetailWidget_helper } from './modules/NewsDetailWidget.js';
5-
import { peopleDirectoryWidget_helper } from './modules/PeopleDirectoryWidget.js';
5+
import { peopleDirectoryWidget_callbacks } from './modules/callbacks/PeopleDirectoryWidget.js';
66

77
// Remove in future
88
// window.NCIAddDebuggerBreak = function (arg1, arg2, arg3, arg4, arg5) {
@@ -85,4 +85,4 @@ blogDetailWidget_callbacks();
8585
employeeDetailWidget_helper();
8686
latestMediaWidget_helper();
8787
newsDetailWidget_helper();
88-
peopleDirectoryWidget_helper();
88+
peopleDirectoryWidget_callbacks();

Diff for: ‎site/src/js/library/modules/PeopleDirectoryWidget.js renamed to ‎site/src/js/library/modules/callbacks/PeopleDirectoryWidget.js

+66-67
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
import { FireWhen } from "./helpers/FireWhen";
1+
import { FireWhen } from "../helpers/FireWhen";
22

3-
export function peopleDirectoryWidget_helper() {
4-
var PushPeopleContainerUnderTab = function () {
3+
export function peopleDirectoryWidget_callbacks() {
4+
5+
window.tab_html_prepOrgTabs = function (control, properties) {
56
if ($('.ia-people-results').length == 1) {
67
$('.ia-people-results')
78
.clone(true)
@@ -27,13 +28,9 @@ export function peopleDirectoryWidget_helper() {
2728
}
2829
};
2930

30-
window.NCITABOrganizationDirectory = function (control, properties) {
31-
PushPeopleContainerUnderTab();
32-
};
33-
3431
var NCIDescriptionProcessed = '';
3532
var NCIFlatDepartmentstree = [];
36-
window.NCIGenericItemPropcallback = function (prop) {
33+
window.genericItem_data_setOrgDescription = function (prop) {
3734
prop.idOrTitle = NCIDescriptionProcessed || '';
3835
var selectedNodes = $('#filtertreenav').jstree('get_selected');
3936
if (selectedNodes.length === 0 || typeof selectedNodes[0] === 'object') {
@@ -50,7 +47,7 @@ export function peopleDirectoryWidget_helper() {
5047
return prop;
5148
};
5249

53-
window.NCIGenericSearchPropcallback = function (request) {
50+
window.genericSearchList_query_setOrgSearch = function (request) {
5451
request.searchTerm = $('.jstree-clicked').text();
5552
request.defaultQueryText = `* (SPSiteURL:${
5653
Akumina.Digispace.SiteContext.SiteAbsoluteUrl
@@ -62,7 +59,7 @@ export function peopleDirectoryWidget_helper() {
6259
return request.defaultQueryText;
6360
};
6461

65-
window.OrganizationDirectorySearchResultsCallBack = function (data) {
62+
window.genericSearchList_data_searchOrgs = function (data) {
6663
data.SearchTerm =
6764
$('.jstree-clicked').length > 0 ? $('.jstree-clicked').text() : '';
6865
return data;
@@ -71,7 +68,7 @@ export function peopleDirectoryWidget_helper() {
7168
var NCITreeNavSelected = '';
7269

7370
//OrganizationDirectoryPage
74-
window.LoadOrganizationDirectoryTreeFilter = function () {
71+
window.peopleDirectory_html_loadOrgs = function () {
7572
var organizationtermsetid =
7673
_configContextInfo.hasOwnProperty('organizationdirectorytermsetid') &&
7774
!Akumina.AddIn.Utilities.IsNullOrEmpty(
@@ -280,7 +277,7 @@ export function peopleDirectoryWidget_helper() {
280277
);
281278
};
282279
//OrganizationDirectoryPage
283-
window.NCIDirectoryOrgCallBackUI = function () {
280+
window.peopleDirectory_ui_addOrgDirTabs = function () {
284281
FireWhen(
285282
'AddTabsUnderOrgWidget',
286283
function () {
@@ -294,67 +291,69 @@ export function peopleDirectoryWidget_helper() {
294291
$('#organizationdirectorytabwidget')
295292
);
296293
$('.ia-tab-widget-container').show();
297-
window.NCITABOrganizationDirectory();
294+
window.tab_html_prepOrgTabs();
298295
},
299296
200
300297
);
301298
};
302299

303-
FireWhen(
304-
'LoadTabWidget',
305-
function () {
306-
return (
307-
$('.ia-people-results').length > 0 &&
308-
$('#ak-tabwidget-tabs-PeopleTab').length > 0
309-
);
310-
},
311-
function () {
312-
$('.ui-tabs-anchor').bind('click', function () {
313-
var tabDescription = $(this).text().trim();
314-
switch (tabDescription) {
315-
case 'People':
316-
// Call this function to simulate the click
317-
//Akumina.Digispace.AppPart.Eventing.Publish("/peopledirectory/search/", "facets");
318-
var lastProcessed = $(this).attr('loaded') || '';
319-
if (
320-
lastProcessed == '' ||
321-
NCIDescriptionProcessed != lastProcessed
322-
) {
323-
$(this).attr('loaded', NCIDescriptionProcessed);
324-
FireWhen(
325-
'PeopleTabReady',
326-
function () {
327-
return $('#ak-tabwidget-tabs-PeopleTab').hasClass(
328-
'ia-tab-active-link'
329-
);
330-
},
331-
function () {
332-
simulateClickOnSelectedNode();
333-
},
334-
200
300+
window.peopleDirectory_html_loadTabs = function () {
301+
FireWhen(
302+
'LoadTabWidget',
303+
function () {
304+
return (
305+
$('.ia-people-results').length > 0 &&
306+
$('#ak-tabwidget-tabs-PeopleTab').length > 0
307+
);
308+
},
309+
function () {
310+
$('.ui-tabs-anchor').bind('click', function () {
311+
var tabDescription = $(this).text().trim();
312+
switch (tabDescription) {
313+
case 'People':
314+
// Call this function to simulate the click
315+
//Akumina.Digispace.AppPart.Eventing.Publish("/peopledirectory/search/", "facets");
316+
var lastProcessed = $(this).attr('loaded') || '';
317+
if (
318+
lastProcessed == '' ||
319+
NCIDescriptionProcessed != lastProcessed
320+
) {
321+
$(this).attr('loaded', NCIDescriptionProcessed);
322+
FireWhen(
323+
'PeopleTabReady',
324+
function () {
325+
return $('#ak-tabwidget-tabs-PeopleTab').hasClass(
326+
'ia-tab-active-link'
327+
);
328+
},
329+
function () {
330+
simulateClickOnSelectedNode();
331+
},
332+
200
333+
);
334+
}
335+
break;
336+
case 'Content':
337+
var id = $('.ak-tabwidget-tabs-container li:first').attr(
338+
'aria-controls'
335339
);
336-
}
337-
break;
338-
case 'Content':
339-
var id = $('.ak-tabwidget-tabs-container li:first').attr(
340-
'aria-controls'
341-
);
342-
Akumina.Digispace.AppPart.Eventing.Publish(
343-
'/genericsearchlist/search/',
344-
{ term: `${NCITreeNavSelected}` }
345-
);
346-
break;
347-
case 'Overview':
348-
var id = $('.ak-tabwidget-tabs-container li:first').attr(
349-
'aria-controls'
350-
);
351-
RenderChildWidgets(`#${id}`);
352-
break;
353-
}
354-
});
355-
},
356-
200
357-
);
340+
Akumina.Digispace.AppPart.Eventing.Publish(
341+
'/genericsearchlist/search/',
342+
{ term: `${NCITreeNavSelected}` }
343+
);
344+
break;
345+
case 'Overview':
346+
var id = $('.ak-tabwidget-tabs-container li:first').attr(
347+
'aria-controls'
348+
);
349+
RenderChildWidgets(`#${id}`);
350+
break;
351+
}
352+
});
353+
},
354+
200
355+
);
356+
}
358357

359358
// Simulate click on the current folder selected
360359
function simulateClickOnSelectedNode() {

Diff for: ‎site/src/js/widgets/GenericItemWidget/config/config.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"Properties": [
3131
{
3232
"name": "propcallbackmethod",
33-
"value": "NCIGenericItemPropcallback"
33+
"value": "genericItem_data_setOrgDescription"
3434
}
3535
]
3636
}

Diff for: ‎site/src/js/widgets/GenericSearchListWidget/config/config.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@
220220
},
221221
{
222222
"name": "callbackmethod",
223-
"value": "OrganizationDirectorySearchResultsCallBack"
223+
"value": "genericSearchList_data_searchOrgs"
224224
},
225225
{
226226
"name": "cacheinterval",
@@ -246,7 +246,7 @@
246246
},
247247
{
248248
"name": "querycallbackmethod",
249-
"value": "NCIGenericSearchPropcallback"
249+
"value": "genericSearchList_query_setOrgSearch"
250250
}
251251
]
252252
}

Diff for: ‎site/src/js/widgets/PeopleDirectoryWidget/config/config.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@
159159
},
160160
{
161161
"name": "uicallbackmethod",
162-
"value": "NCIDirectoryOrgCallBackUI"
162+
"value": "peopleDirectory_ui_addOrgDirTabs"
163163
}
164164
]
165165
},
@@ -214,7 +214,7 @@
214214
},
215215
{
216216
"name": "uicallbackmethod",
217-
"value": "NCIDirectoryOrgCallBackUI"
217+
"value": "peopleDirectory_ui_addOrgDirTabs"
218218
}
219219
]
220220
}

Diff for: ‎site/src/js/widgets/PeopleDirectoryWidget/views/NCIOrgDirectoryView.html

+2-1
Original file line numberDiff line numberDiff line change
@@ -535,5 +535,6 @@ <h3 class="h4">{{FilterHeader}}</h3>
535535
});
536536
RenderChildWidgets('#organizationdirectorytabwidget');
537537
});
538-
window.LoadOrganizationDirectoryTreeFilter();
538+
window.peopleDirectory_html_loadOrgs();
539+
window.peopleDirectory_html_loadTabs();
539540
</script>

Diff for: ‎site/src/js/widgets/TabWidget/views/nci-tabs.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ <h3>{{WidgetTitle}}</h3>
2121
</div>
2222
</div>
2323
<script>
24-
//NCITABOrganizationDirectory();
24+
//tab_html_prepOrgTabs();
2525
</script>

Diff for: ‎site/src/js/widgets/TabWidget/views/tabwidget.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ <h3>{{WidgetTitle}}</h3>
2121
</div>
2222
</div>
2323
<script>
24-
NCITABOrganizationDirectory();
24+
tab_html_prepOrgTabs();
2525
</script>

0 commit comments

Comments
 (0)