Skip to content

Task/tcdizm 364/fix config fields in data filter #136

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
timothygachengo merged 7 commits into from
May 14, 2026
Merged

Task/tcdizm 364/fix config fields in data filter #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
56b19ba
fix (TCDIZM-364): fix configuration fields not showing in daata filter
timothygachengo May 12, 2026
75d7a73
fix (TCDIZM-364): show filter configuration section while metadata loads
timothygachengo May 12, 2026
59df1b0
ci: add ci to check pnpm build
timothygachengo May 12, 2026
94caf20
Potential fix for pull request finding
timothygachengo May 12, 2026
561471b
Potential fix for pull request finding
timothygachengo May 12, 2026
b1f7064
ci: add ci to check pnpm build
timothygachengo May 12, 2026
fa9fbda
Merge branch 'task/TCDIZM-364/fix-config-fields-in-data-filter' of gi…
timothygachengo May 12, 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
32 changes: 32 additions & 0 deletions .github/workflows/test-on-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Test on PR

on:
pull_request:
types: [opened, synchronize, reopened, ready_for_review]
paths:
- "packages/**"
- "plugins/wp-react-blocks-plugin/**"
- "pnpm-workspace.yaml"
- "package.json"
- "pnpm-lock.yaml"
Comment thread
timothygachengo marked this conversation as resolved.

permissions:
contents: read

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
test:
if: github.event.pull_request.draft == false
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v4

- name: Setup
uses: ./.github/actions/setup

- name: Run PNPM Build
run: pnpm run build
91 changes: 48 additions & 43 deletions plugins/wp-react-blocks-plugin/blocks/filter/BlockEdit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,46 +254,51 @@ class BlockEdit extends BlockEditWithAPIMetadata {
}
</PanelBody>

{app != 'csv' && this.state.filters && <PanelBody initialOpen={false} title={__("Select Filter")}>
<PanelRow>
<SelectControl
label={__('Filter')}
value={param}
options={[{ value: '', label: __("Select Filter") }, ...this.state.filters]}
onChange={param => {
if (param != '') {
const type = this.state.filters.filter(f => f.param === param)[0].type
setAttributes({ param, type, hiddenFilters: [], defaultValues: "" })
} else {
setAttributes({ param: "", type: "", hiddenFilters: [], defaultValues: "" })
}
}}
help={__('Select the main filter parameter.')}
/>
</PanelRow>



<PanelRow>
<SelectControl
label={__('Parent Filter')}
value={parentFilter}
help={__('Set parent filter autoaply false in order to avoid unnecesary data reloading.')}
options={[{ value: "", label: __("None") }, ...this.state.filters]}
onChange={parentFilter => {
if (parentFilter && parentFilter !== "") {
const parentFilterObj = this.state.filters.find(f => f.value === parentFilter);
if (parentFilterObj) {
setAttributes({ parentFilter, parentFilterParam: parentFilterObj.param });
}
} else {
setAttributes({ parentFilter: "", parentFilterParam: "" });
}
}} />
</PanelRow>
{app && app !== 'csv' && <PanelBody initialOpen={false} title={__("Select Filter")}>
{this.state.filters ? (
<>
<PanelRow>
<SelectControl
label={__('Filter')}
value={param}
options={[{ value: '', label: __("Select Filter") }, ...this.state.filters]}
onChange={param => {
if (param != '') {
const type = this.state.filters.filter(f => f.param === param)[0].type
setAttributes({ param, type, hiddenFilters: [], defaultValues: "" })
} else {
setAttributes({ param: "", type: "", hiddenFilters: [], defaultValues: "" })
}
}}
help={__('Select the main filter parameter.')}
/>
</PanelRow>

<PanelRow>
<SelectControl
label={__('Parent Filter')}
value={parentFilter}
help={__('Set the parent filter auto-apply option to false to avoid unnecessary data reloading.')}
options={[{ value: "", label: __("None") }, ...this.state.filters]}
onChange={parentFilter => {
if (parentFilter && parentFilter !== "") {
const parentFilterObj = this.state.filters.find(f => f.value === parentFilter);
if (parentFilterObj) {
setAttributes({ parentFilter, parentFilterParam: parentFilterObj.param });
}
} else {
setAttributes({ parentFilter: "", parentFilterParam: "" });
}
}} />
</PanelRow>
</>
) : (
<PanelRow>
<p>{__('Loading filter options...')}</p>
</PanelRow>
)}
</PanelBody>}
{app == 'csv' && this.state.filters && <PanelBody initialOpen={false} title={__("Select Filter")}>
{app && app === 'csv' && <PanelBody initialOpen={false} title={__("Select Filter")}>
<PanelRow>
<TextControl label={__("Field")} value={param}
onChange={(param) => setAttributes({ param })}
Expand Down Expand Up @@ -321,7 +326,7 @@ class BlockEdit extends BlockEditWithAPIMetadata {
help={__('How to determine the default value.')}
/>
</PanelRow>
{defaultValueCriteria == DEFAULT_VALUE_INPUT && <PanelRow>
{defaultValueCriteria === DEFAULT_VALUE_INPUT && <PanelRow>
<TextControl label={__("Default Values")} value={defaultValues}
onChange={(defaultValues) => setAttributes({ defaultValues })}
help={__("Manually specified default values.")}
Expand All @@ -338,7 +343,7 @@ class BlockEdit extends BlockEditWithAPIMetadata {
onChange={(filterType) => {
setAttributes({ filterType: filterType, isRange: filterType == "range" })
}}
options={app == 'csv' ? [{
options={app === 'csv' ? [{
label: "Multi select",
value: "multi-select"
}, { label: "Single select", value: "single-select" }, {
Expand Down Expand Up @@ -369,7 +374,7 @@ class BlockEdit extends BlockEditWithAPIMetadata {
/>
</PanelRow>}
</PanelBody>
{app != 'csv' && <PanelBody initialOpen={false} title={__("Filter or hide items")}>
{app !== 'csv' && <PanelBody initialOpen={false} title={__("Filter or hide items")}>
<PanelRow>
<ToggleControl
label={__("Filter items")}
Expand All @@ -382,7 +387,7 @@ class BlockEdit extends BlockEditWithAPIMetadata {
checked={!useFilterItems}
onChange={() => setAttributes({ useFilterItems: !useFilterItems, filters: [], hiddenFilters: [] })} />
</PanelRow>
{useFilterItems && <DataFilters
{useFilterItems && this.state.filters && <DataFilters
allFilters={this.state.filters}
allCategories={this.state.categories}
{...this.props} />
Expand Down Expand Up @@ -506,7 +511,7 @@ class BlockEdit extends BlockEditWithAPIMetadata {
help={__("Show a message when filter list is empty is empty.")}
/>
</PanelRow>
{filterType == "multi-select" && <>
{filterType === "multi-select" && <>
<PanelRow>
<ToggleControl
label={__("Close dropdown on item select/click")}
Expand Down
Loading