Reconcile Element Destination vs Interstitial vs WE Completed Action

resources/js/processes/modeler/components/inspector/ScreenSelect.vue

@@ -18,6 +18,7 @@
  track-by="id"
  @open="load()"
  @search-change="load"
+ :name="name"
  >
  <template slot="noResult">
  {{ $t("No elements found. Consider changing the search query.") }}
@@ -72,6 +73,7 @@ export default {
  "required",
  "placeholder",
  "defaultKey",
+ "name",
  ],
  data() {
  return {

resources/js/processes/modeler/components/inspector/TaskInterstitial.vue

@@ -0,0 +1,116 @@
+<template>
+ <div>
+ <div v-if="!allowInterstitial" class="alert alert-info task-info-alert">
+ "{{ $t('Display Next Assigned Task to Task Assignee') }}" {{ $t('option has been moved to the task destination dropdown') }}
+ </div>
+ <screen-select
+ v-if="allowInterstitial"
+ v-model="screen"
+ name="interstitialScreen"
+ :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 }) {
+ if (nodeId !== this.node.id) {
+ return;
+ }
+ if (show) {
+ this.$set(this.node, "allowInterstitial", true);
+ } else {
+ this.$set(this.node, "allowInterstitial", false);
+ }
+ },
+
+ },
+};
+</script>
+
+<style lang="scss" scoped>
+.task-info-alert {
+ background-color: #EAF2FF;
+}
+</style>

resources/js/processes/modeler/initialLoad.js

@@ -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";
@@ -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);
@@ -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",
  },
  });
 
@@ -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",
  },
  });
 

resources/lang/de.json

@@ -1170,6 +1170,7 @@
  "Options Variable": "Optionenvariable",
  "Get options from this variable. Must be an array.": "Optionen aus dieser Variable erhalten. Muss ein Array sein.",
  "Option Label Shown": "Angezeigte Optionsbezeichnung",
+ "option has been moved to the task destination dropdown": "option wurde in die Dropdown-Liste „Aufgabenziel“ verschoben",
  "Enter the property name from the Request data variable that displays to the user on the screen.": "Geben Sie den Namen der Eigenschaft aus der Anforderungsdatenvariable ein, die dem Benutzer auf dem Bildschirm angezeigt wird.",
  "Show Control As": "Steuerung anzeigen als",
  "Allow Multiple Selections": "Mehrfachauswahl zulassen",

resources/lang/en.json

@@ -1474,6 +1474,7 @@
  "open": "open",
  "Operating System": "Operating System",
  "Option Label Shown": "Option Label Shown",
+ "option has been moved to the task destination dropdown": "option has been moved to the task destination dropdown",
  "Options List": "Options List",
  "Options Variable": "Options Variable",
  "Options": "Options",

resources/lang/es.json

@@ -1438,6 +1438,7 @@
  "open": "abierto",
  "Open": "Abrir",
  "Operating System": "Sistema operativo",
+ "option has been moved to the task destination dropdown": "La opción se ha movido al menú desplegable de destino de la tarea.",
  "Option Label Shown": "Etiqueta de opción mostrada",
  "Options List": "Lista de opciones",
  "Options Variable": "Variable de opciones",

resources/lang/fr.json

@@ -1171,6 +1171,7 @@
  "Options Variable": "Options de la variable",
  "Get options from this variable. Must be an array.": "Obtenir des options de cette variable. Doit être un tableau.",
  "Option Label Shown": "Étiquette d'options affichée",
+ "option has been moved to the task destination dropdown": "l'option a été déplacée vers la liste déroulante de destination de la tâche",
  "Enter the property name from the Request data variable that displays to the user on the screen.": "Saisir le nom de la propriété relative à la variable de données de la demande qui s'affiche sur l'écran de l'utilisateur.",
  "Show Control As": "Afficher les commandes en tant que",
  "Allow Multiple Selections": "Autoriser les sélections multiples",

resources/js/processes/modeler/components/inspector/ScreenSelect.vue

@@ -18,6 +18,7 @@
  track-by="id"
  @open="load()"
  @search-change="load"
+ :name="name"
  >
  <template slot="noResult">
  {{ $t("No elements found. Consider changing the search query.") }}
