Skip to content

FOUR-20487: Display "Screen Interstitial" Option #7832

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.

Sign up for GitHub

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
caleeli merged 2 commits into from
Jan 13, 2025
Merged

FOUR-20487: Display "Screen Interstitial" Option #7832

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9692181
FOUR-20487: Display "Screen Interstitial" Option
rodriquelca Dec 17, 2024
fe660a3
gix CR notes
rodriquelca Dec 17, 2024
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
Next Next commit
FOUR-20487: Display "Screen Interstitial" Option
  • Loading branch information
@rodriquelca
rodriquelca committed Dec 17, 2024
commit 96921815e3e6c46d68d2552dedc35b083a97e0b2
106 changes: 106 additions & 0 deletions resources/js/processes/modeler/components/inspector/TaskInterstitial.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
<template>
<div>
<screen-select
v-if="allowInterstitial"
v-model="screen"
:label="$t('Screen Interstitial')"
:required="true"
:helper="$t('What Screen Should Be Used For Rendering This Interstitial')"
:params="parameters"
default-key="interstitial"
/>
</div>
</template>

<script>
import { get } from "lodash";
import ScreenSelect from "./ScreenSelect.vue";

export default {
components: { ScreenSelect },
props: {
label: {
type: String,
default: "",
},
helper: {
type: String,
default: "",
},
enabledByDefault: {
type: Boolean,
default: false,
},
},
data() {
return {
screen: null,
loading: false,
error: "",
parameters: {
type: "DISPLAY",
},
isDisabled: false,
};
},
computed: {
/**
* Get the value of the edited property
*/
allowInterstitial: {
get() {
const { node } = this;
// Get the value of allowInterstitial or set it to true if it hasn't been defined yet.
const value = get(node, "allowInterstitial", this.enabledByDefault);

this.screen = get(node, "interstitialScreenRef");
return value;
},
/**
* Update allowInterstitial property
*/
set(value) {
this.$set(this.node, "allowInterstitial", value);
},
},

node() {
return this.$root.$children[0].$refs.modeler.highlightedNode.definition;
},
},
watch: {
screen: {
handler(value) {
this.$set(this.node, "interstitialScreenRef", value);
},
},
},
created() {
// Listen for elementDestination interstitial event
this.$root.$on("handle-task-interstitial", this.handleInterstitial);
},
mounted() {
if (!("allowInterstitial" in this.node)) {
this.$set(this.node, "allowInterstitial", this.enabledByDefault);
}
},
methods: {
/**
* Handle interstitial event
*
* @param {Object} { nodeId, isDisabled }
*/
handleInterstitial({ nodeId, show }) {
console.log("handleInterstitial", nodeId, show);
Comment thread
rodriquelca marked this conversation as resolved.
Resolved
if (nodeId !== this.node.id) {
return;
}
if (show) {
this.$set(this.node, "allowInterstitial", true);
} else {
this.$set(this.node, "allowInterstitial", false);
}
},
},
};
</script>
10 changes: 6 additions & 4 deletions resources/js/processes/modeler/initialLoad.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ import SignalPayload from "./components/inspector/SignalPayload";
import ScriptSelect from "./components/inspector/ScriptSelect";
import StartPermission from "./components/inspector/StartPermission";
import Interstitial from "./components/inspector/Interstitial";
import TaskInterstitial from "./components/inspector/TaskInterstitial";
import SelectUserGroup from "../../components/SelectUserGroup";
import validateScreenRef from "./validateScreenRef";
import validateFlowGenieRef from "./validateFlowGenieRef";
Expand All @@ -65,6 +66,7 @@ Vue.component("SignalPayload", SignalPayload);
Vue.component("ScriptSelect", ScriptSelect);
Vue.component("StartPermission", StartPermission);
Vue.component("Interstitial", Interstitial);
Vue.component("TaskInterstitial", TaskInterstitial);
Vue.component("SelectUserGroup", SelectUserGroup);
Vue.component("NodeIdentifierInput", NodeIdentifierInput);
Vue.component("ErrorHandlingTimeout", ErrorHandlingTimeout);
Expand Down Expand Up @@ -205,11 +207,11 @@ ProcessMaker.EventBus.$on(
});

registerInspectorExtension(task, {
component: "Interstitial",
component: "TaskInterstitial",
config: {
label: "Display Next Assigned Task to Task Assignee",
helper: "Directs Task assignee to the next assigned Task",
name: "interstitial",
name: "taskInterstitial",
},
});

Expand Down Expand Up @@ -357,11 +359,11 @@ ProcessMaker.EventBus.$on(
],
});
registerInspectorExtension(manualTask, {
component: "Interstitial",
component: "TaskInterstitial",
config: {
label: "Enable Interstitial",
helper: "redirected to my next assigned task",
name: "interstitial",
name: "TaskInterstitial",
},
});

Expand Down