#5697 - Update the levels displayed in breadcrumbs across the app

webapp/src/ts/modules/messages/messages.component.ts

@@ -14,6 +14,8 @@ import { ModalService } from '@mm-modals/mm-modal/mm-modal';
 import { SendMessageComponent } from '@mm-modals/send-message/send-message.component';
 import { TourService } from '@mm-services/tour.service';
 import { ResponsiveService } from '@mm-services/responsive.service';
+import { UserContactService } from '@mm-services/user-contact.service';
+import { SessionService } from '@mm-services/session.service';
 
 @Component({
   templateUrl: './messages.component.html'
@@ -28,6 +30,7 @@ export class MessagesComponent implements OnInit, OnDestroy {
   conversations = [];
   selectedConversationId = null;
   error = false;
+  currentLevel;
   private destroyed = false;
 
   constructor(
@@ -40,6 +43,8 @@ export class MessagesComponent implements OnInit, OnDestroy {
     private modalService: ModalService,
     private tourService: TourService,
     private responsiveService: ResponsiveService,
+    private userContactService:UserContactService,
+    private sessionService:SessionService,
   ) {
     this.globalActions = new GlobalActions(store);
     this.messagesActions = new MessagesActions(store);
@@ -48,6 +53,9 @@ export class MessagesComponent implements OnInit, OnDestroy {
   ngOnInit(): void {
     this.subscribeToStore();
     this.tourService.startIfNeeded(this.route.snapshot);
+    this.userContactService.getCurrentLineageLevel().then((currentLevel) => {
+      this.currentLevel = currentLevel;
+    });
     this.updateConversations().then(() => this.displayFirstConversation(this.conversations));
     this.watchForChanges();
   }
@@ -152,6 +160,15 @@ export class MessagesComponent implements OnInit, OnDestroy {
     return this.messageContactService
       .getList()
       .then((conversations = []) => {
+        // filter out the lineage level that belongs to the online logged in user
+        if(!this.sessionService.isOnlineOnly()) {
+          conversations.map((conversation) => {
+            conversation.lineage = conversation.lineage?.filter((level) => {
+              return (level !== this.currentLevel);
+            });
+            return conversation;
+          });
+        }
         this.setConversations(conversations, { merge });
         this.loading = false;
       });

webapp/src/ts/modules/reports/reports.component.ts

@@ -26,6 +26,7 @@ import { TranslateService } from '@mm-services/translate.service';
 import { ReportsSidebarFilterComponent } from '@mm-modules/reports/reports-sidebar-filter.component';
 import { AuthService } from '@mm-services/auth.service';
 import { OLD_REPORTS_FILTER_PERMISSION } from '@mm-modules/reports/reports-filters.component';
+import {UserContactService} from '@mm-services/user-contact.service';
 import { SessionService } from '@mm-services/session.service';
 
 const PAGE_SIZE = 50;
@@ -60,6 +61,7 @@ export class ReportsComponent implements OnInit, AfterViewInit, OnDestroy {
   enketoEdited;
   useSidebarFilter = true;
   isSidebarFilterOpen = false;
+  currentLevel;
 
   constructor(
     private store:Store,
@@ -73,9 +75,11 @@ export class ReportsComponent implements OnInit, AfterViewInit, OnDestroy {
     private addReadStatusService:AddReadStatusService,
     private exportService:ExportService,
     private ngZone:NgZone,
+    private userContactService:UserContactService,
     private sessionService:SessionService,
     private scrollLoaderProvider:ScrollLoaderProvider,
     private responsiveService:ResponsiveService,
+
   ) {
     this.globalActions = new GlobalActions(store);
     this.reportsActions = new ReportsActions(store);
@@ -143,6 +147,11 @@ export class ReportsComponent implements OnInit, AfterViewInit, OnDestroy {
     this.globalActions.setFilter({ search: this.route.snapshot.queryParams.query || '' });
     this.tourService.startIfNeeded(this.route.snapshot);
     this.setActionBarData();
+
+    this.userContactService.getCurrentLineageLevel().then((currentLevel) => {
+      this.currentLevel = currentLevel;
+      console.log('this.currentLevel in reports', this.currentLevel);
+    });
   }
 
   async ngAfterViewInit() {
@@ -191,8 +200,13 @@ export class ReportsComponent implements OnInit, AfterViewInit, OnDestroy {
       report.heading = this.getReportHeading(form, report);
       report.summary = form ? form.title : report.form;
       report.lineage = report.subject && report.subject.lineage || report.lineage;
+      // filter out the lineage level that belongs to the online logged in user
+      if(!this.sessionService.isOnlineOnly()) {
+        report.lineage = report.lineage.filter((level) => {
+          return (level !== this.currentLevel);
+        });
+      }
       report.unread = !report.read;
-
       return report;
     });
   }
@@ -263,7 +277,7 @@ export class ReportsComponent implements OnInit, AfterViewInit, OnDestroy {
   search(force = false) {
     // clears report selection for any text search or filter selection
     // does not clear selection when someone is editing a form
-    if ((this.filters.search || Object.keys(this.filters).length > 1) && !this.enketoEdited) {
+    if((this.filters.search || Object.keys(this.filters).length > 1) && !this.enketoEdited) {
       this.router.navigate(['reports']);
       this.reportsActions.clearSelection();
     }

webapp/src/ts/services/search.service.ts

@@ -138,6 +138,7 @@ export class SearchService {
       return Promise.resolve([]);
     }
     const before = performance.now();
+
     return this
       .searchFactory(type, filters, options, extensions)
       .then((searchResults) => {

webapp/src/ts/services/user-contact.service.ts

@@ -33,4 +33,17 @@ export class UserContactService {
         throw err;
       });
   }
+
+  async getCurrentLineageLevel(){
+    return this
+      .get()
+      .then((user) => {
+        const currentLevel = user?.parent?.name;
+        console.log('user ', user, 'currentLevel', currentLevel);
+        return currentLevel;
+      })
+      .catch((err) => {
+        throw err;
+      });
+  }
 }

webapp/tests/karma/ts/modules/messages/messages.component.spec.ts

@@ -15,6 +15,8 @@ import { ModalService } from '@mm-modals/mm-modal/mm-modal';
 import { NavigationComponent } from '@mm-components/navigation/navigation.component';
 import { TourService } from '@mm-services/tour.service';
 import { NavigationService } from '@mm-services/navigation.service';
+import { UserContactService } from '@mm-services/user-contact.service';
+import { SessionService } from '@mm-services/session.service';
 
 describe('Messages Component', () => {
   let component: MessagesComponent;
@@ -23,6 +25,18 @@ describe('Messages Component', () => {
   let changesService;
   let exportService;
   let modalService;
+  let userContactService;
+  let sessionService;
+
+  const userContactGrandparent = { _id: 'grandparent' };
+  const userContactDoc = {
+    _id: 'user',
+    parent: {
+      _id: 'parent',
+      name: 'parent',
+      parent: userContactGrandparent,
+    },
+  };
 
   beforeEach(waitForAsync(() => {
     modalService = { show: sinon.stub() };
@@ -33,6 +47,11 @@ describe('Messages Component', () => {
     changesService = {
       subscribe: sinon.stub().resolves(of({}))
     };
+    userContactService = {
+      get: sinon.stub().resolves(userContactDoc),
+      getCurrentLineageLevel : sinon.stub().resolves('parent')
+    };
+    sessionService = { isOnlineOnly : sinon.stub().resolves(true) };
     const tourServiceMock = {
       startIfNeeded: () => {}
     };
@@ -63,6 +82,8 @@ describe('Messages Component', () => {
           { provide: ModalService, useValue: modalService },
           { provide: TourService, useValue: tourServiceMock },
           { provide: NavigationService, useValue: {} },
+          { provide: UserContactService, useValue: userContactService },
+          { provide: SessionService, useValue: sessionService },
         ]
       })
       .compileComponents()
@@ -181,4 +202,11 @@ describe('Messages Component', () => {
 
     expect(spySubscriptionsUnsubscribe.callCount).to.equal(1);
   });
+
+  it('it should retrieve the hierarchy level of the connected user', () => {
+    userContactService.get.resolves(userContactDoc);
+    component.ngOnInit();
+    expect(component.currentLevel).to.equal('parent');
+  });
+
 });

webapp/tests/karma/ts/modules/reports/reports.component.spec.ts

@@ -28,6 +28,7 @@ import { AuthService } from '@mm-services/auth.service';
 import { ReportsSidebarFilterComponent } from '@mm-modules/reports/reports-sidebar-filter.component';
 import { ReportsActionsBarComponent } from '@mm-modules/reports/reports-actions-bar.component';
 import { TelemetryService } from '@mm-services/telemetry.service';
+import { UserContactService } from '@mm-services/user-contact.service';
 
 describe('Reports Component', () => {
   let component: ReportsComponent;
@@ -39,6 +40,17 @@ describe('Reports Component', () => {
   let listContains;
   let authService;
   let datePipe;
+  let userContactService;
+
+  const userContactGrandparent = { _id: 'grandparent' };
+  const userContactDoc = {
+    _id: 'user',
+    parent: {
+      _id: 'parent',
+      name: 'parent',
+      parent: userContactGrandparent,
+    },
+  };
 
   beforeEach(waitForAsync(() => {
     listContains = sinon.stub();
@@ -66,7 +78,10 @@ describe('Reports Component', () => {
       isOnlineOnly: sinon.stub()
     };
     datePipe = { transform: sinon.stub() };
-
+    userContactService = {
+      get: sinon.stub().resolves(userContactDoc),
+      getCurrentLineageLevel : sinon.stub().resolves('parent')
+    };
     return TestBed
       .configureTestingModule({
         imports: [
@@ -97,6 +112,7 @@ describe('Reports Component', () => {
           { provide: TelemetryService, useValue: { record: sinon.stub() } },
           { provide: TourService, useValue: tourServiceMock },
           { provide: SessionService, useValue: sessionService },
+          { provide: UserContactService, useValue: userContactService },
           { provide: NavigationService, useValue: {} },
           { provide: AuthService, useValue: authService },
           { provide: DatePipe, useValue: datePipe },