@@ -72,6 +73,7 @@ export default {
  "required",
  "placeholder",
  "defaultKey",
+ "name",
  ],
  data() {
  return {

resources/js/processes/modeler/components/inspector/TaskInterstitial.vue

@@ -0,0 +1,116 @@
+<template>
+ <div>
+ <div v-if="!allowInterstitial" class="alert alert-info task-info-alert">
+ "{{ $t('Display Next Assigned Task to Task Assignee') }}" {{ $t('option has been moved to the task destination dropdown') }}
+ </div>
+ <screen-select
+ v-if="allowInterstitial"
+ v-model="screen"
+ name="interstitialScreen"
+ :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 }) {
+ if (nodeId !== this.node.id) {
+ return;
+ }
+ if (show) {
+ this.$set(this.node, "allowInterstitial", true);
+ } else {
+ this.$set(this.node, "allowInterstitial", false);
+ }
+ },
+
+ },
+};
+</script>
+
+<style lang="scss" scoped>
+.task-info-alert {
+ background-color: #EAF2FF;
+}
+</style>

resources/js/processes/modeler/initialLoad.js

@@ -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";
@@ -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);
@@ -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",
  },
  });
 
@@ -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",
  },
  });
 

resources/lang/de.json

@@ -1170,6 +1170,7 @@
  "Options Variable": "Optionenvariable",
  "Get options from this variable. Must be an array.": "Optionen aus dieser Variable erhalten. Muss ein Array sein.",
  "Option Label Shown": "Angezeigte Optionsbezeichnung",
+ "option has been moved to the task destination dropdown": "option wurde in die Dropdown-Liste „Aufgabenziel“ verschoben",
  "Enter the property name from the Request data variable that displays to the user on the screen.": "Geben Sie den Namen der Eigenschaft aus der Anforderungsdatenvariable ein, die dem Benutzer auf dem Bildschirm angezeigt wird.",
  "Show Control As": "Steuerung anzeigen als",
  "Allow Multiple Selections": "Mehrfachauswahl zulassen",

resources/lang/en.json

@@ -1474,6 +1474,7 @@
  "open": "open",
  "Operating System": "Operating System",
  "Option Label Shown": "Option Label Shown",
+ "option has been moved to the task destination dropdown": "option has been moved to the task destination dropdown",
  "Options List": "Options List",
  "Options Variable": "Options Variable",
  "Options": "Options",

resources/lang/es.json

@@ -1438,6 +1438,7 @@
  "open": "abierto",
  "Open": "Abrir",
  "Operating System": "Sistema operativo",
+ "option has been moved to the task destination dropdown": "La opción se ha movido al menú desplegable de destino de la tarea.",
  "Option Label Shown": "Etiqueta de opción mostrada",
  "Options List": "Lista de opciones",
  "Options Variable": "Variable de opciones",

resources/lang/fr.json

@@ -1171,6 +1171,7 @@
  "Options Variable": "Options de la variable",
  "Get options from this variable. Must be an array.": "Obtenir des options de cette variable. Doit être un tableau.",
  "Option Label Shown": "Étiquette d'options affichée",
+ "option has been moved to the task destination dropdown": "l'option a été déplacée vers la liste déroulante de destination de la tâche",
  "Enter the property name from the Request data variable that displays to the user on the screen.": "Saisir le nom de la propriété relative à la variable de données de la demande qui s'affiche sur l'écran de l'utilisateur.",
  "Show Control As": "Afficher les commandes en tant que",
  "Allow Multiple Selections": "Autoriser les sélections multiples",

resources/js/processes/modeler/components/inspector/ScreenSelect.vue

@@ -18,6 +18,7 @@
  track-by="id"
  @open="load()"
  @search-change="load"
+ :name="name"
  >
  <template slot="noResult">
  {{ $t("No elements found. Consider changing the search query.") }}
@@ -72,6 +73,7 @@ export default {
  "required",
  "placeholder",
  "defaultKey",
+ "name",
  ],
  data() {
  return {

resources/js/processes/modeler/components/inspector/TaskInterstitial.vue

@@ -0,0 +1,116 @@
+<template>
+ <div>
+ <div v-if="!allowInterstitial" class="alert alert-info task-info-alert">
+ "{{ $t('Display Next Assigned Task to Task Assignee') }}" {{ $t('option has been moved to the task destination dropdown') }}
+ </div>
+ <screen-select
+ v-if="allowInterstitial"
+ v-model="screen"
+ name="interstitialScreen"
+ :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 }) {
+ if (nodeId !== this.node.id) {
+ return;
+ }
+ if (show) {
+ this.$set(this.node, "allowInterstitial", true);
+ } else {
+ this.$set(this.node, "allowInterstitial", false);
+ }
+ },
+
+ },
+};
+</script>
+
+<style lang="scss" scoped>
+.task-info-alert {
+ background-color: #EAF2FF;
+}
+</style>

