Skip to content
Merged
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
39 changes: 23 additions & 16 deletions src/components/FormSelectList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,11 @@
import OptionboxView from "./FormSelectList/OptionboxView";
import FormMultiSelect from "./FormMultiSelect";
import Mustache from "mustache";
import { get } from 'lodash';
import { debounce, isEqual, cloneDeep, get } from 'lodash';


const uniqIdsMixin = createUniqIdsMixin()

function removeInvalidOptions(option) {
return Object.keys(option).includes('value', 'content') &&
option.content != null;
}

export default {
inheritAttrs: false,
components: {
Expand All @@ -91,9 +86,12 @@
data() {
return {
lastRequest: {},
previousSourceConfig: null,
previousValidationData: null,
previousValidationDataParent: null,
apiClient: window.ProcessMaker.apiClient.create(),
selectListOptions: [],
doDebounce: _.debounce(options => {
doDebounce: debounce(options => {
const selectedEndPoint = options.selectedEndPoint;
const selectedDataSource = options.selectedDataSource;
const dataName = options.dataName;
Expand All @@ -111,10 +109,10 @@

// Do not re-run the same request
const request = { dataSourceUrl, selectedEndPoint };
if (_.isEqual(this.lastRequest, request)) {
if (isEqual(this.lastRequest, request)) {
return;
}
this.lastRequest = _.cloneDeep(request);
this.lastRequest = cloneDeep(request);

this.apiClient
.post(dataSourceUrl, { config: { endpoint: selectedEndPoint, } })
Expand Down Expand Up @@ -210,7 +208,7 @@
let dataName = this.options.dataName.split('.');
// Check to see if the watcher output variable has been loaded.
if (this.validationData && this.validationData.hasOwnProperty(dataName[0]) && this.validationData[dataName[0]] !== null) {
if (_.isEqual(newSelectOptions, oldSelectOptions)) {
if (isEqual(newSelectOptions, oldSelectOptions)) {
return;
}
this.$emit('input', null);
Expand Down Expand Up @@ -244,23 +242,32 @@
sourceConfig: {
immediate:true,
deep: true,
handler() {
this.fillSelectListOptions();
handler(value) {
if (!isEqual(this.previousSourceConfig, value)) {
this.fillSelectListOptions();
}
this.previousSourceConfig = cloneDeep(value);
}
},
// React to local data scope
validationData: {
immediate:true,
deep: true,
handler() {
this.fillSelectListOptions();
handler(value) {
if (!isEqual(this.previousValidationData, value)) {
this.fillSelectListOptions();
}
this.previousValidationData = cloneDeep(value);
}
},
// React to a parent data scope
"validationData._parent": {
deep: true,
handler() {
this.fillSelectListOptions();
handler(value) {
if (!isEqual(this.previousValidationDataParent, value)) {
this.fillSelectListOptions();
}
this.previousValidationDataParent = cloneDeep(value);
}
},
selectListOptions(newValue, oldValue) {
Expand Down