Do not show button for legacy editor

apache · Jan 7, 2025 · 3cba7d8 · 3cba7d8
1 parent 77be060
commit 3cba7d8
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 30 deletions.
diff --git a/packages/dmn-editor-envelope/src/DmnEditorFactory.tsx b/packages/dmn-editor-envelope/src/DmnEditorFactory.tsx
@@ -42,7 +42,7 @@ export class DmnEditorFactory implements EditorFactory<Editor, KogitoEditorChann
 }
 
 export class DmnEditorInterface implements Editor {
-  private self: DmnEditorRoot;
+  protected self: DmnEditorRoot;
   public af_isReact = true;
   public af_componentId: "dmn-editor";
   public af_componentTitle: "DMN Editor";
@@ -68,10 +68,6 @@ export class DmnEditorInterface implements Editor {
     return Promise.resolve(); // No-op for now. The DMN Editor only has the LIGHT theme.
   }
 
-  public openBoxedExpressionEditor(nodeId: string): void {
-    this.self.openBoxedExpressionEditor(nodeId);
-  }
-
   public async undo(): Promise<void> {
     return this.self.undo();
   }

diff --git a/packages/dmn-editor-envelope/src/NewDmnEditorEnvelopeApiFactory.ts b/packages/dmn-editor-envelope/src/NewDmnEditorEnvelopeApiFactory.ts
@@ -20,20 +20,20 @@
 import { EnvelopeApiFactoryArgs } from "@kie-tools-core/envelope";
 import { EditorEnvelopeViewApi, KogitoEditorEnvelopeApiImpl } from "@kie-tools-core/editor/dist/envelope";
 import { KogitoEditorEnvelopeContextType } from "@kie-tools-core/editor/dist/api";
-import { DmnEditorInterface } from "./DmnEditorFactory";
+import { NewDmnEditorInterface } from "./NewDmnEditorFactory";
 import { NewDmnEditorEnvelopeApi } from "./NewDmnEditorEnvelopeApi";
 import { NewDmnEditorChannelApi } from "./NewDmnEditorChannelApi";
 import { NewDmnEditorFactory } from "./NewDmnEditorFactory";
 
 export type NewDmnEnvelopeApiFactoryArgs = EnvelopeApiFactoryArgs<
   NewDmnEditorEnvelopeApi,
   NewDmnEditorChannelApi,
-  EditorEnvelopeViewApi<DmnEditorInterface>,
+  EditorEnvelopeViewApi<NewDmnEditorInterface>,
   KogitoEditorEnvelopeContextType<NewDmnEditorChannelApi>
 >;
 
 export class NewDmnEditorEnvelopeApiImpl
-  extends KogitoEditorEnvelopeApiImpl<DmnEditorInterface, NewDmnEditorEnvelopeApi, NewDmnEditorChannelApi>
+  extends KogitoEditorEnvelopeApiImpl<NewDmnEditorInterface, NewDmnEditorEnvelopeApi, NewDmnEditorChannelApi>
   implements NewDmnEditorEnvelopeApi
 {
   constructor(readonly dmnArgs: NewDmnEnvelopeApiFactoryArgs) {

diff --git a/packages/dmn-editor-envelope/src/NewDmnEditorFactory.tsx b/packages/dmn-editor-envelope/src/NewDmnEditorFactory.tsx
@@ -22,11 +22,17 @@ import { EditorFactory, EditorInitArgs, KogitoEditorEnvelopeContextType } from "
 import { NewDmnEditorChannelApi } from "./NewDmnEditorChannelApi";
 import { DmnEditorInterface } from "./DmnEditorFactory";
 
-export class NewDmnEditorFactory implements EditorFactory<DmnEditorInterface, NewDmnEditorChannelApi> {
+export class NewDmnEditorFactory implements EditorFactory<NewDmnEditorInterface, NewDmnEditorChannelApi> {
   public createEditor(
     envelopeContext: KogitoEditorEnvelopeContextType<NewDmnEditorChannelApi>,
     initArgs: EditorInitArgs
-  ): Promise<DmnEditorInterface> {
-    return Promise.resolve(new DmnEditorInterface(envelopeContext, initArgs));
+  ): Promise<NewDmnEditorInterface> {
+    return Promise.resolve(new NewDmnEditorInterface(envelopeContext, initArgs));
+  }
+}
+
+export class NewDmnEditorInterface extends DmnEditorInterface {
+  public openBoxedExpressionEditor(nodeId: string): void {
+    this.self.openBoxedExpressionEditor(nodeId);
   }
 }
diff --git a/packages/form-dmn/src/FormDmnOutputs.tsx b/packages/form-dmn/src/FormDmnOutputs.tsx
@@ -264,13 +264,15 @@ export function FormDmnOutputs({ openExecutionTab, ...props }: FormDmnOutputsPro
             <CardTitle>
               <Flex justifyContent={{ default: "justifyContentSpaceBetween" }}>
                 <Title headingLevel={"h2"}>{dmnFormResult.decisionName}</Title>
-                <Button
-                  variant={"plain"}
-                  title={`Open ${dmnFormResult.decisionName} expression`}
-                  icon={<ArrowUpIcon />}
-                  data-navigate-to-expression-id={dmnFormResult.decisionId}
-                  onClick={() => props.openBoxedExpressionEditor?.(dmnFormResult.decisionId)}
-                />
+                {props.openBoxedExpressionEditor !== undefined && (
+                  <Button
+                    variant={"plain"}
+                    title={`Open ${dmnFormResult.decisionName} expression`}
+                    icon={<ArrowUpIcon />}
+                    data-navigate-to-expression-id={dmnFormResult.decisionId}
+                    onClick={() => props.openBoxedExpressionEditor?.(dmnFormResult.decisionId)}
+                  />
+                )}
               </Flex>
             </CardTitle>
             <CardBody isFilled={true}>{result(dmnFormResult.result)}</CardBody>

diff --git a/packages/online-editor/src/dmnRunner/DmnRunnerDrawer.tsx b/packages/online-editor/src/dmnRunner/DmnRunnerDrawer.tsx
@@ -25,7 +25,9 @@ import { DmnRunnerMode } from "./DmnRunnerStatus";
 import { DmnRunnerErrorBoundary } from "./DmnRunnerErrorBoundary";
 import { EmbeddedEditorRef } from "@kie-tools-core/editor/dist/embedded";
 
-export function DmnRunnerDrawer(props: React.PropsWithChildren<{ editor: EmbeddedEditorRef | undefined }>) {
+export function DmnRunnerDrawer(
+  props: React.PropsWithChildren<{ editor: EmbeddedEditorRef | undefined; isLegacyDmnEditor: boolean }>
+) {
   const dmnRunnerState = useDmnRunnerState();
   return (
     <Drawer
@@ -39,7 +41,7 @@ export function DmnRunnerDrawer(props: React.PropsWithChildren<{ editor: Embedde
         }
         panelContent={
           <DmnRunnerErrorBoundary>
-            <DmnRunnerDrawerPanelContent editor={props.editor} />
+            <DmnRunnerDrawerPanelContent {...props} />
           </DmnRunnerErrorBoundary>
         }
       >

diff --git a/packages/online-editor/src/dmnRunner/DmnRunnerDrawerPanelContent.tsx b/packages/online-editor/src/dmnRunner/DmnRunnerDrawerPanelContent.tsx
@@ -56,7 +56,10 @@ interface DmnRunnerStylesConfig {
   buttonPosition: ButtonPosition;
 }
 
-export function DmnRunnerDrawerPanelContent(props: { editor: EmbeddedEditorRef | undefined }) {
+export function DmnRunnerDrawerPanelContent(props: {
+  editor: EmbeddedEditorRef | undefined;
+  isLegacyDmnEditor: boolean;
+}) {
   // STATEs
   const [drawerError, setDrawerError] = useState<boolean>(false);
   const [dmnRunnerStylesConfig, setDmnRunnerStylesConfig] = useState<DmnRunnerStylesConfig>({
@@ -327,12 +330,15 @@ export function DmnRunnerDrawerPanelContent(props: { editor: EmbeddedEditorRef |
                       locale={locale}
                       notificationsPanel={true}
                       openExecutionTab={openExecutionTab}
-                      openBoxedExpressionEditor={(nodeId: string) => {
-                        const newDmnEditorEnvelopeApi = props.editor?.getEnvelopeServer()
-                          .envelopeApi as unknown as MessageBusClientApi<NewDmnEditorEnvelopeApi>;
-
-                        newDmnEditorEnvelopeApi.notifications.dmnEditor_openBoxedExpressionEditor.send(nodeId);
-                      }}
+                      openBoxedExpressionEditor={
+                        !props.isLegacyDmnEditor
+                          ? (nodeId: string) => {
+                              const newDmnEditorEnvelopeApi = props.editor?.getEnvelopeServer()
+                                .envelopeApi as unknown as MessageBusClientApi<NewDmnEditorEnvelopeApi>;
+                              newDmnEditorEnvelopeApi.notifications.dmnEditor_openBoxedExpressionEditor.send(nodeId);
+                            }
+                          : undefined
+                      }
                     />
                   </PageSection>
                 </div>

diff --git a/packages/online-editor/src/editor/EditorPage.tsx b/packages/online-editor/src/editor/EditorPage.tsx
@@ -479,7 +479,7 @@ Error details: ${err}`);
                   <EditorToolbar workspaceFile={file.workspaceFile} editor={editor} />
                   <Divider />
                   <PageSection hasOverflowScroll={true} padding={{ default: "noPadding" }} aria-label="Editor section">
-                    <DmnRunnerDrawer editor={editor}>
+                    <DmnRunnerDrawer editor={editor} isLegacyDmnEditor={settings.editors.useLegacyDmnEditor}>
                       <EditorPageDockDrawer>
                         {embeddedEditorFile && (
                           <EmbeddedEditor

diff --git a/packages/online-editor/src/envelope/NewDmnEditorEnvelopeApp.ts b/packages/online-editor/src/envelope/NewDmnEditorEnvelopeApp.ts
@@ -18,12 +18,12 @@
  */
 
 import * as EditorEnvelope from "@kie-tools-core/editor/dist/envelope";
-import { DmnEditorInterface } from "@kie-tools/dmn-editor-envelope/dist/DmnEditorFactory";
+import { NewDmnEditorInterface } from "@kie-tools/dmn-editor-envelope/dist/NewDmnEditorFactory";
 import { NewDmnEditorChannelApi } from "@kie-tools/dmn-editor-envelope/dist/NewDmnEditorChannelApi";
 import { NewDmnEditorEnvelopeApi } from "@kie-tools/dmn-editor-envelope/dist/NewDmnEditorEnvelopeApi";
 import { NewDmnEditorEnvelopeApiImpl } from "@kie-tools/dmn-editor-envelope/dist/NewDmnEditorEnvelopeApiFactory";
 
-EditorEnvelope.initCustom<DmnEditorInterface, NewDmnEditorEnvelopeApi, NewDmnEditorChannelApi>({
+EditorEnvelope.initCustom<NewDmnEditorInterface, NewDmnEditorEnvelopeApi, NewDmnEditorChannelApi>({
   container: document.getElementById("envelope-app")!,
   bus: { postMessage: (message, targetOrigin, _) => window.parent.postMessage(message, targetOrigin!, _) },
   apiImplFactory: {