resources/js/processes/modeler/initialLoad.js

@@ -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";
@@ -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);
@@ -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",
  },
  });
 
@@ -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",
  },
  });
 

resources/lang/de.json

@@ -1170,6 +1170,7 @@
  "Options Variable": "Optionenvariable",
  "Get options from this variable. Must be an array.": "Optionen aus dieser Variable erhalten. Muss ein Array sein.",
  "Option Label Shown": "Angezeigte Optionsbezeichnung",
+ "option has been moved to the task destination dropdown": "option wurde in die Dropdown-Liste „Aufgabenziel“ verschoben",
  "Enter the property name from the Request data variable that displays to the user on the screen.": "Geben Sie den Namen der Eigenschaft aus der Anforderungsdatenvariable ein, die dem Benutzer auf dem Bildschirm angezeigt wird.",
  "Show Control As": "Steuerung anzeigen als",
  "Allow Multiple Selections": "Mehrfachauswahl zulassen",

resources/lang/en.json

@@ -1474,6 +1474,7 @@
  "open": "open",
  "Operating System": "Operating System",
  "Option Label Shown": "Option Label Shown",
+ "option has been moved to the task destination dropdown": "option has been moved to the task destination dropdown",
  "Options List": "Options List",
  "Options Variable": "Options Variable",
  "Options": "Options",

resources/lang/es.json

@@ -1438,6 +1438,7 @@
  "open": "abierto",
  "Open": "Abrir",
  "Operating System": "Sistema operativo",
+ "option has been moved to the task destination dropdown": "La opción se ha movido al menú desplegable de destino de la tarea.",
  "Option Label Shown": "Etiqueta de opción mostrada",
  "Options List": "Lista de opciones",
  "Options Variable": "Variable de opciones",

resources/lang/fr.json

@@ -1171,6 +1171,7 @@
  "Options Variable": "Options de la variable",
  "Get options from this variable. Must be an array.": "Obtenir des options de cette variable. Doit être un tableau.",
  "Option Label Shown": "Étiquette d'options affichée",
+ "option has been moved to the task destination dropdown": "l'option a été déplacée vers la liste déroulante de destination de la tâche",
  "Enter the property name from the Request data variable that displays to the user on the screen.": "Saisir le nom de la propriété relative à la variable de données de la demande qui s'affiche sur l'écran de l'utilisateur.",
  "Show Control As": "Afficher les commandes en tant que",
  "Allow Multiple Selections": "Autoriser les sélections multiples",

resources/js/processes/modeler/components/inspector/ScreenSelect.vue

@@ -18,6 +18,7 @@
  track-by="id"
  @open="load()"
  @search-change="load"
+ :name="name"
  >
  <template slot="noResult">
  {{ $t("No elements found. Consider changing the search query.") }}
@@ -72,6 +73,7 @@ export default {
  "required",
  "placeholder",
  "defaultKey",
+ "name",
  ],
  data() {
  return {

resources/js/processes/modeler/components/inspector/TaskInterstitial.vue

@@ -0,0 +1,116 @@
+<template>
+ <div>
+ <div v-if="!allowInterstitial" class="alert alert-info task-info-alert">
+ "{{ $t('Display Next Assigned Task to Task Assignee') }}" {{ $t('option has been moved to the task destination dropdown') }}
+ </div>
+ <screen-select
+ v-if="allowInterstitial"
+ v-model="screen"
+ name="interstitialScreen"
+ :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 }) {
+ if (nodeId !== this.node.id) {
+ return;
+ }
+ if (show) {
+ this.$set(this.node, "allowInterstitial", true);
+ } else {
+ this.$set(this.node, "allowInterstitial", false);
+ }
+ },
+
+ },
+};
+</script>
+
+<style lang="scss" scoped>
+.task-info-alert {
+ background-color: #EAF2FF;
+}
+</style>

resources/js/processes/modeler/initialLoad.js

@@ -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";
@@ -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);
@@ -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",
  },
  });
 
@@ -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",
  },
  });
 

resources/lang/de.json

