diff --git a/dashboard/menu/menu.component.html b/dashboard/menu/menu.component.html index 348e1216..ab3c185c 100644 --- a/dashboard/menu/menu.component.html +++ b/dashboard/menu/menu.component.html @@ -39,125 +39,142 @@
-
-
-
-
-
- {{item.title}} -
-
- External URL - Internal page - - - - - -
-
- -
-
- Target {{item.type == 'external' ? 'URL' : 'Route'}} -
+
+
+
+
+
- {{item.type == 'external' ? item.url : item.route}} + {{item.title}}
-
- This menu item is not visible because the page is disabled +
+ External URL + Internal page + + + + +
-
- - -
-
- - Move: - - -
- - Up + +
+
+ Target {{item.type == 'external' ? 'URL' : 'Route'}}
- - -
- - Down -
- -
- -
-
-
-
-
- {{subItem.title}} + {{item.type == 'external' ? item.url : item.route}}
-
- External URL - Internal page - - - - +
+ This menu item is not visible because the page is disabled
- -
-
- Target {{subItem.type == 'external' ? 'URL' : 'Route'}} +
+ + +
+
+ + Move: + + +
+ + Up
+ + +
+ + Down +
+ +
+ +
+
+
+
+
- {{subItem.type == 'external' ? subItem.url : subItem.route}} + {{subItem.title}} +
+
+ External URL + Internal page + + + +
-
- - -
-
- - Move: - - -
- - Up + +
+
+ Target {{subItem.type == 'external' ? 'URL' : 'Route'}}
- - -
- - Down +
+ {{subItem.type == 'external' ? subItem.url : subItem.route}}
- -
- +
+
+ + +
+
+ + Move: + + +
+ + Up +
+ + +
+ + Down +
+ +
+ +
+
+
Menu settings
+
+ +
+
+ +
+
@@ -174,7 +191,7 @@ placeholder="Name">
+ placeholder="Parent" [options]="parentOptions" [tooltip]="false" [disabled]="menuItemForm.get('_id').value">
diff --git a/dashboard/menu/menu.component.ts b/dashboard/menu/menu.component.ts index 55ec02cf..ca470d77 100644 --- a/dashboard/menu/menu.component.ts +++ b/dashboard/menu/menu.component.ts @@ -54,6 +54,9 @@ export class MenuComponent implements OnInit { public selectedMenuItem: string; public selectedMenuItemParent: string; public isChild: boolean = false; + + public showNormalMenu: boolean = false; + public showFeaturedMenu: boolean = false; public communities: Portal[] = []; public portal: string; @@ -145,6 +148,8 @@ export class MenuComponent implements OnInit { data => { this.featuredMenuItems = data.featuredMenuItems; this.normalMenuItems = data.menuItems; + this.showFeaturedMenu = data.isFeaturedMenuEnabled; + this.showNormalMenu = data.isMenuEnabled; this.getPages(); this.getParentOptions(); this.showLoading = false; @@ -282,6 +287,8 @@ export class MenuComponent implements OnInit { } else { let i = this.normalMenuItems.findIndex(_ => _._id == id); this.normalMenuItems.splice(i, 1); + let j = this.parentOptions.findIndex(_ => _._id == id); + this.parentOptions.splice(j, 1); } } } @@ -297,9 +304,10 @@ export class MenuComponent implements OnInit { this.destroyTypeSubscription(); this.showLoading = true; this.menuItemForm.value.target = this.menuItemForm.value['type'] == "internal" ? "_self" : "_blank"; + console.log(this.menuItemForm.value); if(!this.menuItemForm.value._id) { this.subscriptions.push( - this._helpContentService.saveMenuItem(this.menuItemForm.value, this.portal).subscribe( + this._helpContentService.saveMenuItem(this.menuItemForm.getRawValue(), this.portal).subscribe( menuItem => { this.menuItemSavedSuccessfully(menuItem, true); NotificationHandler.rise('Menu item ' + menuItem.title + ' has been successfully created'); @@ -310,7 +318,7 @@ export class MenuComponent implements OnInit { ) } else { this.subscriptions.push( - this._helpContentService.updateMenuItem(this.menuItemForm.value, this.portal).subscribe( + this._helpContentService.updateMenuItem(this.menuItemForm.getRawValue(), this.portal).subscribe( menuItem => { this.menuItemSavedSuccessfully(menuItem, false); NotificationHandler.rise('Menu item ' + menuItem.title + ' has been successfully updated'); @@ -325,15 +333,14 @@ export class MenuComponent implements OnInit { public menuItemSavedSuccessfully(menuItem: MenuItem, isNew: boolean) { if(isNew) { if(menuItem['parentItemId']) { - console.log('creating child'); let i = this.normalMenuItems.findIndex(_ => _._id == menuItem['parentItemId']); this.normalMenuItems[i].items.push(menuItem); } else { - console.log('creating parent'); if(menuItem.isFeatured) { this.featuredMenuItems.push(menuItem); } else { this.normalMenuItems.push(menuItem); + this.parentOptions.push({label: menuItem.title, value: menuItem._id}); } } } else { @@ -396,4 +403,19 @@ export class MenuComponent implements OnInit { }); } } + + public toggleMenu(status: boolean, isFeatured: boolean) { + this.subscriptions.push( + this._helpContentService.toggleMenu(status, isFeatured, this.portal).subscribe(() => { + if(isFeatured) { + this.showFeaturedMenu = status; + } else { + this.showNormalMenu = status; + } + this._clearCacheService.clearCache("Menu toggled"); + }, error => { + this.handleError("System error toggling menu", error); + }) + ); + } } \ No newline at end of file diff --git a/services/help-content.service.ts b/services/help-content.service.ts index f1ae5cfd..e64e48c3 100644 --- a/services/help-content.service.ts +++ b/services/help-content.service.ts @@ -346,6 +346,12 @@ export class HelpContentService { .pipe(catchError(this.handleError)); } + toggleMenu(status: boolean, isFeatured: boolean, portalPid: string) { + return this.http.post(properties.adminToolsAPIURL + properties.adminToolsPortalType + "/" + portalPid + "/menu/toggle?status=" + status + "&featured=" + isFeatured, {}, CustomOptions.getAuthOptionsWithBody()) + .pipe(catchError(this.handleError)); + } + + // unused getCommunities( helpContentUrl:string) { return this.http.get>(helpContentUrl + properties.adminToolsPortalType)