From 2d40d0a2e2b2694392d8f8dc136576c6bcc1b9de Mon Sep 17 00:00:00 2001
From: Rick Bartlett <palmtreefrb@hotmail.com>
Date: Thu, 20 Jan 2022 08:12:11 -0800
Subject: [PATCH 1/2] Hide Share button from My Projects Page

Remove consol.log()

Add additional business logic to header buttons

refactor rename twig header variable param. remove console.log debug files
---
 .../container/languageforge.html.twig         |  4 +--
 .../bellows/core/navbar.controller.ts         | 26 ++++++++++++++-----
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/Site/views/languageforge/container/languageforge.html.twig b/src/Site/views/languageforge/container/languageforge.html.twig
index 74cabe0485..9b48bf6ad1 100644
--- 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" id="settings-dropdown-button" uib-dropdown data-ng-class="{'app-settings-available': $ctrl.header.settings.length > 0 && $ctrl.currentUserIsProjectManager}">
                         <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">
                         <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/angular-app/bellows/core/navbar.controller.ts b/src/angular-app/bellows/core/navbar.controller.ts
index b6070c35b9..e72d50839b 100644
--- a/src/angular-app/bellows/core/navbar.controller.ts
+++ b/src/angular-app/bellows/core/navbar.controller.ts
@@ -21,18 +21,24 @@ export class NavbarController implements angular.IController {
   project: Project;
   interfaceConfig: InterfaceConfig;
   currentUserIsProjectManager: boolean;
-  displayShareButton: boolean;
+  displayHeaderButtons: 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;
@@ -69,13 +75,21 @@ export class NavbarController implements angular.IController {
         this.currentUserIsProjectManager =
           (session.data.userProjectRole === ProjectRoles.MANAGER.key) ||
           (session.data.userProjectRole === ProjectRoles.TECH_SUPPORT.key);
-        this.displayShareButton =
+        this.displayHeaderButtons =
           (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.displayHeaderButtons) {
+        this.isLexiconProject = true;
+      }else{
+        this.isLexiconProject = false;
+      }
+    });
   }
 
   onUpdate = ($event: { interfaceConfig: InterfaceConfig}): void => {

From c5a1172574d4fc06ba339338b351cedc1a3d8d5e Mon Sep 17 00:00:00 2001
From: Chris Hirt <chris@hirtfamily.net>
Date: Thu, 10 Mar 2022 14:54:52 +0700
Subject: [PATCH 2/2] simplify logic in template / tweak E2E tests

change assertion to isDisplayed()

simplify logic in template

- rename displayHeaderButtons back to displayShareButton

- displayShareButton is only for share button, not for settings button

- remove CSS app-settings-available and put logic directly in template ng-if

fix flaky test

This test asserts that the settingsMenuLink is not  present, and the appropriate test should be `isPresent()` not `isDisplayed()`
---
 .../container/languageforge.html.twig              |  4 ++--
 .../languageforge/theme/default/sass/_global.scss  | 14 +-------------
 src/angular-app/bellows/core/navbar.controller.ts  | 10 +++++-----
 test/app/bellows/project-settings.e2e-spec.ts      |  2 +-
 .../lexicon/settings/config-fields.e2e-spec.ts     |  2 +-
 .../settings/config-input-systems.e2e-spec.ts      |  4 ++--
 6 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/src/Site/views/languageforge/container/languageforge.html.twig b/src/Site/views/languageforge/container/languageforge.html.twig
index 9b48bf6ad1..61aa16e198 100644
--- 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.isLexiconProject" 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.isLexiconProject">
+                    <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
index 2767afa19a..0924148c17 100644
--- 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
index e72d50839b..b1430a718f 100644
--- a/src/angular-app/bellows/core/navbar.controller.ts
+++ b/src/angular-app/bellows/core/navbar.controller.ts
@@ -21,7 +21,7 @@ export class NavbarController implements angular.IController {
   project: Project;
   interfaceConfig: InterfaceConfig;
   currentUserIsProjectManager: boolean;
-  displayHeaderButtons: boolean;
+  displayShareButton: boolean;
   projectTypeNames: ProjectTypeNames;
   siteName: string;
   isLexiconProject: boolean = false;
@@ -29,7 +29,7 @@ export class NavbarController implements angular.IController {
   static $inject = [
     '$scope',
     '$uibModal',
-    'projectService', 
+    'projectService',
     'sessionService',
     'offlineCacheUtils',
     'applicationHeaderService'];
@@ -75,7 +75,7 @@ export class NavbarController implements angular.IController {
         this.currentUserIsProjectManager =
           (session.data.userProjectRole === ProjectRoles.MANAGER.key) ||
           (session.data.userProjectRole === ProjectRoles.TECH_SUPPORT.key);
-        this.displayHeaderButtons =
+        this.displayShareButton =
           (this.currentUserIsProjectManager || (this.project.allowSharing && this.session.data.userIsProjectMember));
       }
 
@@ -84,9 +84,9 @@ export class NavbarController implements angular.IController {
       this.siteName = session.baseSite();
     });
     this.$scope.$on('$locationChangeStart', (event, next, current) => {
-      if (current.includes('/lexicon') && !current.includes('/new-project') && this.displayHeaderButtons) {
+      if (current.includes('/lexicon') && !current.includes('/new-project')) {
         this.isLexiconProject = true;
-      }else{
+      } else {
         this.isLexiconProject = false;
       }
     });
diff --git a/test/app/bellows/project-settings.e2e-spec.ts b/test/app/bellows/project-settings.e2e-spec.ts
index e6509a4bb0..83134f4942 100644
--- 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
index f1aba344cd..cc011652cc 100644
--- 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
index 2d3d776b6e..ad780a41d1 100644
--- 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);