+
diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar-widget/launchbar-widget.component.ts b/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar-widget/launchbar-widget.component.ts
index 195f5bf8b..3d3cd4302 100644
--- a/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar-widget/launchbar-widget.component.ts
+++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar-widget/launchbar-widget.component.ts
@@ -44,6 +44,7 @@ export class LaunchbarWidgetComponent implements MVDHosting.ZoweNotificationWatc
@Output() popupStateChanged = new EventEmitter
();
@ViewChild('usericon') userIcon: ElementRef;
@ViewChild('logoutbutton') logoutButton: ElementRef;
+ @ViewChild('notificationicon') notificationIcon: ElementRef;
private authenticationManager: MVDHosting.AuthenticationManagerInterface;
public notificationsVisible: boolean;
private info: any[];
@@ -120,6 +121,12 @@ export class LaunchbarWidgetComponent implements MVDHosting.ZoweNotificationWatc
this.popupVisible = false;
this.popupStateChanged.emit(this.popupVisible);
}
+
+ if(this.notificationsVisible && event
+ && !this.notificationIcon.nativeElement.contains(event.target)
+ && this.logoutButton.nativeElement !== event.target) {
+ this.notificationsVisible = false;
+ }
}
setLanguage(value: string): void {
@@ -136,12 +143,18 @@ export class LaunchbarWidgetComponent implements MVDHosting.ZoweNotificationWatc
}
handleMessageAdded(message: any): void {
+ let recievedDate = new Date(message.notification.date);
+ message.recievedDate = recievedDate;
this.notifications.unshift(message)
- this.info = this.parseInfo()
- let ref = this.snackBar.openFromComponent(SnackbarComponent, {data: this.info[0], duration: 5000, panelClass: "org_zowe_zlux_ng2desktop_snackbar", verticalPosition: 'top', horizontalPosition: 'end'})
+ this.info = this.parsePluginInfo()
+ let styleClass = "org_zowe_zlux_ng2desktop_snackbar";
+ if (message.notification.styleClass) {
+ styleClass = message.notification.styleClass;
+ }
+ let ref = this.snackBar.openFromComponent(SnackbarComponent, {data: this.info[0], duration: 5000, panelClass: styleClass, verticalPosition: 'top', horizontalPosition: 'end'})
ref.onAction().subscribe(() => {
ZoweZLUX.notificationManager.dismissNotification(message.id)
- this.info = this.parseInfo()
+ this.info = this.parsePluginInfo()
});
}
@@ -149,7 +162,30 @@ export class LaunchbarWidgetComponent implements MVDHosting.ZoweNotificationWatc
this.notifications.splice(this.notifications.findIndex(x => x.id === id), 1)
}
- parseInfo(): any[] {
+ get timeSince() {
+ let times = []
+ for (let notification of this.notifications) {
+ let currentDate = new Date();
+ var seconds = Math.floor((currentDate.getTime() - notification.recievedDate.getTime())/1000);
+
+ var h = Math.floor(seconds / 3600);
+ var m = Math.floor(seconds % 3600 / 60);
+
+ var hDisplay = h > 0 ? h + (h == 1 ? " hour, " : " hours, ") : "";
+ var mDisplay = m > 0 ? m + (m == 1 ? " minute " : " minutes ") : "";
+
+ if (h > 0) {
+ times.push(hDisplay + " ago")
+ } else if (m > 0) {
+ times.push(mDisplay + " ago");
+ } else {
+ times.push("Less than a minute ago")
+ }
+ }
+ return times
+ }
+
+ parsePluginInfo(): any[] {
let info: any[] = [];
for (let notification of this.notifications) {
@@ -162,25 +198,9 @@ export class LaunchbarWidgetComponent implements MVDHosting.ZoweNotificationWatc
if (imgSrc === "") {
imgSrc = require('../../../../../assets/images/launchbar/notifications/zowe.png')
}
-// let currentDate = new Date();
-// let notificationTime = notification['notification'].date.toString().split('T')[1].split('.')[0]
-// let currentTime = currentDate.toUTCString().split(' ')[4]
-
-
- // This logic is wrong but kinda works, if one minute changes then all the minutes change
- // Need to also do logic about if more than a day
-// let hourDifference = parseInt(currentTime.split(':')[0]) - parseInt(notificationTime.split(':')[0])
-// let minuteDifference = parseInt(currentTime.split(':')[1]) - parseInt(notificationTime.split(':')[1])
-// let timeSince: string;
-// if (hourDifference > 0) {
-// timeSince = hourDifference + " hours ago"
-// } else if (minuteDifference > 0) {
-// timeSince = minuteDifference + " minutes ago"
-// } else {
-// timeSince = "Less than a minute ago"
-// }
-
- info.push({'title': notification['notification'].title, 'message': notification['notification'].message, 'timeSince': 'timeSince', "imgSrc": imgSrc})
+
+
+ info.push({'title': notification['notification'].title, 'message': notification['notification'].message, "imgSrc": imgSrc})
}
return info
@@ -188,11 +208,11 @@ export class LaunchbarWidgetComponent implements MVDHosting.ZoweNotificationWatc
deleteNotification(item: any) {
ZoweZLUX.notificationManager.dismissNotification(item.id)
- this.info = this.parseInfo();
+ this.info = this.parsePluginInfo();
}
- focusApplication(item: any) {
- let pluginId = ZoweZLUX.notificationManager.getAll()[item].plugin
+ focusApplication(i: any) {
+ let pluginId = this.notifications[i].notification.plugin
for(let item of this.menuItems) {
if (item.plugin.getBasePlugin().getIdentifier() === pluginId) {
diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar/launchbar.component.ts b/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar/launchbar.component.ts
index 0e70f17f5..869590ac5 100644
--- a/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar/launchbar.component.ts
+++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar/launchbar.component.ts
@@ -40,7 +40,6 @@ export class LaunchbarComponent {
newPosition: number;
loggedIn: boolean;
helperLoggedIn: boolean;
- private pluginManager: MVDHosting.PluginManagerInterface;
private applicationManager: MVDHosting.ApplicationManagerInterface;
private authenticationManager: MVDHosting.AuthenticationManagerInterface;
propertyWindowPluginDef: DesktopPluginDefinitionImpl;
@@ -52,7 +51,6 @@ export class LaunchbarComponent {
private translation: TranslationService
) {
// Workaround for AoT problem with namespaces (see angular/angular#15613)
- this.pluginManager = this.injector.get(MVDHosting.Tokens.PluginManagerToken);
this.applicationManager = this.injector.get(MVDHosting.Tokens.ApplicationManagerToken);
this.authenticationManager = this.injector.get(MVDHosting.Tokens.AuthenticationManagerToken);
this.allItems = [];
@@ -65,17 +63,17 @@ export class LaunchbarComponent {
getAllItems(): void {
this.allItems = [];
- this.pluginManager.loadApplicationPluginDefinitions().then(pluginDefinitions => {
- pluginDefinitions.forEach((p)=> {
- if (p.getBasePlugin().getWebContent() != null) {
- if (p.getIdentifier() === 'org.zowe.zlux.appmanager.app.propview') {
+ ZoweZLUX.pluginManager.loadPlugins('application').then((plugins: Plugin[]) => {
+ plugins.forEach((p: any)=> {
+ if (p.webContent != null) {
+ if (p.identifier === 'org.zowe.zlux.appmanager.app.propview') {
const pluginImpl:DesktopPluginDefinitionImpl = p as DesktopPluginDefinitionImpl;
this.propertyWindowPluginDef = pluginImpl;
- } else if (p.getIdentifier() === 'org.zowe.zlux.ng2desktop.settings') {
+ } else if (p.identifier === 'org.zowe.zlux.ng2desktop.settings') {
// UI decision made to not display Settings application with the main application menu.
// The Settings apps will be accessible via their own dedicated panel, and need not hog the menu.
} else {
- this.allItems.push(new PluginLaunchbarItem(p as DesktopPluginDefinitionImpl, this.windowManager));
+ this.allItems.push(new PluginLaunchbarItem(new DesktopPluginDefinitionImpl(p), this.windowManager));
}
}
})
@@ -86,6 +84,7 @@ export class LaunchbarComponent {
if (this.authenticationManager.getUsername() != null) {
this.loggedIn = true;
} else {
+ this.allItems = [];
this.loggedIn = false;
this.helperLoggedIn = false;
}
diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/shared/context-utils.ts b/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/shared/context-utils.ts
index 056db2587..121baf5e5 100644
--- a/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/shared/context-utils.ts
+++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/shared/context-utils.ts
@@ -75,7 +75,7 @@ function openStandalone(item: LaunchbarItem): void {
// Still allows IFrames to comprehend URL parameters if address is copy/pasted later. Should not break any app2app possibilities
window.open(`${location.origin}${(window as any).ZoweZLUX.uriBroker.pluginResourceUri(item.plugin, item.plugin.getBasePlugin().getWebContent().startingPage)}`);
} else {
- window.open(`${location.href}?pluginId=${item.plugin.basePlugin.getIdentifier()}`);
+ window.open(`${location.href}?pluginId=${item.plugin.basePlugin.getIdentifier()}&showLogin=1`);
}
}
diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/shared/snackbar/snackbar.component.css b/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/shared/snackbar/snackbar.component.css
index 234b04055..a3af0401d 100644
--- a/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/shared/snackbar/snackbar.component.css
+++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/shared/snackbar/snackbar.component.css
@@ -22,7 +22,17 @@
font-size: 16px;
}
+.snackbar-data {
+ word-break: break-word;
+ font-size: small;
+ display: -webkit-box;
+ -webkit-line-clamp: 2;
+ -webkit-box-orient: vertical;
+ overflow: hidden;
+}
+
.snackbar-container {
+ width: 315px;
display: inline-block;
}
@@ -31,7 +41,7 @@
}
.snackbar-info {
- width: 180px;
+ width: 200px;
display: inline-block;
vertical-align: top;
margin: 5px;
@@ -62,6 +72,7 @@
border: none;
transition: 0.3s;
padding: 5px;
+ color: inherit;
}
.snackbar-dismiss-button:hover {
diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/shared/window-manager.service.ts b/virtual-desktop/src/app/window-manager/mvd-window-manager/shared/window-manager.service.ts
index 681dd0b85..1c238c3da 100644
--- a/virtual-desktop/src/app/window-manager/mvd-window-manager/shared/window-manager.service.ts
+++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/shared/window-manager.service.ts
@@ -27,6 +27,8 @@ import { ContextMenuItem, Angular2PluginWindowActions,
} from 'pluginlib/inject-resources';
type PluginIdentifier = string;
+const DEFAULT_DESKTOP_SHORT_TITLE = 'Zowe';
+const DEFAULT_DESKTOP_TITLE = 'Zowe Desktop';
@Injectable()
export class WindowManagerService implements MVDWindowManagement.WindowManagerServiceInterface {
@@ -434,6 +436,7 @@ export class WindowManagerService implements MVDWindowManagement.WindowManagerSe
this.applicationManager.killApplication(desktopWindow.plugin, appId);
}
this.destroyWindow(windowId);
+ this.setDesktopTitle();
}).catch((info:any)=> {
this.logger.warn(`Window could not be closed because of viewport. Details=`,info);
return;
@@ -454,6 +457,7 @@ export class WindowManagerService implements MVDWindowManagement.WindowManagerSe
windows.forEach((window: DesktopWindow)=> {
this.closeWindow(window.windowId);
});
+ this.setDesktopTitle();
}
registerCloseHandler(windowId: MVDWindowManagement.WindowId, handler: () => Promise): void {
@@ -484,6 +488,7 @@ export class WindowManagerService implements MVDWindowManagement.WindowManagerSe
}
desktopWindow.windowTitle = title;
+ this.setDesktopTitle(desktopWindow.windowTitle);
}
requestWindowFocus(destination: MVDWindowManagement.WindowId): boolean {
@@ -511,6 +516,7 @@ export class WindowManagerService implements MVDWindowManagement.WindowManagerSe
this._lastScreenshotPluginId = desktopWindow.plugin.getIdentifier();
},500); //delay a bit for performance perception
}
+ this.setDesktopTitle(desktopWindow.windowTitle);
return true;
}
@@ -659,7 +665,7 @@ export class WindowManagerService implements MVDWindowManagement.WindowManagerSe
}
}
- spawnContextMenu(windowId: MVDWindowManagement.WindowId, x: number, y: number, items: ContextMenuItem[], isAbsolutePos?: boolean): void {
+ spawnContextMenu(windowId: MVDWindowManagement.WindowId, x: number, y: number, items: ContextMenuItem[], isAbsolutePos?: boolean): boolean {
const desktopWindow = this.windowMap.get(windowId);
if (desktopWindow == null) {
throw new Error('Attempted to spawn context menu for null window');
@@ -669,10 +675,22 @@ export class WindowManagerService implements MVDWindowManagement.WindowManagerSe
const newY = isAbsolutePos ? y : windowPos.top + y + WindowManagerService.WINDOW_HEADER_HEIGHT;
if ((newX >= windowPos.left && newX <= (windowPos.left+windowPos.width))
&& (newY >= windowPos.top && newY <= (windowPos.top+windowPos.height))) {
- this.contextMenuRequested.next({xPos: newX, yPos: newY, items: items});
+ this.contextMenuRequested.next({xPos: newX, yPos: newY, items: items});
+ return true;
} else {
this.logger.warn(`Rejecting context menu due to invalid coord ${newX},${newY} for app at ${windowPos.left},${windowPos.top} w=${windowPos.width}, h=${windowPos.height}`);
+ return false;
+ }
+ }
+
+ setDesktopTitle(title?:String) {
+ // TODO: Abstract app count to new function
+ /* const appCount = this.runningPluginMap.size;*/
+ let newTitle = DEFAULT_DESKTOP_TITLE;
+ if(title) {
+ newTitle=[DEFAULT_DESKTOP_SHORT_TITLE, /*appCount + ' Apps',*/ title].join(' | ');
}
+ document.title = newTitle;
}
}
diff --git a/virtual-desktop/src/app/window-manager/simple-window-manager/simple-window-manager.module.ts b/virtual-desktop/src/app/window-manager/simple-window-manager/simple-window-manager.module.ts
index 33b18a42b..a30a0f73b 100644
--- a/virtual-desktop/src/app/window-manager/simple-window-manager/simple-window-manager.module.ts
+++ b/virtual-desktop/src/app/window-manager/simple-window-manager/simple-window-manager.module.ts
@@ -16,11 +16,12 @@ import { CommonModule } from '@angular/common';
import { SimpleWindowManagerService } from './simple-window-manager.service';
import { SimpleComponent } from './simple.component';
import { ApplicationManagerModule } from '../../application-manager/application-manager.module';
-
+import { AuthenticationModule } from '../../authentication-manager/authentication-manager.module';
@NgModule({
imports: [
ApplicationManagerModule,
+ AuthenticationModule,
CommonModule,
],
declarations: [
diff --git a/virtual-desktop/src/app/window-manager/simple-window-manager/simple-window-manager.service.ts b/virtual-desktop/src/app/window-manager/simple-window-manager/simple-window-manager.service.ts
index 816129f00..01e1c6ee4 100644
--- a/virtual-desktop/src/app/window-manager/simple-window-manager/simple-window-manager.service.ts
+++ b/virtual-desktop/src/app/window-manager/simple-window-manager/simple-window-manager.service.ts
@@ -73,8 +73,9 @@ export class SimpleWindowManagerService implements MVDWindowManagement.WindowMan
return this.theViewportId;
}
- spawnContextMenu(windowId: MVDWindowManagement.WindowId, xRelative: number, yRelative: number, items: ContextMenuItem[]): void {
+ spawnContextMenu(windowId: MVDWindowManagement.WindowId, xRelative: number, yRelative: number, items: ContextMenuItem[]): boolean {
this.contextMenuRequested.next({xPos: xRelative, yPos: yRelative, items: items});
+ return true;
}
private generateWindowProviders(windowId: MVDWindowManagement.WindowId, viewportId: MVDHosting.ViewportId): Map {
diff --git a/virtual-desktop/src/app/window-manager/simple-window-manager/simple.component.html b/virtual-desktop/src/app/window-manager/simple-window-manager/simple.component.html
index b3c8571af..9ec1f424d 100644
--- a/virtual-desktop/src/app/window-manager/simple-window-manager/simple.component.html
+++ b/virtual-desktop/src/app/window-manager/simple-window-manager/simple.component.html
@@ -11,14 +11,24 @@
-->
-
+
+ {{error}}
+
+
+
+
+
+
+
+
+
+