Skip to content

Commit

Permalink
fix(pat querystring): use contentbrowser for internal path selection.
Browse files Browse the repository at this point in the history
  • Loading branch information
@petschki
petschki committed Sep 25, 2024
1 parent 596bc39 commit 1c19cc5
Showing 1 changed file with 44 additions and 43 deletions.
87 changes: 44 additions & 43 deletions src/pat/querystring/querystring.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import _ from "underscore";
import _t from "../../core/i18n-wrapper";
import utils from "../../core/utils";
import Base from "@patternslib/patternslib/src/core/base";
import { Pattern as ContentbrowserPattern } from "../contentbrowser/contentbrowser";

var Criteria = function () {
this.init.apply(this, arguments);
Expand Down Expand Up @@ -37,7 +38,10 @@ Criteria.prototype = {
var self = this;
self.app = app;

self.options = $.extend(true, {}, self.defaults, options);
self.options = {
...self.defaults,
...options,
};
self.indexes = indexes;
self.indexGroups = {};
self.baseUrl = baseUrl;
Expand All @@ -53,19 +57,17 @@ Criteria.prototype = {
self.patternAjaxSelectOptions = patternAjaxSelectOptions || {};
self.patternRelateditemsOptions = patternRelateditemsOptions || {};
// Defaults
self.patternAjaxSelectOptions = $.extend(
{ width: "250px" },
self.patternAjaxSelectOptions
);
self.patternRelateditemsOptions = $.extend(
{
vocabularyUrl:
self.baseUrl +
"@@getVocabulary?name=plone.app.vocabularies.Catalog&field=relatedItems",
width: "400px",
},
self.patternRelateditemsOptions
);
self.patternAjaxSelectOptions = {
width: "250px",
...self.patternAjaxSelectOptions,
};
self.patternRelateditemsOptions = {
vocabularyUrl:
self.baseUrl +
"@@getVocabulary?name=plone.app.vocabularies.Catalog&field=relatedItems",
width: "20rem",
...self.patternRelateditemsOptions,
};
// Force set
self.patternRelateditemsOptions["maximumSelectionSize"] = 1;

Expand All @@ -85,7 +87,8 @@ Criteria.prototype = {
);

// list of indexes
$.each(self.indexes, function (value, options) {
for (const value in self.indexes) {
let options = self.indexes[value];
if (options.enabled) {
if (!self.indexGroups[options.group]) {
self.indexGroups[options.group] = $("<optgroup/>")
Expand All @@ -96,7 +99,7 @@ Criteria.prototype = {
$("<option/>").attr("value", value).html(options.title)
);
}
});
}

// attach index select to DOM
self.$wrapper.append(
Expand Down Expand Up @@ -180,8 +183,8 @@ Criteria.prototype = {
};
}

$.each(self.indexes.path.operators, function (key, value) {
var options = value;
for (const key in self.indexes.path.operators) {
var options = self.indexes.path.operators[key];
if (key.indexOf("absolute") > 0) {
options.title = "Custom";
} else if (key.indexOf("relative") > 0) {
Expand All @@ -192,12 +195,12 @@ Criteria.prototype = {
options.title = "Current (./)";
options.widget = "RelativePathWidget";
}
});
};
},
resetPathOperators: function () {
var self = this;
$.each(self.indexes.path.operators, function (key, value) {
var options = value;
for (const key in self.indexes.path.operators) {
var options = self.indexes.path.operators[key];
if (key.indexOf("absolute") > 0) {
options.title = "Absolute Path";
} else if (key.indexOf("relative") > 0) {
Expand All @@ -208,7 +211,7 @@ Criteria.prototype = {
options.title = "Navigation Path";
options.widget = "ReferenceWidget";
}
});
};

return;
},
Expand Down Expand Up @@ -351,9 +354,8 @@ Criteria.prototype = {
self.trigger("value-changed");
});
} else {
console.log(value);
var pathAndDepth = [".", "1"];
if (typeof value !== "undefined") {
if (typeof value !== "undefined" && value.indexOf("::") != -1) {
pathAndDepth = value.split("::");
if (pathAndDepth[0] === ".") {
self.$operator.val(
Expand Down Expand Up @@ -395,11 +397,10 @@ Criteria.prototype = {
.addClass(self.options.classValueName + "-" + widget)
.appendTo($wrapper)
.val(pathAndDepth[0])
.patternRelateditems(self.patternRelateditemsOptions)
.on("change", function () {
self.trigger("value-changed");
});
$wrapper.addClass("break-line");
const pat = new ContentbrowserPattern(self.$value[0], self.patternRelateditemsOptions);
pat.el.addEventListener("change", (e) => {

Check failure on line 401 in src/pat/querystring/querystring.js

View workflow job for this annotation

GitHub Actions / test 

'e' is defined but never used
self.trigger("value-changed");
})
self.$value.after(createDepthSelect(pathAndDepth[1]));
}
} else if (widget === "MultipleSelectionWidget") {
Expand All @@ -411,12 +412,13 @@ Criteria.prototype = {
self.trigger("value-changed");
});
if (self.indexes[index]) {
$.each(self.indexes[index].values, function (value, options) {
for (const value in self.indexes[index].values) {
const options = self.indexes[index].values[value];
$("<option/>")
.attr("value", value)
.html(options.title)
.appendTo(self.$value);
});
};
}
self.$value.patternSelect2(self.patternAjaxSelectOptions);
}
Expand Down Expand Up @@ -642,9 +644,6 @@ export default Base.extend({
showPreviews: true,
},
init: async function () {
await import("../select2/select2");
await import("../relateditems/relateditems");

import("./querystring.scss");

var self = this;
Expand Down Expand Up @@ -801,7 +800,7 @@ export default Base.extend({
.attr("name", "sort_on")
.appendTo(self.$sortWrapper)
.on("change", function () {
self.refreshPreviewEvent.call(self);
self.refreshPreviewEvent();
$('[id$="sort_on"]', existingSortOn).val($(this).val());
});

Expand All @@ -816,7 +815,7 @@ export default Base.extend({
self.$sortOrder = $('<input type="checkbox" />')
.attr("name", "sort_reversed:boolean")
.on("change", function () {
self.refreshPreviewEvent.call(self);
self.refreshPreviewEvent();
if ($(this).prop("checked")) {
$('input[type="checkbox"]', existingSortOrder).prop("checked", true);
} else {
Expand Down Expand Up @@ -868,12 +867,12 @@ export default Base.extend({
}

var query = [];
$.each(self.criterias, function (i, criteria) {
for (const criteria of self.criterias) {
var querypart = criteria.buildQueryPart();
if (querypart !== "") {
query.push(querypart);
}
});
};

self.$previewPane = $("<div/>")
.addClass(self.options.classPreviewName)
Expand All @@ -892,14 +891,15 @@ export default Base.extend({
query.push("sort_order=reverse");
}

self._previewXhr = $.get(self.options.previewURL + "?" + query.join("&")).done(
function (data) {
self._previewXhr = $.ajax({
url: self.options.previewURL + "?" + query.join("&"),
success: (data) => {
$("<div/>")
.addClass(self.options.classPreviewResultsWrapperName)
.html(data)
.html(utils.parseBodyTag(data))
.appendTo(self.$previewPane);
}
);
},
});
},
updateValue: function () {
// updating the original input with json data in the form:
Expand All @@ -917,6 +917,7 @@ export default Base.extend({
}
});
var val = "[" + criteriastrs.join(",") + "]";
console.log(val);
self.$el.val(val);
self.$el.trigger("change");
},
Expand Down

0 comments on commit 1c19cc5

Please sign in to comment.