Merge pull request #78 from DiamondLightSource/export-file-context-actions

Modify and export addPage widget actions

Author: abigailalexander

src/misc/fileContext.tsx

@@ -53,7 +53,8 @@ export interface TabState {
 export function addPage(
   pageState: PageState,
   location: string,
-  desc: FileDescription
+  desc: FileDescription,
+  pathname?: string
 ): PageState {
   const pagesCopy = { ...pageState };
   pagesCopy[location] = desc;
@@ -171,7 +172,11 @@ export function selectTab(
 export type FileContextType = {
   pageState: PageState;
   tabState: TabState;
-  addPage: (location: string, fileDesc: FileDescription) => void;
+  addPage: (
+    location: string,
+    fileDesc: FileDescription,
+    pathname?: string
+  ) => void;
   removePage: (location: string, fileDesc?: FileDescription) => void;
   addTab: (
     location: string,
@@ -238,9 +243,13 @@ export const FileProvider: React.FC<FileProviderProps> = (
   const fileContext = {
     pageState,
     tabState,
-    addPage: (location: string, fileDesc: FileDescription): void => {
+    addPage: (
+      location: string,
+      fileDesc: FileDescription,
+      pathname?: string
+    ): void => {
       const newPageState = addPage(pageState, location, fileDesc);
-      history.push(history.location.pathname, {
+      history.push(pathname ? pathname : history.location.pathname, {
         pageState: newPageState,
         tabState: history.location.state?.tabState ?? tabState
       });

src/misc/index.ts

@@ -1,3 +1,3 @@
 export { onRenderCallback } from "./profilerCallback";
-export { FileProvider } from "./fileContext";
+export { FileProvider, FileContext } from "./fileContext";
 export { OutlineContext, OutlineProvider } from "./outlineContext";

src/ui/widgets/index.ts

@@ -36,6 +36,7 @@ export { TabContainer } from "./Tabs/tabContainer";
 export { DynamicTabs } from "./Tabs/dynamicTabs";
 export { XYPlot } from "./XYPlot/xyPlot";
 export { Webcam } from "./Webcam/webcam";
+export { executeAction } from "./widgetActions";
 
 // By importing and calling this function you ensure all the
 // above widgets are imported and thus registered.

src/ui/widgets/widgetActions.ts

@@ -120,14 +120,15 @@ export const getActionDescription = (action: WidgetAction): string => {
 export const openPage = (
   action: DynamicAction,
   fileContext?: FileContextType,
-  parentMacros?: MacroMap
+  parentMacros?: MacroMap,
+  pathname?: string
 ): void => {
   const { location, file } = action.dynamicInfo;
   file.macros = {
     ...(parentMacros ?? {}),
     ...file.macros
   };
-  fileContext?.addPage(location, file);
+  fileContext?.addPage(location, file, pathname);
 };
 
 export const closePage = (
@@ -163,12 +164,13 @@ export const executeAction = (
   action: WidgetAction,
   files?: FileContextType,
   exitContext?: ExitContextType,
-  parentMacros?: MacroMap
+  parentMacros?: MacroMap,
+  pathname?: string
 ): void => {
   switch (action.type) {
     case OPEN_PAGE:
       if (files) {
-        openPage(action, files, parentMacros);
+        openPage(action, files, parentMacros, pathname);
       } else {
         log.error("Tried to open a page but no file context passed");
       }