Skip to content

fix(builder): persist custom listing card fields #2901

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

Open
syedgalib wants to merge 3 commits into
base: development
Choose a base branch
from
Open

fix(builder): persist custom listing card fields #2901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
902c1ab
fix(builder): persist custom listing card fields
syedgalib Jul 5, 2026
d6d6327
chore: build assets
syedgalib Jul 5, 2026
561235d
chore: merge development into resource card fix
syedgalib Jul 21, 2026
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
53 changes: 37 additions & 16 deletions assets/src/js/admin/vue/modules/form-fields/Card_Builder_Grid_View_With_Thumbnail_Field.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,8 +635,13 @@ export default {
];

for (let widget_name of uniqueWidgets) {
// Check if widget is available
if (!this.available_widgets[widget_name]) {
const availableWidget =
this.theAvailableWidgets[widget_name] ||
this.available_widgets[widget_name];

// Check if widget is available. Dynamic custom-field widgets only
// exist in theAvailableWidgets, not in the base available_widgets map.
if (!availableWidget) {
continue;
}

Expand All @@ -647,11 +652,11 @@ export default {
typeof this.active_widgets[widget_name] !== "object"
) {
// Get widget from theAvailableWidgets to ensure widget_key and widget_name are set
const widgetFromAvailable = this.theAvailableWidgets[widget_name];
const widgetFromAvailable = availableWidget;
if (widgetFromAvailable) {
this.active_widgets[widget_name] = {
...widgetFromAvailable,
widget_name: widget_name,
widget_name: widgetFromAvailable.widget_name || widget_name,
widget_key: widget_name,
};
} else {
Expand Down Expand Up @@ -735,14 +740,19 @@ export default {
let widget_keys = [];
for (let matched_field of show_if_cond_state.matched_data) {
let _main_widget = JSON.parse(JSON.stringify(main_widget));
let current_key = widget_keys.includes(widget)
? widget + "_" + (widget_keys.length + 1)
: widget;
let current_key = matched_field.widget_key
? matched_field.widget_key
: widget_keys.includes(widget)
? widget + "_" + (widget_keys.length + 1)
: widget;
_main_widget.widget_key = current_key;

if (matched_field.widget_key) {
_main_widget.original_widget_key = matched_field.widget_key;
}
if (matched_field.field_key) {
_main_widget.field_key = matched_field.field_key;
}

if (
typeof matched_field.label === "string" &&
Expand Down Expand Up @@ -971,15 +981,21 @@ export default {
}

for (let widget of value[section][area]) {
if (typeof widget.widget_name === "undefined") {
continue;
}
if (typeof widget.widget_key === "undefined") {
const widget_key =
widget.widget_key ||
widget.original_widget_key ||
widget.widget_name;
if (typeof widget_key === "undefined") {
continue;
}
if (
typeof this.available_widgets[widget.widget_name] === "undefined"
) {
const widget_template =
this.theAvailableWidgets[widget_key] ||
this.theAvailableWidgets[widget.original_widget_key] ||
this.theAvailableWidgets[widget.widget_name] ||
this.available_widgets[widget.widget_name] ||
this.available_widgets[widget_key];

if (typeof widget_template === "undefined") {
continue;
}
if (typeof this.local_layout[section] === "undefined") {
Expand All @@ -989,11 +1005,16 @@ export default {
continue;
}

active_widgets_data[widget.widget_key] = widget;
active_widgets_data[widget_key] = {
...widget,
widget_key: widget_key,
widget_name:
widget.widget_name || widget_template.widget_name || widget_key,
};
selectedWidgets.push({
section: section,
area: area,
widget: widget.widget_key,
widget: widget_key,
});
}
}
Expand Down
53 changes: 37 additions & 16 deletions ...s/src/js/admin/vue/modules/form-fields/Card_Builder_Grid_View_Without_Thumbnail_Field.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,8 +475,13 @@ export default {
const widget_name =
layout[section][section_area].selectedWidgets[widget];

// Check if widget is available
if (!this.available_widgets[widget_name]) {
const availableWidget =
this.theAvailableWidgets[widget_name] ||
this.available_widgets[widget_name];

// Check if widget is available. Dynamic custom-field widgets only
// exist in theAvailableWidgets, not in the base available_widgets map.
if (!availableWidget) {
continue;
}

Expand All @@ -487,11 +492,11 @@ export default {
typeof this.active_widgets[widget_name] !== "object"
) {
// Get widget from theAvailableWidgets to ensure widget_key and widget_name are set
const widgetFromAvailable = this.theAvailableWidgets[widget_name];
const widgetFromAvailable = availableWidget;
if (widgetFromAvailable) {
this.active_widgets[widget_name] = {
...widgetFromAvailable,
widget_name: widget_name,
widget_name: widgetFromAvailable.widget_name || widget_name,
widget_key: widget_name,
};
} else {
Expand Down Expand Up @@ -575,14 +580,19 @@ export default {
let widget_keys = [];
for (let matched_field of show_if_cond_state.matched_data) {
let _main_widget = JSON.parse(JSON.stringify(main_widget));
let current_key = widget_keys.includes(widget)
? widget + "_" + (widget_keys.length + 1)
: widget;
let current_key = matched_field.widget_key
? matched_field.widget_key
: widget_keys.includes(widget)
? widget + "_" + (widget_keys.length + 1)
: widget;
_main_widget.widget_key = current_key;

if (matched_field.widget_key) {
_main_widget.original_widget_key = matched_field.widget_key;
}
if (matched_field.field_key) {
_main_widget.field_key = matched_field.field_key;
}

if (
typeof matched_field.label === "string" &&
Expand Down Expand Up @@ -806,15 +816,21 @@ export default {
}

for (let widget of value[section][area]) {
if (typeof widget.widget_name === "undefined") {
continue;
}
if (typeof widget.widget_key === "undefined") {
const widget_key =
widget.widget_key ||
widget.original_widget_key ||
widget.widget_name;
if (typeof widget_key === "undefined") {
continue;
}
if (
typeof this.available_widgets[widget.widget_name] === "undefined"
) {
const widget_template =
this.theAvailableWidgets[widget_key] ||
this.theAvailableWidgets[widget.original_widget_key] ||
this.theAvailableWidgets[widget.widget_name] ||
this.available_widgets[widget.widget_name] ||
this.available_widgets[widget_key];

if (typeof widget_template === "undefined") {
continue;
}
if (typeof this.local_layout[section] === "undefined") {
Expand All @@ -824,11 +840,16 @@ export default {
continue;
}

active_widgets_data[widget.widget_key] = widget;
active_widgets_data[widget_key] = {
...widget,
widget_key: widget_key,
widget_name:
widget.widget_name || widget_template.widget_name || widget_key,
};
selectedWidgets.push({
section: section,
area: area,
widget: widget.widget_key,
widget: widget_key,
});
}
}
Expand Down
53 changes: 37 additions & 16 deletions assets/src/js/admin/vue/modules/form-fields/Card_Builder_List_View_With_Thumbnail_Field.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,8 +494,13 @@ export default {
const widget_name =
layout[section][section_area].selectedWidgets[widget];

// Check if widget is available
if (!this.available_widgets[widget_name]) {
const availableWidget =
this.theAvailableWidgets[widget_name] ||
this.available_widgets[widget_name];

// Check if widget is available. Dynamic custom-field widgets only
// exist in theAvailableWidgets, not in the base available_widgets map.
if (!availableWidget) {
continue;
}

Expand All @@ -506,11 +511,11 @@ export default {
typeof this.active_widgets[widget_name] !== "object"
) {
// Get widget from theAvailableWidgets to ensure widget_key and widget_name are set
const widgetFromAvailable = this.theAvailableWidgets[widget_name];
const widgetFromAvailable = availableWidget;
if (widgetFromAvailable) {
this.active_widgets[widget_name] = {
...widgetFromAvailable,
widget_name: widget_name,
widget_name: widgetFromAvailable.widget_name || widget_name,
widget_key: widget_name,
};
} else {
Expand Down Expand Up @@ -594,14 +599,19 @@ export default {
let widget_keys = [];
for (let matched_field of show_if_cond_state.matched_data) {
let _main_widget = JSON.parse(JSON.stringify(main_widget));
let current_key = widget_keys.includes(widget)
? widget + "_" + (widget_keys.length + 1)
: widget;
let current_key = matched_field.widget_key
? matched_field.widget_key
: widget_keys.includes(widget)
? widget + "_" + (widget_keys.length + 1)
: widget;
_main_widget.widget_key = current_key;

if (matched_field.widget_key) {
_main_widget.original_widget_key = matched_field.widget_key;
}
if (matched_field.field_key) {
_main_widget.field_key = matched_field.field_key;
}

if (
typeof matched_field.label === "string" &&
Expand Down Expand Up @@ -751,15 +761,21 @@ export default {
}

for (let widget of value[section][area]) {
if (typeof widget.widget_name === "undefined") {
continue;
}
if (typeof widget.widget_key === "undefined") {
const widget_key =
widget.widget_key ||
widget.original_widget_key ||
widget.widget_name;
if (typeof widget_key === "undefined") {
continue;
}
if (
typeof this.available_widgets[widget.widget_name] === "undefined"
) {
const widget_template =
this.theAvailableWidgets[widget_key] ||
this.theAvailableWidgets[widget.original_widget_key] ||
this.theAvailableWidgets[widget.widget_name] ||
this.available_widgets[widget.widget_name] ||
this.available_widgets[widget_key];

if (typeof widget_template === "undefined") {
continue;
}
if (typeof this.local_layout[section] === "undefined") {
Expand All @@ -769,11 +785,16 @@ export default {
continue;
}

active_widgets_data[widget.widget_key] = widget;
active_widgets_data[widget_key] = {
...widget,
widget_key: widget_key,
widget_name:
widget.widget_name || widget_template.widget_name || widget_key,
};
selectedWidgets.push({
section: section,
area: area,
widget: widget.widget_key,
widget: widget_key,
});
}
}
Expand Down
Loading