Skip to content

Commit 2340136

Browse files
authored
Merge pull request #294 from netgrif/NAE-2174
[NAE-2174] Vanishing menu after few clicks
2 parents 2599928 + de2ae0d commit 2340136

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

projects/netgrif-components-core/src/lib/navigation/navigation-double-drawer/abstract-navigation-double-drawer.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,6 @@ export abstract class AbstractNavigationDoubleDrawerComponent implements OnInit,
161161
this._currentNodeSubscription?.unsubscribe();
162162
this._currentPathSubscription?.unsubscribe();
163163
this._loggedUserSubscription?.unsubscribe();
164-
this.leftLoading$.complete();
165-
this.rightLoading$.complete();
166-
this.hiddenCustomItems$.unsubscribe();
167-
this._userService.user$.subscribe();
168164
}
169165

170166
public get currentPath(): string {

projects/netgrif-components/src/lib/navigation/group-navigation-component-resolver/default-components/tabbed/default-tab-view/default-tab-view.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,15 @@ export class DefaultTabViewComponent {
113113
const taskViewAdditionalFilter = this.extractionService.extractCompleteAdditionalFilterFromData(viewDataGroups);
114114
let mergeWithBaseFilter: boolean = (chainedViewType === "tabbed_task_view_configuration") ? extractFieldValueFromData<boolean>(viewDataGroups, GroupNavigationConstants.ITEM_FIELD_ID_MERGE_FILTERS) : true;
115115
const additionalAllowedNets = this.extractionService.extractAdditionalFilterAllowedNets(viewDataGroups)?.allowedNetsIdentifiers;
116+
const chainedViewComponent = chainedViewType === "tabbed_single_task_view_configuration" ? DefaultTabbedSingleTaskViewComponent : DefaultTabbedTaskViewComponent;
116117

117118
return [
118119
{
119120
label: {text: labelData.name, icon: labelData.icon},
120121
canBeClosed: false,
121122
tabContentComponent: DefaultTabbedCaseViewComponent,
122123
injectedObject: {
123-
tabViewComponent: DefaultTabbedTaskViewComponent,
124+
tabViewComponent: chainedViewComponent,
124125
tabViewOrder: 0,
125126
navigationItemTaskData: this._navigationItemTaskData,
126127

projects/netgrif-components/src/lib/panel/task-panel-single/single-task.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
[first]='true'
2424
[last]='true'
2525
[hideActionRow]="hideActionRow"
26-
class='panel-expanded-spacing single-task-fix'>
26+
class='panel-expanded-spacing'>
2727
</nc-task-panel>
2828

2929
<div *ngIf='loading$ | async' fxLayout='column' fxLayoutAlign='center center'>

0 commit comments

Comments
 (0)