Zowe Suite v1.8.0

zowe · Jan 27, 2020 · 2917116 · 2917116
2 parents f606504 + 38183d0
commit 2917116
Show file tree

Hide file tree

Showing 12 changed files with 464 additions and 68 deletions.
diff --git a/system-apps/system-settings-preferences/webClient/package-lock.json b/system-apps/system-settings-preferences/webClient/package-lock.json
diff --git a/system-apps/system-settings-preferences/webClient/package.json b/system-apps/system-settings-preferences/webClient/package.json
@@ -24,7 +24,7 @@
     "@angular/platform-browser-dynamic": "~6.0.9",
     "@angular/router": "~6.0.9",
     "angular-l10n": "~5.2.0",
-    "@zlux/widgets": "git+ssh://git@github.com:zowe/zlux-widgets.git",
+    "@zlux/widgets": "git+https://github.com:zowe/zlux-widgets.git",
     "angular2-template-loader": "~0.6.2",
     "codelyzer": "~4.4.2",
     "copy-webpack-plugin": "~4.5.2",

diff --git a/virtual-desktop/package-lock.json b/virtual-desktop/package-lock.json
diff --git a/virtual-desktop/package.json b/virtual-desktop/package.json
@@ -24,7 +24,7 @@
     "@angular/platform-browser-dynamic": "~6.0.9",
     "@angular/router": "~6.0.9",
     "@types/html2canvas": "~0.0.35",
-    "@zlux/widgets": "git+ssh://git@github.com/zowe/zlux-widgets.git",
+    "@zlux/widgets": "git+https://github.com/zowe/zlux-widgets.git",
     "angular-l10n": "~5.2.0",
     "angular2-template-loader": "~0.6.2",
     "bootstrap": "~4.3.1",