@@ -1170,6 +1170,7 @@
  "Options Variable": "Optionenvariable",
  "Get options from this variable. Must be an array.": "Optionen aus dieser Variable erhalten. Muss ein Array sein.",
  "Option Label Shown": "Angezeigte Optionsbezeichnung",
+ "option has been moved to the task destination dropdown": "option wurde in die Dropdown-Liste „Aufgabenziel“ verschoben",
  "Enter the property name from the Request data variable that displays to the user on the screen.": "Geben Sie den Namen der Eigenschaft aus der Anforderungsdatenvariable ein, die dem Benutzer auf dem Bildschirm angezeigt wird.",
  "Show Control As": "Steuerung anzeigen als",
  "Allow Multiple Selections": "Mehrfachauswahl zulassen",

resources/lang/en.json

@@ -1474,6 +1474,7 @@
  "open": "open",
  "Operating System": "Operating System",
  "Option Label Shown": "Option Label Shown",
+ "option has been moved to the task destination dropdown": "option has been moved to the task destination dropdown",
  "Options List": "Options List",
  "Options Variable": "Options Variable",
  "Options": "Options",

resources/lang/es.json

@@ -1438,6 +1438,7 @@
  "open": "abierto",
  "Open": "Abrir",
  "Operating System": "Sistema operativo",
+ "option has been moved to the task destination dropdown": "La opción se ha movido al menú desplegable de destino de la tarea.",
  "Option Label Shown": "Etiqueta de opción mostrada",
  "Options List": "Lista de opciones",
  "Options Variable": "Variable de opciones",

resources/lang/fr.json

@@ -1171,6 +1171,7 @@
  "Options Variable": "Options de la variable",
  "Get options from this variable. Must be an array.": "Obtenir des options de cette variable. Doit être un tableau.",
  "Option Label Shown": "Étiquette d'options affichée",
+ "option has been moved to the task destination dropdown": "l'option a été déplacée vers la liste déroulante de destination de la tâche",
  "Enter the property name from the Request data variable that displays to the user on the screen.": "Saisir le nom de la propriété relative à la variable de données de la demande qui s'affiche sur l'écran de l'utilisateur.",
  "Show Control As": "Afficher les commandes en tant que",
  "Allow Multiple Selections": "Autoriser les sélections multiples",

resources/js/processes/modeler/components/inspector/ScreenSelect.vue

@@ -18,6 +18,7 @@
  track-by="id"
  @open="load()"
  @search-change="load"
+ :name="name"
  >
  <template slot="noResult">
  {{ $t("No elements found. Consider changing the search query.") }}
@@ -72,6 +73,7 @@ export default {
  "required",
  "placeholder",
  "defaultKey",
+ "name",
  ],
  data() {
  return {

resources/js/processes/modeler/components/inspector/TaskInterstitial.vue

@@ -0,0 +1,116 @@
+<template>
+ <div>
+ <div v-if="!allowInterstitial" class="alert alert-info task-info-alert">
+ "{{ $t('Display Next Assigned Task to Task Assignee') }}" {{ $t('option has been moved to the task destination dropdown') }}
+ </div>
+ <screen-select
+ v-if="allowInterstitial"
+ v-model="screen"
+ name="interstitialScreen"
+ :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 }) {
+ if (nodeId !== this.node.id) {
+ return;
+ }
+ if (show) {
+ this.$set(this.node, "allowInterstitial", true);
+ } else {
+ this.$set(this.node, "allowInterstitial", false);
+ }
+ },
+
+ },
+};
+</script>
+
+<style lang="scss" scoped>
+.task-info-alert {
+ background-color: #EAF2FF;
+}
+</style>

resources/js/processes/modeler/initialLoad.js

@@ -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";
@@ -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);
@@ -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",
  },
  });
 
@@ -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",
  },
  });
 

resources/lang/de.json

@@ -1170,6 +1170,7 @@
  "Options Variable": "Optionenvariable",
  "Get options from this variable. Must be an array.": "Optionen aus dieser Variable erhalten. Muss ein Array sein.",
  "Option Label Shown": "Angezeigte Optionsbezeichnung",
+ "option has been moved to the task destination dropdown": "option wurde in die Dropdown-Liste „Aufgabenziel“ verschoben",
  "Enter the property name from the Request data variable that displays to the user on the screen.": "Geben Sie den Namen der Eigenschaft aus der Anforderungsdatenvariable ein, die dem Benutzer auf dem Bildschirm angezeigt wird.",
  "Show Control As": "Steuerung anzeigen als",
  "Allow Multiple Selections": "Mehrfachauswahl zulassen",

