From 22c1738833f4c5cb17e4ce1599bd808d7f91dd5b Mon Sep 17 00:00:00 2001 From: Henry Jonas Date: Mon, 23 Dec 2024 13:43:11 -0400 Subject: [PATCH 1/2] FOUR-21371: Task: The conversational form is not showing correctly --- resources/js/next/components/index.js | 3 +++ resources/js/next/config/accesibility.js | 2 +- resources/js/next/libraries/modelerInspector.js | 6 ++++++ resources/js/tasks/loaderEdit.js | 2 ++ resources/js/tasks/loaderMain.js | 1 + resources/js/tasks/loaderPreview.js | 2 ++ resources/jscomposition/cases/casesDetail/loader.js | 8 ++++++-- resources/jscomposition/cases/casesMain/loader.js | 1 + 8 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 resources/js/next/libraries/modelerInspector.js diff --git a/resources/js/next/components/index.js b/resources/js/next/components/index.js index 2b938c2b73..564026864c 100644 --- a/resources/js/next/components/index.js +++ b/resources/js/next/components/index.js @@ -67,6 +67,7 @@ const pmComponents = { InputImageCarousel: () => import("../../components/shared/InputImageCarousel.vue"), LaunchpadSettingsModal: () => import("../../components/shared/LaunchpadSettingsModal.vue"), Modal: () => import("../../components/shared/Modal.vue"), + PmModal: () => import("../../components/shared/Modal.vue"), ModalSaveVersion: () => import("../../components/shared/ModalSaveVersion.vue"), MultiThumbnailFileUploader: () => import("../../components/shared/MultiThumbnailFileUploader.vue"), PaginationTable: () => import("../../components/shared/PaginationTable.vue"), @@ -98,6 +99,8 @@ const pmComponents = { TasksPreview: () => import("../../tasks/components/TasksPreview.vue"), TaskTooltip: () => import("../../tasks/components/TaskTooltip.vue"), TaskView: () => import("../../tasks/components/TaskView.vue"), + // Modeler components folder + ModelerAssetQuickCreate: () => import("../../processes/modeler/components/inspector/ModelerAssetQuickCreate.vue"), // Decision engine }; Object.entries(pmComponents).forEach(([key, component]) => { diff --git a/resources/js/next/config/accesibility.js b/resources/js/next/config/accesibility.js index 1b502a4815..b6abaad3e1 100644 --- a/resources/js/next/config/accesibility.js +++ b/resources/js/next/config/accesibility.js @@ -1,4 +1,4 @@ -import AccessibilityMixin from "./components/common/mixins/accessibility"; +import AccessibilityMixin from "../../components/common/mixins/accessibility"; import { getGlobalVariable } from "../globalVariables"; const Vue = getGlobalVariable("Vue"); diff --git a/resources/js/next/libraries/modelerInspector.js b/resources/js/next/libraries/modelerInspector.js new file mode 100644 index 0000000000..fc5c03e009 --- /dev/null +++ b/resources/js/next/libraries/modelerInspector.js @@ -0,0 +1,6 @@ +// import VueFormElements from "@processmaker/vue-form-elements"; +import * as ModelerInspector from "../../processes/modeler/components/inspector/index"; + +window.ModelerInspector = ModelerInspector; + +export default {}; diff --git a/resources/js/tasks/loaderEdit.js b/resources/js/tasks/loaderEdit.js index df72a5552b..cea95e61a1 100644 --- a/resources/js/tasks/loaderEdit.js +++ b/resources/js/tasks/loaderEdit.js @@ -24,6 +24,7 @@ import openAI from "../next/config/openAI"; // Load syncronously shared components in window, for some packages import sharedComponents from "../next/libraries/sharedComponents"; import vueFormElements from "../next/libraries/vueFormElements"; + import screenBuilder from "../next/screenBuilder"; import monaco from "../next/monaco"; @@ -42,6 +43,7 @@ window.ProcessMaker = { }; import("../next/components/index"); +import("../next/config/accesibility"); // Initialize screenBuilder screenBuilder({ global: window }); diff --git a/resources/js/tasks/loaderMain.js b/resources/js/tasks/loaderMain.js index ef1eb7078c..7c3d0073c0 100644 --- a/resources/js/tasks/loaderMain.js +++ b/resources/js/tasks/loaderMain.js @@ -40,6 +40,7 @@ window.ProcessMaker = { }; import("../next/components/index"); +import("../next/config/accesibility"); // Vuex setUses(Vue, vuex.use); diff --git a/resources/js/tasks/loaderPreview.js b/resources/js/tasks/loaderPreview.js index 479e6f3898..113c2c94be 100644 --- a/resources/js/tasks/loaderPreview.js +++ b/resources/js/tasks/loaderPreview.js @@ -59,7 +59,9 @@ setUses(Vue, vueCookies.use); // Initialize screenBuilder screenBuilder({ global: window }); + import("../next/components/index"); +import("../next/config/accesibility"); const processmakerConfig = processmaker(window.ProcessMaker); setGlobalPMVariables(processmakerConfig.pm); diff --git a/resources/jscomposition/cases/casesDetail/loader.js b/resources/jscomposition/cases/casesDetail/loader.js index c3f22b99f1..e0d895d881 100644 --- a/resources/jscomposition/cases/casesDetail/loader.js +++ b/resources/jscomposition/cases/casesDetail/loader.js @@ -8,7 +8,7 @@ import { } from "../../../js/next/globalVariables"; import vuex from "../../../js/next/libraries/vuex"; -import lodash from "../../../js/next/libraries/lodash"; +// import lodash from "../../../js/next/libraries/lodash"; import bootstrap from "../../../js/next/libraries/bootstrap"; import jquery from "../../../js/next/libraries/jquery"; import vueRouter from "../../../js/next/libraries/vueRouter"; @@ -25,6 +25,7 @@ import openAI from "../../../js/next/config/openAI"; // Load syncronously shared components in window, for some packages import sharedComponents from "../../../js/next/libraries/sharedComponents"; import vueFormElements from "../../../js/next/libraries/vueFormElements"; +import modelerInspector from "../../../js/next/libraries/modelerInspector"; import modeler from "../../../js/next/modeler"; import screenBuilderNext from "../../../js/next/screenBuilder"; @@ -60,7 +61,10 @@ setUses(Vue, vueRouter.use); // VueCookies setUses(Vue, vueCookies.use); +// Initialize components asyncronously with Vue.component import("../../../js/next/components/index"); +import("../../../js/next/config/accesibility"); + // Initialize screenBuilder screenBuilderNext({ global: window }); @@ -90,6 +94,6 @@ setGlobalPMVariables(sessionConfig.pm); const openAIConfig = openAI(); setGlobalPMVariables(openAIConfig.pm); -// Layout modules +// Layout modules asyncronously import("../../../js/next/layout/sidebar"); import("../../../js/next/layout/navbar"); diff --git a/resources/jscomposition/cases/casesMain/loader.js b/resources/jscomposition/cases/casesMain/loader.js index 488eba09f1..4d6aedd08a 100644 --- a/resources/jscomposition/cases/casesMain/loader.js +++ b/resources/jscomposition/cases/casesMain/loader.js @@ -56,6 +56,7 @@ setUses(Vue, vueRouter.use); setUses(Vue, vueCookies.use); import("../../../js/next/components/index"); +import("../../../js/next/config/accesibility"); const processmakerConfig = processmaker(window.ProcessMaker); setGlobalPMVariables(processmakerConfig.pm); From b5fdacead0a512b5c48a5165a6c99b7907e66504 Mon Sep 17 00:00:00 2001 From: Henry Jonas Date: Fri, 3 Jan 2025 09:44:47 -0400 Subject: [PATCH 2/2] FOUR-21371: Task: The conversational form is not showing correctly --- resources/js/next/libraries/broadcast.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/resources/js/next/libraries/broadcast.js b/resources/js/next/libraries/broadcast.js index b20ee44b99..2ec4f0f185 100644 --- a/resources/js/next/libraries/broadcast.js +++ b/resources/js/next/libraries/broadcast.js @@ -9,8 +9,6 @@ export default (globalInput) => { if (config.broadcaster === "pusher") { Pusher = require("pusher-js"); Pusher.logToConsole = config.debug; - - setGlobalVariable("Pusher", Pusher); } return {