From e3f81fb301a565419a034fedc06bc9ae8856aa11 Mon Sep 17 00:00:00 2001
From: kenny-ciq <kenny.bello@cosaic.io>
Date: Tue, 4 Oct 2022 15:45:00 -0500
Subject: [PATCH] fix: remove context message, standardize names, and  reorder
 tabs

---
 toolbox/fdc3-workbench/src/App.tsx                | 12 +++++++-----
 .../src/components/ContextCreate.tsx              | 15 +--------------
 .../fdc3-workbench/src/fixtures/logMessages.ts    |  4 ----
 .../fdc3-workbench/src/store/SystemLogStore.ts    |  1 -
 4 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/toolbox/fdc3-workbench/src/App.tsx b/toolbox/fdc3-workbench/src/App.tsx
index 71871c060..69c9938ab 100644
--- a/toolbox/fdc3-workbench/src/App.tsx
+++ b/toolbox/fdc3-workbench/src/App.tsx
@@ -202,18 +202,20 @@ export const App = observer(() => {
 										indicator: classes.indicator,
 									}}
 								>
+									
+									<Tab label="Contexts" />
+									<Tab label="Intents" />
 									<Tab label="System Channels" />
-									<Tab label="Context" />
-									<Tab label="Intent" />
+									<Tab label="App Channels" />
 								</Tabs>
 								<TabPanel value={tabIndex} index={0}>
-									<Channels />
+									<ContextCreate />
 								</TabPanel>
 								<TabPanel value={tabIndex} index={1}>
-									<ContextCreate />
+									<Intents />
 								</TabPanel>
 								<TabPanel value={tabIndex} index={2}>
-									<Intents />
+									<Channels />
 								</TabPanel>
 							</Paper>
 						</Grid>
diff --git a/toolbox/fdc3-workbench/src/components/ContextCreate.tsx b/toolbox/fdc3-workbench/src/components/ContextCreate.tsx
index e9894d58f..e66bff86f 100644
--- a/toolbox/fdc3-workbench/src/components/ContextCreate.tsx
+++ b/toolbox/fdc3-workbench/src/components/ContextCreate.tsx
@@ -163,19 +163,6 @@ export const ContextCreate = observer(() => {
 			// 	id: "empty",
 			// 	template: null,
 			// });
-			systemLogStore.addLog({
-				name: "createContext",
-				type: "success",
-				value: context?.id,
-				variant: "text",
-			});
-		} else {
-			systemLogStore.addLog({
-				name: "createContext",
-				type: "error",
-				value: context?.id,
-				variant: "text",
-			});
 		}
 	};
 
@@ -216,7 +203,7 @@ export const ContextCreate = observer(() => {
 			});
 		} else {
 			systemLogStore.addLog({
-				name: "createContext",
+				name: "saveTemplate",
 				type: "success",
 				value: undefined,
 				variant: "text",
diff --git a/toolbox/fdc3-workbench/src/fixtures/logMessages.ts b/toolbox/fdc3-workbench/src/fixtures/logMessages.ts
index a1952a55f..aad13f3a4 100644
--- a/toolbox/fdc3-workbench/src/fixtures/logMessages.ts
+++ b/toolbox/fdc3-workbench/src/fixtures/logMessages.ts
@@ -64,10 +64,6 @@ export const getLogMessage = (name: logMessagesName, type: logMessagesType, valu
 			info: `Received context via '[${value}]' listener.`,
 			error: `Failed to receive context from '[${value}]' listener.`,
 		},
-		createContext: {
-			success: `Set my current context to type '[${value}]'.`,
-			error: `Failed to set my current context to type '[${value}]'.`,
-		},
 		saveTemplate: {
 			success: `Saved context template for '[${value}]'.`,
 			error: `Failed to save context template.`,
diff --git a/toolbox/fdc3-workbench/src/store/SystemLogStore.ts b/toolbox/fdc3-workbench/src/store/SystemLogStore.ts
index adb4093ab..d9f9f544a 100644
--- a/toolbox/fdc3-workbench/src/store/SystemLogStore.ts
+++ b/toolbox/fdc3-workbench/src/store/SystemLogStore.ts
@@ -18,7 +18,6 @@ export type logMessagesName =
 	| "removeIntentListener"
 	| "receivedContextListener"
 	| "receivedIntentListener"
-	| "createContext"
 	| "saveTemplate"
 	| "copyToClipboard";