resources/lang/en.json

@@ -1474,6 +1474,7 @@
  "open": "open",
  "Operating System": "Operating System",
  "Option Label Shown": "Option Label Shown",
+ "option has been moved to the task destination dropdown": "option has been moved to the task destination dropdown",
  "Options List": "Options List",
  "Options Variable": "Options Variable",
  "Options": "Options",

resources/lang/es.json

@@ -1438,6 +1438,7 @@
  "open": "abierto",
  "Open": "Abrir",
  "Operating System": "Sistema operativo",
+ "option has been moved to the task destination dropdown": "La opción se ha movido al menú desplegable de destino de la tarea.",
  "Option Label Shown": "Etiqueta de opción mostrada",
  "Options List": "Lista de opciones",
  "Options Variable": "Variable de opciones",

resources/lang/fr.json

@@ -1171,6 +1171,7 @@
  "Options Variable": "Options de la variable",
  "Get options from this variable. Must be an array.": "Obtenir des options de cette variable. Doit être un tableau.",
  "Option Label Shown": "Étiquette d'options affichée",
+ "option has been moved to the task destination dropdown": "l'option a été déplacée vers la liste déroulante de destination de la tâche",
  "Enter the property name from the Request data variable that displays to the user on the screen.": "Saisir le nom de la propriété relative à la variable de données de la demande qui s'affiche sur l'écran de l'utilisateur.",
  "Show Control As": "Afficher les commandes en tant que",
  "Allow Multiple Selections": "Autoriser les sélections multiples",

resources/js/processes/modeler/components/inspector/ScreenSelect.vue

@@ -18,6 +18,7 @@
  track-by="id"
  @open="load()"
  @search-change="load"
+ :name="name"
  >
  <template slot="noResult">
  {{ $t("No elements found. Consider changing the search query.") }}
@@ -72,6 +73,7 @@ export default {
  "required",
  "placeholder",
  "defaultKey",
+ "name",
  ],
  data() {
  return {

resources/js/processes/modeler/components/inspector/TaskInterstitial.vue

@@ -0,0 +1,116 @@
+<template>
+ <div>
+ <div v-if="!allowInterstitial" class="alert alert-info task-info-alert">
+ "{{ $t('Display Next Assigned Task to Task Assignee') }}" {{ $t('option has been moved to the task destination dropdown') }}
+ </div>
+ <screen-select
+ v-if="allowInterstitial"
+ v-model="screen"
+ name="interstitialScreen"
+ :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 }) {
+ if (nodeId !== this.node.id) {
+ return;
+ }
+ if (show) {
+ this.$set(this.node, "allowInterstitial", true);
+ } else {
+ this.$set(this.node, "allowInterstitial", false);
+ }
+ },
+
+ },
+};
+</script>
+
+<style lang="scss" scoped>
+.task-info-alert {
+ background-color: #EAF2FF;
+}
+</style>

resources/js/processes/modeler/initialLoad.js

@@ -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";
@@ -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);
@@ -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",
  },
  });
 
@@ -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",
  },
  });
 

resources/lang/de.json

@@ -1170,6 +1170,7 @@
  "Options Variable": "Optionenvariable",
  "Get options from this variable. Must be an array.": "Optionen aus dieser Variable erhalten. Muss ein Array sein.",
  "Option Label Shown": "Angezeigte Optionsbezeichnung",
+ "option has been moved to the task destination dropdown": "option wurde in die Dropdown-Liste „Aufgabenziel“ verschoben",
  "Enter the property name from the Request data variable that displays to the user on the screen.": "Geben Sie den Namen der Eigenschaft aus der Anforderungsdatenvariable ein, die dem Benutzer auf dem Bildschirm angezeigt wird.",
  "Show Control As": "Steuerung anzeigen als",
  "Allow Multiple Selections": "Mehrfachauswahl zulassen",

resources/lang/en.json

@@ -1474,6 +1474,7 @@
  "open": "open",
  "Operating System": "Operating System",
  "Option Label Shown": "Option Label Shown",
+ "option has been moved to the task destination dropdown": "option has been moved to the task destination dropdown",
  "Options List": "Options List",
  "Options Variable": "Options Variable",
  "Options": "Options",

resources/lang/es.json

