Fix bug button Subscribe to Manage Susbcription - 4195

Author: guillermo-escire

cypress/e2e/collection-statistics.cy.ts

@@ -2,16 +2,11 @@ import { REGEX_MATCH_NON_EMPTY_TEXT } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
 describe('Collection Statistics Page', () => {
-  const COLLECTIONSTATISTICSPAGE = `/statistics/collections/${Cypress.env('DSPACE_TEST_COLLECTION')}`;
+  const COLLECTIONSTATISTICSPAGE = '/statistics/collections/'.concat(Cypress.env('DSPACE_TEST_COLLECTION'));
 
   it('should load if you click on "Statistics" from a Collection page', () => {
-    cy.visit(`/collections/${Cypress.env('DSPACE_TEST_COLLECTION')}`);
-    // Ahora buscamos el enlace dentro de ds-dso-edit-menu, no ds-navbar
-    cy.get(
-      'ds-dso-edit-menu ds-link-menu-item a[data-test="link-menu-item.menu.section.statistics"]',
-    )
-      .should('be.visible')
-      .click();
+    cy.visit('/collections/'.concat(Cypress.env('DSPACE_TEST_COLLECTION')));
+    cy.get('ds-navbar ds-link-menu-item a[data-test="link-menu-item.menu.section.statistics"]').click();
     cy.location('pathname').should('eq', COLLECTIONSTATISTICSPAGE);
   });
 

cypress/e2e/community-statistics.cy.ts

@@ -2,15 +2,11 @@ import { REGEX_MATCH_NON_EMPTY_TEXT } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
 describe('Community Statistics Page', () => {
-  const COMMUNITYSTATISTICSPAGE = `/statistics/communities/${Cypress.env('DSPACE_TEST_COMMUNITY')}`;
+  const COMMUNITYSTATISTICSPAGE = '/statistics/communities/'.concat(Cypress.env('DSPACE_TEST_COMMUNITY'));
 
   it('should load if you click on "Statistics" from a Community page', () => {
-    cy.visit(`/communities/${Cypress.env('DSPACE_TEST_COMMUNITY')}`);
-    cy.get(
-      'ds-dso-edit-menu ds-link-menu-item a[data-test="link-menu-item.menu.section.statistics"]',
-    )
-      .should('be.visible')
-      .click();
+    cy.visit('/communities/'.concat(Cypress.env('DSPACE_TEST_COMMUNITY')));
+    cy.get('ds-navbar ds-link-menu-item a[data-test="link-menu-item.menu.section.statistics"]').click();
     cy.location('pathname').should('eq', COMMUNITYSTATISTICSPAGE);
   });
 

src/app/shared/menu/providers/comcol-subscribe.menu.ts

@@ -10,13 +10,23 @@ import { AuthorizationDataService } from '@dspace/core/data/feature-authorizatio
 import { FeatureID } from '@dspace/core/data/feature-authorization/feature-id';
 import { DSpaceObject } from '@dspace/core/shared/dspace-object.model';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
 import {
   combineLatest,
   Observable,
+  of,
+  Subject,
 } from 'rxjs';
-import { map } from 'rxjs/operators';
+import {
+  first,
+  map,
+  startWith,
+  switchMap,
+} from 'rxjs/operators';
+import { AuthService } from 'src/app/core/auth/auth.service';
 
 import { SubscriptionModalComponent } from '../../subscriptions/subscription-modal/subscription-modal.component';
+import { SubscriptionsDataService } from '../../subscriptions/subscriptions-data.service';
 import { OnClickMenuItemModel } from '../menu-item/models/onclick.model';
 import { MenuItemType } from '../menu-item-type.model';
 import { PartialMenuSection } from '../menu-provider.model';
@@ -27,33 +37,59 @@ import { DSpaceObjectPageMenuProvider } from './helper-providers/dso.menu';
  */
 @Injectable()
 export class SubscribeMenuProvider extends DSpaceObjectPageMenuProvider {
+  private refresh$ = new Subject<void>();
+
   constructor(
+    protected authService: AuthService,
     protected authorizationService: AuthorizationDataService,
+    protected subscriptionService: SubscriptionsDataService,
     protected modalService: NgbModal,
+    protected translateService: TranslateService,
   ) {
     super();
   }
 
   public getSectionsForContext(dso: DSpaceObject): Observable<PartialMenuSection[]> {
-    return combineLatest([
-      this.authorizationService.isAuthorized(FeatureID.CanSubscribe, dso.self),
-    ]).pipe(
-      map(([canSubscribe]) => {
-        return [
-          {
-            visible: canSubscribe,
-            model: {
-              type: MenuItemType.ONCLICK,
-              text: 'subscriptions.tooltip',
-              function: () => {
-                const modalRef = this.modalService.open(SubscriptionModalComponent);
-                modalRef.componentInstance.dso = dso;
-              },
-            } as OnClickMenuItemModel,
-            icon: 'bell',
-          },
-        ] as PartialMenuSection[];
+    const realSections$ = this.refresh$.pipe(
+      startWith(undefined),
+      switchMap(() =>
+        combineLatest([
+          this.authorizationService.isAuthorized(FeatureID.CanSubscribe, dso.self),
+          this.authService.getAuthenticatedUserFromStore().pipe(first()),
+        ]),
+      ),
+      switchMap(([canSubscribe, user]) => {
+        if (!canSubscribe || !user) {
+          return of([]);
+        }
+        const openModal = () => {
+          const modalRef = this.modalService.open(SubscriptionModalComponent);
+          modalRef.componentInstance.dso = dso;
+          modalRef.componentInstance.updated.subscribe(() => this.refresh$.next());
+        };
+        return this.subscriptionService.getSubscriptionsByPersonDSO(user.id, dso.uuid).pipe(
+          map((rd) => {
+            const subscription = rd.payload?.page?.[0];
+            const key = subscription
+              ? 'subscriptions.manage'
+              : 'subscriptions.tooltip';
+            return [
+              {
+                visible: true,
+                model: {
+                  type: MenuItemType.ONCLICK,
+                  text: key,
+                  function: openModal,
+                } as OnClickMenuItemModel,
+                icon: 'bell',
+              } as PartialMenuSection,
+            ];
+          }),
+        );
       }),
     );
+    return realSections$.pipe(
+      startWith([] as PartialMenuSection[]),
+    );
   }
 }