Fix url encoding issue for modal widgets widgetId

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

src/@types/global.d.ts

@@ -30,6 +30,7 @@ import {Notifier} from "../Notifier";
 import type {Renderer} from "react-dom";
 import RightPanelStore from "../stores/RightPanelStore";
 import WidgetStore from "../stores/WidgetStore";
+import {ModalWidgetStore} from "../stores/ModalWidgetStore";
 
 declare global {
     interface Window {
@@ -53,6 +54,7 @@ declare global {
         mxNotifier: typeof Notifier;
         mxRightPanelStore: RightPanelStore;
         mxWidgetStore: WidgetStore;
+        mxModalWidgetStore: ModalWidgetStore;
     }
 
     interface Document {

src/components/views/dialogs/ModalWidgetDialog.tsx

@@ -83,8 +83,9 @@ export default class ModalWidgetDialog extends React.PureComponent<IProps, IStat
     public render() {
         // TODO: Don't violate every single security principle
 
-        const widgetUrl = this.props.widgetDefinition.url
+        const widgetId = encodeURIComponent(this.getWidgetId());
-            + `?widgetId=${this.getWidgetId()}&parentUrl=${encodeURIComponent(window.location.href)}`;
+        const parentUrl = encodeURIComponent(window.location.href);
+        const widgetUrl = `${this.props.widgetDefinition.url}?widgetId=${widgetId}&parentUrl=${parentUrl}`;
 
         let buttons;
         if (this.props.widgetDefinition.buttons) {

src/stores/ModalWidgetStore.ts

@@ -52,7 +52,7 @@ export class ModalWidgetStore extends AsyncStoreWithClient<IState> {
         this.openSourceWidgetId = sourceWidgetId;
         this.modalInstance = Modal.createTrackedDialog('Modal Widget', '', ModalWidgetDialog, {
             widgetDefinition: {...requestData},
-            sourceWidgetId: sourceWidgetId,
+            sourceWidgetId,
             onFinished: (success: boolean, data?: any) => {
                 if (!success) {
                     this.closeModalWidget(sourceWidgetId, {
@@ -84,3 +84,5 @@ export class ModalWidgetStore extends AsyncStoreWithClient<IState> {
         }
     };
 }
+
+window.mxModalWidgetStore = ModalWidgetStore.instance;