Merge pull request #1283 from sillsdev/feature/hide-share-button-from…

…-my-project-page Hide Share button from My Projects Page Due to multiple authors, I have done a traditional merge with squashed commits so that each author gets one commit.
sillsdev · Mar 10, 2022 · 5820ae2 · 5820ae2
2 parents fcc0c75 + c5a1172
commit 5820ae2
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 23 deletions.
diff --git a/src/Site/views/languageforge/container/languageforge.html.twig b/src/Site/views/languageforge/container/languageforge.html.twig
@@ -81,7 +81,7 @@
                     <breadcrumbs id="top" class="breadcrumbs d-none d-md-block"></breadcrumbs>
                 </div>
                 <ul class="nav navbar-nav">
-                    <li class="nav-item" ng-if="$ctrl.project" id="settings-dropdown-button" uib-dropdown data-ng-class="{'app-settings-available': $ctrl.header.settings.length > 0 && $ctrl.currentUserIsProjectManager}">
+                    <li class="nav-item" ng-if="$ctrl.isLexiconProject && $ctrl.currentUserIsProjectManager" id="settings-dropdown-button" uib-dropdown>
                         <a id="settingsBtn" class="btn btn-primary my-auto" uib-dropdown-toggle title="Settings" href="#">
                             <i class="fa fa-cog iconPadding"></i><span>Settings</span>
                         </a>
@@ -95,7 +95,7 @@
                             {% endverbatim %}
                         </div>
                     </li>
-                    <li class='nav-item' ng-if="$ctrl.project && $ctrl.displayShareButton">
+                    <li class='nav-item' ng-if="$ctrl.isLexiconProject && $ctrl.displayShareButton">
                         <a id="shareBtn" class="btn btn-primary my-auto" title="Share" href="#"
                                          ng-click="$ctrl.openShareWithOthersModal()">
                             <i class="fa fa-share-alt iconPadding"></i><span>Share</span>

diff --git a/src/Site/views/languageforge/theme/default/sass/_global.scss b/src/Site/views/languageforge/theme/default/sass/_global.scss
@@ -264,18 +264,6 @@
     }
   }
 
-  #settings-dropdown-button:not(.app-settings-available) {
-    .dropdown-toggle {
-      visibility: hidden;
-    }
-  }
-
-  #settings-dropdown-button.app-settings-available {
-    .dropdown-toggle {
-      visibility: visible;
-    }
-  }
-
   #settingsBtn {
     margin: 12px;
     margin-right: 6px;
@@ -287,7 +275,7 @@
       font-size: 1rem;
     }
   }
-  
+
   #settingsBtn::after {
     display:none;
   }

diff --git a/src/angular-app/bellows/core/navbar.controller.ts b/src/angular-app/bellows/core/navbar.controller.ts
@@ -24,15 +24,21 @@ export class NavbarController implements angular.IController {
   displayShareButton: boolean;
   projectTypeNames: ProjectTypeNames;
   siteName: string;
+  isLexiconProject: boolean = false;
 
-  static $inject = ['$uibModal',
-    'projectService', 'sessionService',
+  static $inject = [
+    '$scope',
+    '$uibModal',
+    'projectService',
+    'sessionService',
     'offlineCacheUtils',
     'applicationHeaderService'];
-  constructor(private readonly $modal: ModalService,
+  constructor(private readonly $scope: angular.IScope,
+              private readonly $modal: ModalService,
               private readonly projectService: ProjectService, private readonly sessionService: SessionService,
               private readonly offlineCacheUtils: OfflineCacheUtilsService,
-              private readonly applicationHeaderService: ApplicationHeaderService) { }
+              private readonly applicationHeaderService: ApplicationHeaderService,
+              ) { }
 
   $onInit(): void {
     this.projectTypeNames = this.projectService.data.projectTypeNames;
@@ -72,10 +78,18 @@ export class NavbarController implements angular.IController {
         this.displayShareButton =
           (this.currentUserIsProjectManager || (this.project.allowSharing && this.session.data.userIsProjectMember));
       }
+
       this.rights.canCreateProject =
         session.hasSiteRight(this.sessionService.domain.PROJECTS, this.sessionService.operation.CREATE);
       this.siteName = session.baseSite();
     });
+    this.$scope.$on('$locationChangeStart', (event, next, current) => {
+      if (current.includes('/lexicon') && !current.includes('/new-project')) {
+        this.isLexiconProject = true;
+      } else {
+        this.isLexiconProject = false;
+      }
+    });
   }
 
   onUpdate = ($event: { interfaceConfig: InterfaceConfig}): void => {

diff --git a/test/app/bellows/project-settings.e2e-spec.ts b/test/app/bellows/project-settings.e2e-spec.ts
@@ -15,7 +15,7 @@ describe('Bellows E2E Project Settings app', () => {
     await loginPage.loginAsMember();
     await projectsPage.get();
     await projectsPage.clickOnProject(constants.testProjectName);
-    expect<string>(await settingsPage.settingsMenuLink.getAttribute('class')).not.toContain('app-settings-available');
+    expect<boolean>(await settingsPage.settingsMenuLink.isPresent()).toBe(false);
   });
 
   it('System Admin can manage project', async () => {

diff --git a/test/app/languageforge/lexicon/settings/config-fields.e2e-spec.ts b/test/app/languageforge/lexicon/settings/config-fields.e2e-spec.ts
@@ -40,7 +40,7 @@ describe('Lexicon E2E Configuration Fields', () => {
   });
 
   it('can go to Configuration and select unified Fields tab', async () => {
-    expect<any>(await configPage.settingsMenuLink.isDisplayed()).toBe(true);
+    expect<any>(await configPage.settingsMenuLink.isPresent()).toBe(true);
     await configPage.get();
     expect<any>(await configPage.applyButton.isDisplayed()).toBe(true);
     expect<any>(await configPage.applyButton.isEnabled()).toBe(false);

diff --git a/test/app/languageforge/lexicon/settings/config-input-systems.e2e-spec.ts b/test/app/languageforge/lexicon/settings/config-input-systems.e2e-spec.ts
@@ -17,14 +17,14 @@ describe('Lexicon E2E Configuration Input Systems', () => {
     await loginPage.loginAsUser();
     await projectsPage.get();
     await projectsPage.clickOnProject(constants.testProjectName);
-    expect<any>(await configPage.settingsMenuLink.getAttribute('class')).not.toContain('app-settings-available');
+    expect<boolean>(await configPage.settingsMenuLink.isPresent()).toBe(false);
   });
 
   it('setup: login as manager, select test project, goto configuration', async () => {
     await loginPage.loginAsManager();
     await projectsPage.get();
     await projectsPage.clickOnProject(constants.testProjectName);
-    expect<any>(await configPage.settingsMenuLink.isDisplayed()).toBe(true);
+    expect<any>(await configPage.settingsMenuLink.isPresent()).toBe(true);
     await configPage.get();
     expect<any>(await configPage.applyButton.isDisplayed()).toBe(true);
     expect<any>(await configPage.applyButton.isEnabled()).toBe(false);