Add Open in Notes in nomad url helper warning

(reference #54)
Moonshine-IDE · May 16, 2024 · d1be432 · d1be432
1 parent b7fae26
commit d1be432
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 7 deletions.
diff --git a/...Human.Portal_Royale/src/net/apacheRoyaleTemplatedApp/controller/CommandLaunchNomadLink.as b/...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/...t/apacheRoyaleTemplatedApp/view/controls/snackbarNomadHelperUrl/SnackbarNomadHelperUrl.as b/...t/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;
+		}
 	}
 }
diff --git a/...oyaleTemplatedApp/view/controls/snackbarNomadHelperUrl/SnackbarNomadHelperUrlContent.mxml b/...oyaleTemplatedApp/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 @@
 						</j:icon>
 					</j:IconButton>
 				</j:HGroup>
-				<html:Div text="Open in Nomad" click="onOpenInNomadClick(event)" className="jewel snackbar-action">
-					<html:beads>
-						<j:Disabled disabled="{configurationNomadUrl == null || configurationNomadUrl == ''}"/>
-					</html:beads>
-				</html:Div>
+				<j:HGroup gap="2">
+					<html:Div text="Open in Notes" click="onOpenInNotesClick(event)" className="jewel snackbar-action">
+						<html:beads>
+							<j:Disabled disabled="{configurationNomadUrl == null || configurationNomadUrl == ''}"/>
+						</html:beads>
+					</html:Div>
+					<html:Div text="Open in Nomad" click="onOpenInNomadClick(event)" className="jewel snackbar-action">
+						<html:beads>
+							<j:Disabled disabled="{configurationNomadUrl == null || configurationNomadUrl == ''}"/>
+						</html:beads>
+					</html:Div>
+				</j:HGroup>
 			</j:VGroup>
 		</html:Li>
 	</html:Ul>

diff --git a/...aleTemplatedApp/view/controls/snackbarNomadHelperUrl/beads/SnackbarNomadHelperUrlModel.as b/...aleTemplatedApp/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;
 	}
 }
diff --git a/...yaleTemplatedApp/view/controls/snackbarNomadHelperUrl/beads/SnackbarNomadHelperUrlView.as b/...yaleTemplatedApp/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";