@@ -1438,6 +1438,7 @@
  "open": "abierto",
  "Open": "Abrir",
  "Operating System": "Sistema operativo",
+ "option has been moved to the task destination dropdown": "La opción se ha movido al menú desplegable de destino de la tarea.",
  "Option Label Shown": "Etiqueta de opción mostrada",
  "Options List": "Lista de opciones",
  "Options Variable": "Variable de opciones",

resources/lang/fr.json

@@ -1171,6 +1171,7 @@
  "Options Variable": "Options de la variable",
  "Get options from this variable. Must be an array.": "Obtenir des options de cette variable. Doit être un tableau.",
  "Option Label Shown": "Étiquette d'options affichée",
+ "option has been moved to the task destination dropdown": "l'option a été déplacée vers la liste déroulante de destination de la tâche",
  "Enter the property name from the Request data variable that displays to the user on the screen.": "Saisir le nom de la propriété relative à la variable de données de la demande qui s'affiche sur l'écran de l'utilisateur.",
  "Show Control As": "Afficher les commandes en tant que",
  "Allow Multiple Selections": "Autoriser les sélections multiples",

resources/js/processes/modeler/components/inspector/ScreenSelect.vue

@@ -18,6 +18,7 @@
  track-by="id"
  @open="load()"
  @search-change="load"
+ :name="name"
  >
  <template slot="noResult">
  {{ $t("No elements found. Consider changing the search query.") }}
@@ -72,6 +73,7 @@ export default {
  "required",
  "placeholder",
  "defaultKey",
+ "name",
  ],
  data() {
  return {

resources/js/processes/modeler/components/inspector/TaskInterstitial.vue

@@ -0,0 +1,116 @@
+<template>
+ <div>
+ <div v-if="!allowInterstitial" class="alert alert-info task-info-alert">
+ "{{ $t('Display Next Assigned Task to Task Assignee') }}" {{ $t('option has been moved to the task destination dropdown') }}
+ </div>
+ <screen-select
+ v-if="allowInterstitial"
+ v-model="screen"
+ name="interstitialScreen"
+ :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 }) {
+ if (nodeId !== this.node.id) {
+ return;
+ }
+ if (show) {
+ this.$set(this.node, "allowInterstitial", true);
+ } else {
+ this.$set(this.node, "allowInterstitial", false);
+ }
+ },
+
+ },
+};
+</script>
+
+<style lang="scss" scoped>
+.task-info-alert {
+ background-color: #EAF2FF;
+}
+</style>

resources/js/processes/modeler/initialLoad.js

@@ -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";
@@ -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);
@@ -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",
  },
  });
 
@@ -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",
  },
  });
 

resources/lang/de.json

@@ -1170,6 +1170,7 @@
  "Options Variable": "Optionenvariable",
  "Get options from this variable. Must be an array.": "Optionen aus dieser Variable erhalten. Muss ein Array sein.",
  "Option Label Shown": "Angezeigte Optionsbezeichnung",
+ "option has been moved to the task destination dropdown": "option wurde in die Dropdown-Liste „Aufgabenziel“ verschoben",
  "Enter the property name from the Request data variable that displays to the user on the screen.": "Geben Sie den Namen der Eigenschaft aus der Anforderungsdatenvariable ein, die dem Benutzer auf dem Bildschirm angezeigt wird.",
  "Show Control As": "Steuerung anzeigen als",
  "Allow Multiple Selections": "Mehrfachauswahl zulassen",

resources/lang/en.json

@@ -1474,6 +1474,7 @@
  "open": "open",
  "Operating System": "Operating System",
  "Option Label Shown": "Option Label Shown",
+ "option has been moved to the task destination dropdown": "option has been moved to the task destination dropdown",
  "Options List": "Options List",
  "Options Variable": "Options Variable",
  "Options": "Options",

resources/lang/es.json

@@ -1438,6 +1438,7 @@
  "open": "abierto",
  "Open": "Abrir",
  "Operating System": "Sistema operativo",
+ "option has been moved to the task destination dropdown": "La opción se ha movido al menú desplegable de destino de la tarea.",
  "Option Label Shown": "Etiqueta de opción mostrada",
  "Options List": "Lista de opciones",
  "Options Variable": "Variable de opciones",

resources/lang/fr.json

@@ -1171,6 +1171,7 @@
  "Options Variable": "Options de la variable",
  "Get options from this variable. Must be an array.": "Obtenir des options de cette variable. Doit être un tableau.",
  "Option Label Shown": "Étiquette d'options affichée",
