From d1be432d75e357c0007e6b64d4dc2ff093bab5f9 Mon Sep 17 00:00:00 2001 From: Piotr Zarzycki Date: Thu, 16 May 2024 13:48:33 +0200 Subject: [PATCH] Add Open in Notes in nomad url helper warning (reference #54) --- .../controller/CommandLaunchNomadLink.as | 3 ++- .../SnackbarNomadHelperUrl.as | 14 +++++++++- .../SnackbarNomadHelperUrlContent.mxml | 26 +++++++++++++++---- .../beads/SnackbarNomadHelperUrlModel.as | 1 + .../beads/SnackbarNomadHelperUrlView.as | 1 + 5 files changed, 38 insertions(+), 7 deletions(-) diff --git a/Super.Human.Portal_Royale/src/net/apacheRoyaleTemplatedApp/controller/CommandLaunchNomadLink.as b/Super.Human.Portal_Royale/src/net/apacheRoyaleTemplatedApp/controller/CommandLaunchNomadLink.as index 002131f..c4c6af9 100644 --- a/Super.Human.Portal_Royale/src/net/apacheRoyaleTemplatedApp/controller/CommandLaunchNomadLink.as +++ b/Super.Human.Portal_Royale/src/net/apacheRoyaleTemplatedApp/controller/CommandLaunchNomadLink.as @@ -55,7 +55,8 @@ package controller SnackbarNomadHelperUrl.show(loginProxy.config.config.domino_data_directory, loginProxy.config.config.nomad_base_url, - loginProxy.config.config.configuration_link.nomadURL); + loginProxy.config.config.configuration_link.nomadURL, + loginProxy.config.config.configuration_link.url); } try diff --git a/Super.Human.Portal_Royale/src/net/apacheRoyaleTemplatedApp/view/controls/snackbarNomadHelperUrl/SnackbarNomadHelperUrl.as b/Super.Human.Portal_Royale/src/net/apacheRoyaleTemplatedApp/view/controls/snackbarNomadHelperUrl/SnackbarNomadHelperUrl.as index 5ddafe9..07b2ca5 100644 --- a/Super.Human.Portal_Royale/src/net/apacheRoyaleTemplatedApp/view/controls/snackbarNomadHelperUrl/SnackbarNomadHelperUrl.as +++ b/Super.Human.Portal_Royale/src/net/apacheRoyaleTemplatedApp/view/controls/snackbarNomadHelperUrl/SnackbarNomadHelperUrl.as @@ -12,7 +12,8 @@ package view.controls.snackbarNomadHelperUrl this.typeNames = "jewel snackbar layout SnackbarNomadHelperUrl"; } - public static function show(dataDirectory:String, nomadBaseUrl:String, configurationNomadUrl:String, parent:Object = null):SnackbarNomadHelperUrl + public static function show(dataDirectory:String, nomadBaseUrl:String, configurationNomadUrl:String, + configurationNotesUrl:String, parent:Object = null):SnackbarNomadHelperUrl { var snackbar:SnackbarNomadHelperUrl = new SnackbarNomadHelperUrl(); snackbar.message = ""; @@ -21,6 +22,7 @@ package view.controls.snackbarNomadHelperUrl snackbar.dataDirectory = dataDirectory; snackbar.nomadBaseUrl = nomadBaseUrl; snackbar.configurationNomadUrl = configurationNomadUrl; + snackbar.configurationNotesUrl = configurationNotesUrl; snackbar.show(parent); return snackbar; @@ -55,5 +57,15 @@ package view.controls.snackbarNomadHelperUrl { SnackbarNomadHelperUrlModel(model).configurationNomadUrl = value; } + + public function get configurationNotesUrl():String + { + return SnackbarNomadHelperUrlModel(model).configurationNotesUrl; + } + + public function set configurationNotesUrl(value:String):void + { + SnackbarNomadHelperUrlModel(model).configurationNotesUrl = value; + } } } \ No newline at end of file diff --git a/Super.Human.Portal_Royale/src/net/apacheRoyaleTemplatedApp/view/controls/snackbarNomadHelperUrl/SnackbarNomadHelperUrlContent.mxml b/Super.Human.Portal_Royale/src/net/apacheRoyaleTemplatedApp/view/controls/snackbarNomadHelperUrl/SnackbarNomadHelperUrlContent.mxml index 7a45b26..9f79d0b 100644 --- a/Super.Human.Portal_Royale/src/net/apacheRoyaleTemplatedApp/view/controls/snackbarNomadHelperUrl/SnackbarNomadHelperUrlContent.mxml +++ b/Super.Human.Portal_Royale/src/net/apacheRoyaleTemplatedApp/view/controls/snackbarNomadHelperUrl/SnackbarNomadHelperUrlContent.mxml @@ -13,6 +13,9 @@ public var dataDirectory:String = ""; public var nomadBaseUrl:String = ""; + [Bindable] + public var configurationNotesUrl:String = ""; + [Bindable] public var configurationNomadUrl:String = ""; @@ -32,6 +35,12 @@ ClipboardText.copyToClipboard(nomadBaseUrl + "/nomadhelper.html"); } + private function onOpenInNotesClick(event:MouseEvent):void + { + if (!configurationNomadUrl) return; + navigateToURL(new URLRequest(configurationNotesUrl), "_blank"); + } + private function onOpenInNomadClick(event:MouseEvent):void { if (!configurationNomadUrl) return; @@ -74,11 +83,18 @@ - - - - - + + + + + + + + + + + + diff --git a/Super.Human.Portal_Royale/src/net/apacheRoyaleTemplatedApp/view/controls/snackbarNomadHelperUrl/beads/SnackbarNomadHelperUrlModel.as b/Super.Human.Portal_Royale/src/net/apacheRoyaleTemplatedApp/view/controls/snackbarNomadHelperUrl/beads/SnackbarNomadHelperUrlModel.as index 80fee5f..4ed7adf 100644 --- a/Super.Human.Portal_Royale/src/net/apacheRoyaleTemplatedApp/view/controls/snackbarNomadHelperUrl/beads/SnackbarNomadHelperUrlModel.as +++ b/Super.Human.Portal_Royale/src/net/apacheRoyaleTemplatedApp/view/controls/snackbarNomadHelperUrl/beads/SnackbarNomadHelperUrlModel.as @@ -12,5 +12,6 @@ package view.controls.snackbarNomadHelperUrl.beads public var dataDirectory:String; public var nomadBaseUrl:String; public var configurationNomadUrl:String; + public var configurationNotesUrl:String; } } \ No newline at end of file diff --git a/Super.Human.Portal_Royale/src/net/apacheRoyaleTemplatedApp/view/controls/snackbarNomadHelperUrl/beads/SnackbarNomadHelperUrlView.as b/Super.Human.Portal_Royale/src/net/apacheRoyaleTemplatedApp/view/controls/snackbarNomadHelperUrl/beads/SnackbarNomadHelperUrlView.as index 2509cd7..ee72326 100644 --- a/Super.Human.Portal_Royale/src/net/apacheRoyaleTemplatedApp/view/controls/snackbarNomadHelperUrl/beads/SnackbarNomadHelperUrlView.as +++ b/Super.Human.Portal_Royale/src/net/apacheRoyaleTemplatedApp/view/controls/snackbarNomadHelperUrl/beads/SnackbarNomadHelperUrlView.as @@ -30,6 +30,7 @@ package view.controls.snackbarNomadHelperUrl.beads snackbarMessage.nomadBaseUrl = model.nomadBaseUrl; snackbarMessage.dataDirectory = model.dataDirectory; snackbarMessage.configurationNomadUrl = model.configurationNomadUrl; + snackbarMessage.configurationNotesUrl = model.configurationNotesUrl; var snackbarContent:Div = new Div(); snackbarContent.className = "jewel snackbar-content";