Merge pull request finos#41 from Finsemble/49663-code-review

change requests

Author: kenny-ciq

toolbox/fdc3-workbench/src/components/ContextCreate.tsx

@@ -198,7 +198,9 @@ export const ContextCreate = observer(({contextName}: {contextName:string}) => {
 
 	const handleSaveTemplate = (e: FormEvent | null = null) => {
 		e?.preventDefault();
-		if(!disabled) {
+		if(disabled) {
+			return;
+		} else {
 			const isValid: boolean = validate();
 
 			if (isValid && context && templateName) {

toolbox/fdc3-workbench/src/components/ContextTemplates.tsx

@@ -89,12 +89,7 @@ export const ContextTemplates = observer(({handleTabChange, contextStateSetter,
 			setError(false);
 		};
 
-	const getOptionLabel = (option: OptionType) => {
-		if (option.value) {
-			return option.value;
-		}
-		return option.title;
-	};
+	const getOptionLabel = (option: OptionType) => option.value || option.title;
 
 	const filterOptions = (options: OptionType[], params: FilterOptionsState<OptionType>) => {
 		const filtered = contextFilter(options, params);

toolbox/fdc3-workbench/src/store/ContextStore.ts

@@ -101,7 +101,15 @@ class ContextStore {
 	}
 
 	async broadcast(context: ContextType) {
-		if (context) {
+		if (!context) {
+			systemLogStore.addLog({
+				name: "broadcast",
+				type: "warning",
+				value: "You must set a context before you can broadcast it",
+				variant: "text",
+			});
+			return;
+		} else {
 			//check that we're on a channel
 			let currentChannel = await fdc3.getCurrentChannel();
 			if (!currentChannel) {
@@ -129,59 +137,52 @@ class ContextStore {
 					});
 				}
 			}
-		} else {
-			systemLogStore.addLog({
-				name: "broadcast",
-				type: "warning",
-				value: "You must set a context before you can broadcast it",
-				variant: "text",
-			});
 		}
 	}
 
 	addContextListener(contextType: string | undefined) {
 		try {
 			if( typeof contextType === "string") {
-			const listenerId = nanoid();
+				const listenerId = nanoid();
 
-			// TODO: remove window after fixing https://github.com/finos/FDC3/issues/435
-			const contactListener = window.fdc3.addContextListener(contextType.toLowerCase() === "all" ? null : contextType, (context) => {
-				const currentListener = this.contextListeners.find(({ id }) => id === listenerId);
+				// TODO: remove window after fixing https://github.com/finos/FDC3/issues/435
+				const contactListener = window.fdc3.addContextListener(contextType.toLowerCase() === "all" ? null : contextType, (context) => {
+					const currentListener = this.contextListeners.find(({ id }) => id === listenerId);
 
-				runInAction(() => {
-					if (currentListener) {
-						currentListener.lastReceivedContext = context;
-					}
-				});
+					runInAction(() => {
+						if (currentListener) {
+							currentListener.lastReceivedContext = context;
+						}
+					});
 
-				systemLogStore.addLog({
-					name: "receivedContextListener",
-					type: "info",
-					value: contextType,
-					variant: "code",
-					body: JSON.stringify(context, null, 4),
+					systemLogStore.addLog({
+						name: "receivedContextListener",
+						type: "info",
+						value: contextType,
+						variant: "code",
+						body: JSON.stringify(context, null, 4),
+					});
 				});
-			});
 
-			runInAction(() => {
-				systemLogStore.addLog({
-					name: "addContextListener",
-					type: "success",
-					value: contextType,
-					variant: "text",
+				runInAction(() => {
+					systemLogStore.addLog({
+						name: "addContextListener",
+						type: "success",
+						value: contextType,
+						variant: "text",
+					});
+					this.contextListeners.push({ id: listenerId, type: contextType, listener: contactListener });
 				});
-				this.contextListeners.push({ id: listenerId, type: contextType, listener: contactListener });
-			});
-		}else {
-			runInAction(() => {
-				systemLogStore.addLog({
-					name: "addContextListener",
-					type: "error",
-					value: contextType,
-					variant: "code",
+			} else {
+				runInAction(() => {
+					systemLogStore.addLog({
+						name: "addContextListener",
+						type: "error",
+						value: contextType,
+						variant: "code",
+					});
 				});
-			});
-		}
+			}
 		} catch (e) {
 			systemLogStore.addLog({
 				name: "addContextListener",