diff --git a/virtual-desktop/src/app/authentication-manager/authentication-manager.service.ts b/virtual-desktop/src/app/authentication-manager/authentication-manager.service.ts
@@ -133,10 +133,12 @@ export class AuthenticationManager {
   //requestLogin() used to exist here but it was counter-intuitive in behavior to requestLogout.
   //This was not documented and therefore has been removed to prevent misuse and confusion.
 
-  private doLoggoutInner(reason: LoginScreenChangeReason): void {
+  private doLogoutInner(reason: LoginScreenChangeReason): void {
     const windowManager: MVDWindowManagement.WindowManagerServiceInterface =
       this.injector.get(MVDWindowManagement.Tokens.WindowManagerToken);
-    windowManager.closeAllWindows();
+    if (reason == LoginScreenChangeReason.UserLogout) {
+      windowManager.closeAllWindows();
+    }
     this.performLogout().subscribe(
       response => {
         this.loginScreenVisibilityChanged.emit(reason);
@@ -149,7 +151,7 @@ export class AuthenticationManager {
   }
 
   requestLogout(): void {
-    this.doLoggoutInner(LoginScreenChangeReason.UserLogout);
+    this.doLogoutInner(LoginScreenChangeReason.UserLogout);
   }
 
   private performPostLoginActions(): Observable<any> {
@@ -216,7 +218,7 @@ export class AuthenticationManager {
                                             expirationInMS: logoutAfterWarnTimer});
         this.expirationWarning = setTimeout(()=> {
           this.log.warn(`Session timeout reached. Clearing desktop for new login.`);
-          this.doLoggoutInner(LoginScreenChangeReason.SessionExpired);
+          this.doLogoutInner(LoginScreenChangeReason.SessionExpired);
         },logoutAfterWarnTimer);
       },warnTimer);
       this.log.debug(`Set session timeout watcher to notify ${warnTimer}ms before expiration`);

diff --git a/...desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css b/...desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css
@@ -10,6 +10,14 @@
   Copyright Contributors to the Zowe Project.
 */
 
+li.disabled {
+  pointer-events: none;
+}
+
+.menuitem-content.disabled {
+  opacity: 0.3;
+}
+
 .context-menu {
   position: absolute;
   z-index: 20000;
@@ -21,8 +29,17 @@
   background-color:#a6a6a6;
 }
 
+.context-menu .menu-item.top {
+  border-top-width: 1px;
+  border-radius: 4px 4px 0 0;
+}
+
+.context-menu .menu-item.bottom {
+  border-bottom-width: 1px;
+  border-radius: 0 0 4px 4px;
+}
+
 .context-menu>ul {
-  background-color:#eaeaea;
   list-style: none;
   padding: 0;
   margin: 0;
@@ -38,12 +55,14 @@
   font-weight: 400;
   white-space:nowrap;
   color:#404040;
-  border-bottom: 1px solid #ccc;
+  border-style: solid;
+  border-width: 0 1px 1px 1px;
+  border-color: #ccc;
   cursor: pointer;
   position:relative;
 }
 
-.context-menu .multi-menu-item>.menu-expand-caret {
+.context-menu .multi-menu-item .menu-expand-caret {
   position: absolute;
   margin: auto;
   top: 0;
@@ -56,6 +75,15 @@
   border-left: 5px solid #666;
 }
 
+.context-menu .multi-menu-item .menu-expand-caret.propagateChildLeft {
+  left: 5px;
+  margin: auto;
+  margin-left: 0;
+  margin-right: 0;
+  border-left: none;
+  border-right: 5px solid #666;
+}
+
 .context-menu .multi-menu-item.active>.menu-expand-caret {
   border-left: 5px solid #fff;
 }
@@ -65,22 +93,56 @@
 }
 
 .context-menu .multi-menu-item>.submenu {
-  width: 0;
-  height: 0;
-  right: 0;
+  right: 0px;
   top: 0;
   position: absolute;
   display: none;
+  z-index: 1;
+}
+
+.context-menu .multi-menu-item>.submenu.propagateChildLeft {
+  left: 0px;
 }
 
-.context-menu .multi-menu-item>.submenu>com-rs-mvd-context-menu {
-  margin: -10px;
-  padding: 10px;
+.context-menu .multi-menu-item>.submenu>com-rs-mvd-context-menu>.context-menu {
+  left: 0;
+  top: 0;
+}
+
+.context-menu .multi-menu-item>.submenu>com-rs-mvd-context-menu>.context-menu.propagateChildLeft>ul {
+  position: absolute;
+  right: 100%;
 }
 
+.menuitem-content {
+  display: flex;
+  justify-content: space-between;
+}
+
+.menuitem-content-left {
+  display: flex;
+  margin-right: 15px;
+}
 
-.context-menu .menu-item:last-child {
-  border-bottom: none;
+.icon {
+  width: 19px;
+  height: 19px;
+  margin-right: 5px;
+  background-size: contain;
+}
+
+.icon.propagateChildLeft {
+  margin-left: 25px;
+}
+
+.shortcut {
+  margin-left: 15px;
+  right: 5px;
+  font-weight: bold;
+}
+
+.hide-icon {
+  display: none;
 }
 
 /*

diff --git a/...esktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html b/...esktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html
@@ -10,21 +10,91 @@
   Copyright Contributors to the Zowe Project.
 -->
 
-<div class='context-menu' #contextmenu [style.left.px]='this.newX' [style.top.px]='this.newY'>
+<div
+  class='context-menu'
+  #contextmenu
+  [style.left.px]='this.newX'
+  [style.top.px]='this.newY'
+  [class.propagateChildLeft]="this._propagateChildLeft"
+  [class.navigable]='this.isNavigable'
+>
   <ul>
-    <ng-container *ngFor='let menuItem of menuItems'>
+    <ng-container *ngFor='let menuItem of menuItems; let i = index;'>
       <ng-container *ngIf='menuItem.children != null && menuItem.children.length > 0; then multiItem else singleItem'></ng-container>
       <ng-template #singleItem>
-        <li class='menu-item' [class.active]="hovering==menuItem" (click)='itemClicked(menuItem); $event.stopPropagation(); closeContextMenu()' (mouseover)="hovering=menuItem">
-          <span>{{menuItem.text}}</span>
+        <li
+          class='menu-item'
+          [class.active]="i==this.activeIndex"
+          [class.top]="i==0"
+          [class.bottom]="i==menuItems.length-1"
+          [class.disabled]="menuItem.disabled"
+          (click)='itemClicked(menuItem); $event.stopPropagation();'
+          (mouseover)="this.activeIndex=i; makeNavigable(); $event.stopPropagation();"
+        >
+        <div
+          class="menuitem-content"
+          [class.disabled]="menuItem.disabled"  
+        >
+            <div class="menuitem-content-left">
+              <img
+                class="icon"
+                [src]="menuItem.icon ? this.generateIcon(menuItem.icon) : null"
+                [class.hide-icon]="!menuItem.icon"
+              >
+              <div>{{menuItem.text}}</div>
+            </div>
+            <div class="shortcut">
+              {{this.computeShortcutString(menuItem)}}
+            </div>
+          </div>
         </li>
       </ng-template>
       <ng-template #multiItem>
-        <li class='menu-item multi-menu-item' [class.active]="hovering==menuItem" (mouseover)="hovering=menuItem">
-          <span>{{menuItem.text}}</span>
-          <div class="menu-expand-caret"></div>
-          <div class="submenu">
-            <com-rs-mvd-context-menu [xPos]="0" [yPos]="0" [menuItems]="menuItem.children" (complete)="closeContextMenu()"></com-rs-mvd-context-menu>
+        <li
+          class='menu-item multi-menu-item'
+          [class.active]="i==this.activeIndex"
+          [class.top]="i==0"
+          [class.bottom]="i==menuItems.length-1"
+          [class.disabled]="menuItem.disabled"
+          (click)='itemClicked(menuItem); $event.stopPropagation();'
+          (mouseover)="this.activeIndex=i; makeNavigable(); $event.stopPropagation();"
+        >
+          <div
+            class="submenu"
+            [class.propagateChildLeft]="this._propagateChildLeft"
+          >
+            <com-rs-mvd-context-menu
+              [xPos]="-2"
+              [yPos]="-5"
+              [menuItems]="menuItem.children"
+              [isChildMenu]="true"
+              [isParentActive]="i==this.activeIndex"
+              [parentText]="this.menuItems[i].text"
+              [parentNavigable]="this.isNavigable"
+              [propagateChildLeft]="this._propagateChildLeft"
+              (complete)="closeContextMenu()"
+              (makeParentUnnavigable)="makeUnnavigable()"
+              (makeParentNavigable)="makeNavigable()"
+              (sendRefToParent)="receiveRefFromChild($event)"
+            ></com-rs-mvd-context-menu>
+          </div>
+          <div
+            class="menuitem-content"
+            [class.disabled]="menuItem.disabled"  
+          >
+            <div class="menuitem-content-left">
+              <img
+                class="icon"
+                [src]="menuItem.icon ? this.generateIcon(menuItem.icon) : null"
+                [class.hide-icon]="!menuItem.icon"
+                [class.propagateChildLeft]="this._propagateChildLeft"
+              >
+              <div>{{menuItem.text}}</div>
+            </div>
+            <div
+              class="menu-expand-caret"
+              [class.propagateChildLeft]="this._propagateChildLeft"
+            ></div>
           </div>
         </li>
       </ng-template>