+ "option has been moved to the task destination dropdown": "l'option a été déplacée vers la liste déroulante de destination de la tâche",
  "Enter the property name from the Request data variable that displays to the user on the screen.": "Saisir le nom de la propriété relative à la variable de données de la demande qui s'affiche sur l'écran de l'utilisateur.",
  "Show Control As": "Afficher les commandes en tant que",
  "Allow Multiple Selections": "Autoriser les sélections multiples",

resources/js/processes/modeler/components/inspector/ScreenSelect.vue

@@ -18,6 +18,7 @@
  track-by="id"
  @open="load()"
  @search-change="load"
+ :name="name"
  >
  <template slot="noResult">
  {{ $t("No elements found. Consider changing the search query.") }}
@@ -72,6 +73,7 @@ export default {
  "required",
  "placeholder",
  "defaultKey",
+ "name",
  ],
  data() {
  return {

resources/js/processes/modeler/components/inspector/TaskInterstitial.vue

@@ -0,0 +1,116 @@
+<template>
+ <div>
+ <div v-if="!allowInterstitial" class="alert alert-info task-info-alert">
+ "{{ $t('Display Next Assigned Task to Task Assignee') }}" {{ $t('option has been moved to the task destination dropdown') }}
+ </div>
+ <screen-select
+ v-if="allowInterstitial"
+ v-model="screen"
+ name="interstitialScreen"
+ :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 }) {
+ if (nodeId !== this.node.id) {
+ return;
+ }
+ if (show) {
+ this.$set(this.node, "allowInterstitial", true);
+ } else {
+ this.$set(this.node, "allowInterstitial", false);
+ }
+ },
+
+ },
+};
+</script>
+
+<style lang="scss" scoped>
+.task-info-alert {
+ background-color: #EAF2FF;
+}
+</style>

resources/js/processes/modeler/initialLoad.js

@@ -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";
@@ -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);
@@ -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",
  },
  });
 
@@ -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",
  },
  });
 

resources/lang/de.json

@@ -1170,6 +1170,7 @@
  "Options Variable": "Optionenvariable",
  "Get options from this variable. Must be an array.": "Optionen aus dieser Variable erhalten. Muss ein Array sein.",
  "Option Label Shown": "Angezeigte Optionsbezeichnung",
+ "option has been moved to the task destination dropdown": "option wurde in die Dropdown-Liste „Aufgabenziel“ verschoben",
  "Enter the property name from the Request data variable that displays to the user on the screen.": "Geben Sie den Namen der Eigenschaft aus der Anforderungsdatenvariable ein, die dem Benutzer auf dem Bildschirm angezeigt wird.",
  "Show Control As": "Steuerung anzeigen als",
  "Allow Multiple Selections": "Mehrfachauswahl zulassen",

resources/lang/en.json

@@ -1474,6 +1474,7 @@
  "open": "open",
  "Operating System": "Operating System",
  "Option Label Shown": "Option Label Shown",
+ "option has been moved to the task destination dropdown": "option has been moved to the task destination dropdown",
  "Options List": "Options List",
  "Options Variable": "Options Variable",
  "Options": "Options",

resources/lang/es.json

@@ -1438,6 +1438,7 @@
  "open": "abierto",
  "Open": "Abrir",
  "Operating System": "Sistema operativo",
+ "option has been moved to the task destination dropdown": "La opción se ha movido al menú desplegable de destino de la tarea.",
  "Option Label Shown": "Etiqueta de opción mostrada",
  "Options List": "Lista de opciones",
  "Options Variable": "Variable de opciones",

resources/lang/fr.json

@@ -1171,6 +1171,7 @@
  "Options Variable": "Options de la variable",
  "Get options from this variable. Must be an array.": "Obtenir des options de cette variable. Doit être un tableau.",
  "Option Label Shown": "Étiquette d'options affichée",
+ "option has been moved to the task destination dropdown": "l'option a été déplacée vers la liste déroulante de destination de la tâche",
  "Enter the property name from the Request data variable that displays to the user on the screen.": "Saisir le nom de la propriété relative à la variable de données de la demande qui s'affiche sur l'écran de l'utilisateur.",
  "Show Control As": "Afficher les commandes en tant que",
  "Allow Multiple Selections": "Autoriser les sélections multiples",