Skip to content

FOUR-21371: Task: The conversational form is not showing correctly #7853

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions resources/js/next/components/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down Expand Up @@ -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]) => {
Expand Down
2 changes: 1 addition & 1 deletion resources/js/next/config/accesibility.js
Original file line number Diff line number Diff line change
@@ -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");
Expand Down
2 changes: 0 additions & 2 deletions resources/js/next/libraries/broadcast.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ export default (globalInput) => {
if (config.broadcaster === "pusher") {
Pusher = require("pusher-js");
Pusher.logToConsole = config.debug;

setGlobalVariable("Pusher", Pusher);
}

return {
Expand Down
6 changes: 6 additions & 0 deletions resources/js/next/libraries/modelerInspector.js
Original file line number Diff line number Diff line change
@@ -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 {};
2 changes: 2 additions & 0 deletions resources/js/tasks/loaderEdit.js
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand All @@ -42,6 +43,7 @@ window.ProcessMaker = {
};

import("../next/components/index");
import("../next/config/accesibility");

// Initialize screenBuilder
screenBuilder({ global: window });
Expand Down
1 change: 1 addition & 0 deletions resources/js/tasks/loaderMain.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ window.ProcessMaker = {
};

import("../next/components/index");
import("../next/config/accesibility");

// Vuex
setUses(Vue, vuex.use);
Expand Down
2 changes: 2 additions & 0 deletions resources/js/tasks/loaderPreview.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
8 changes: 6 additions & 2 deletions resources/jscomposition/cases/casesDetail/loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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";

Expand Down Expand Up @@ -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 });

Expand Down Expand Up @@ -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");
1 change: 1 addition & 0 deletions resources/jscomposition/cases/casesMain/loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading