Skip to content
Snippets Groups Projects
Commit c2f8de18 authored by Jean-Baptiste Pasquier's avatar Jean-Baptiste Pasquier
Browse files

fix:... 

fix: https://github.com/openfoodfoundation/sib-discovery-components/issues/18#issuecomment-1984775371
parent 0f211667
No related branches found
No related tags found
No related merge requests found
Pipeline #17414 passed with stage
in 55 seconds
Hide whitespace changes
Inline Side-by-side
src/components/main.js
+ 10
− 10
View file @ c2f8de18
......@@ -219,7 +219,7 @@ utils.importCore().then(async (core) => {
<solid-form-search
id="producers-list-filters-${this.uniq}"
loader-id="loader-producers-list-filters-${this.uniq}"
fields="set-line-field(set-line-field-col(set-line-field-panel(search-field))),filterBy-row(filterBy),set-line-fnc(set-line-fnc-col(set-line-fnc-panel(set-line-fnc-wrapper(ofn:First_Nations_country)))),${this.rangeProducerOutcomes ? "set-line-ecological(set-line-ecological-col(set-line-ecological-panel(set-line-ecological-wrapper(ofn:hasSupportingEvidence.ldp:contains.ofn:Classification))))," : ""}set-line-produce(set-line-produce-col(set-line-produce-panel(set-line-produce-wrapper(ofn:hasProduceCategory)))),${this.rangeProducerAssurances ? "set-line-assurance(set-line-assurance-col(set-line-assurance-panel(set-line-assurance-wrapper(ofn:hasAssurancePartnerships.ldp:contains.ofn:Assurance_partner))))," : ""}${this.rangeProducerCertifications ? "set-line-certification(set-line-certification-col(set-line-certification-panel(set-line-certification-wrapper(ofn:hasCertifications.ldp:contains.ofn:hasCertificationStatus))))," : ""}set-line-address(set-line-address-col(set-line-address-panel(set-line-address-wrapper(address))))"
fields="set-line-field(set-line-field-col(set-line-field-panel(search-field))),filterBy-row(filterBy),set-line-fnc(set-line-fnc-col(set-line-fnc-panel(set-line-fnc-wrapper(ofn:First_Nations_led)))),${this.rangeProducerOutcomes ? "set-line-ecological(set-line-ecological-col(set-line-ecological-panel(set-line-ecological-wrapper(ofn:hasSupportingEvidence.ldp:contains.ofn:Classification))))," : ""}set-line-produce(set-line-produce-col(set-line-produce-panel(set-line-produce-wrapper(ofn:hasProduceCategory)))),${this.rangeProducerAssurances ? "set-line-assurance(set-line-assurance-col(set-line-assurance-panel(set-line-assurance-wrapper(ofn:hasAssurancePartnerships.ldp:contains.ofn:Assurance_partner))))," : ""}${this.rangeProducerCertifications ? "set-line-certification(set-line-certification-col(set-line-certification-panel(set-line-certification-wrapper(ofn:hasCertifications.ldp:contains.ofn:hasCertificationStatus))))," : ""}set-line-address(set-line-address-col(set-line-address-panel(set-line-address-wrapper(address))))"
class-set-line-field="row"
search-search-field="dfc-b:name, ofn:long_description"
widget-search-field="solid-form-label-text"
......@@ -238,9 +238,9 @@ utils.importCore().then(async (core) => {
class-set-line-fnc-panel="filter card horizontal"
widget-set-line-fnc-wrapper="div"
class-set-line-fnc-wrapper="card-content"
value-ofn:first_nations_country="${this.uniq}"
widget-ofn:first_nations_country="custom-search-firstnationsled"
class-ofn:first_nations_country="input-field col s12 no-margin no-padding"
value-ofn:First_Nations_led="${this.uniq}"
widget-ofn:First_Nations_led="custom-search-firstnationsled"
class-ofn:First_Nations_led="input-field col s12 no-margin no-padding"
widget-set-line-ecological="div"
class-set-line-ecological="row no-margin-bottom"
widget-set-line-ecological-col="div"
......@@ -319,7 +319,7 @@ utils.importCore().then(async (core) => {
loader-id="loader-producers-list-${this.uniq}"
data-src="${this.producersSrc}"
filtered-by="producers-list-filters-${this.uniq}"
fields="set-card-row(set-card-col(set-card-panel(set-card-wrapper(set-left-panel(ofn:logo_url), set-right-panel(set-title(dfc-b:name, dfc-b:hasAddress.dfc-b:hasCity, region(dfc-b:hasAddress.dfc-b:region, comma, dfc-b:hasAddress.dfc-b:hasCountry)), set-description(ofn:long_description), set-tags(ofn:First_Nations_country, ofn:hasProduceCategory))))))"
fields="set-card-row(set-card-col(set-card-panel(set-card-wrapper(set-left-panel(ofn:logo_url), set-right-panel(set-title(dfc-b:name, dfc-b:hasAddress.dfc-b:hasCity, region(dfc-b:hasAddress.dfc-b:region, comma, dfc-b:hasAddress.dfc-b:hasCountry)), set-description(ofn:long_description), set-tags(ofn:First_Nations_led, ofn:hasProduceCategory))))))"
widget-set-card-row="div"
class-set-card-row="row"
widget-set-card-col="div"
......@@ -350,7 +350,7 @@ utils.importCore().then(async (core) => {
widget-ofn:long_description="custom-safe-html-value-short"
class-ofn:long_description="col s12"
widget-set-tags="div"
widget-ofn:first_nations_country="custom-badge-firstnationsled"
widget-ofn:First_Nations_led="custom-badge-firstnationsled"
widget-ofn:hasProduceCategory="custom-multiple-badge"
next="${this.route}-producer-details"
></solid-display>
......@@ -453,7 +453,7 @@ utils.importCore().then(async (core) => {
<solid-form-search
id="products-list-filters-${this.uniq}"
loader-id="loader-products-list-filters-${this.uniq}"
fields="set-line-field(set-line-field-col(set-line-field-panel(search-field-product))),filterBy-row(filterBy),set-line-fnc(set-line-fnc-col(set-line-fnc-panel(set-line-fnc-wrapper(dfc-b:suppliedBy.ofn:First_Nations_country)))),${this.rangeProducerOutcomes ? "set-line-ecological(set-line-ecological-col(set-line-ecological-panel(set-line-ecological-wrapper(dfc-b:suppliedBy.ofn:hasSupportingEvidence.ldp:contains.ofn:Classification))))," : ""}set-line-produce(set-line-produce-col(set-line-produce-panel(set-line-produce-wrapper(ofn:Type))))${this.rangeProducerAssurances ? ",set-line-assurance(set-line-assurance-col(set-line-assurance-panel(set-line-assurance-wrapper(dfc-b:suppliedBy.ofn:hasAssurancePartnerships.ldp:contains.ofn:Assurance_partner))))" : ""}"
fields="set-line-field(set-line-field-col(set-line-field-panel(search-field-product))),filterBy-row(filterBy),set-line-fnc(set-line-fnc-col(set-line-fnc-panel(set-line-fnc-wrapper(dfc-b:suppliedBy.ofn:First_Nations_led)))),${this.rangeProducerOutcomes ? "set-line-ecological(set-line-ecological-col(set-line-ecological-panel(set-line-ecological-wrapper(dfc-b:suppliedBy.ofn:hasSupportingEvidence.ldp:contains.ofn:Classification))))," : ""}set-line-produce(set-line-produce-col(set-line-produce-panel(set-line-produce-wrapper(ofn:Type))))${this.rangeProducerAssurances ? ",set-line-assurance(set-line-assurance-col(set-line-assurance-panel(set-line-assurance-wrapper(dfc-b:suppliedBy.ofn:hasAssurancePartnerships.ldp:contains.ofn:Assurance_partner))))" : ""}"
class-set-line-field="row"
search-search-field-product="dfc-b:name, ofn:description"
widget-search-field-product="solid-form-label-text"
......@@ -472,9 +472,9 @@ utils.importCore().then(async (core) => {
class-set-line-fnc-panel="filter card horizontal"
widget-set-line-fnc-wrapper="div"
class-set-line-fnc-wrapper="card-content"
value-dfc-b:suppliedBy.ofn:first_nations_country="${this.uniq}"
widget-dfc-b:suppliedBy.ofn:first_nations_country="custom-search-firstnationsled"
class-dfc-b:suppliedBy.ofn:first_nations_country="input-field col s12 no-margin no-padding"
value-dfc-b:suppliedBy.ofn:First_Nations_led="${this.uniq}"
widget-dfc-b:suppliedBy.ofn:First_Nations_led="custom-search-firstnationsled"
class-dfc-b:suppliedBy.ofn:First_Nations_led="input-field col s12 no-margin no-padding"
widget-set-line-ecological="div"
class-set-line-ecological="row no-margin-bottom"
widget-set-line-ecological-col="div"
......
src/components/widgets/search-firstnationsled.js
+ 2
− 2
View file @ c2f8de18
......@@ -22,8 +22,8 @@ customElements.define(
this.blocked = true;
if(changed) this.checkbox = !this.checkbox;
setTimeout(() => {
toggleAndPopulate(`[filtered-by=producers-list-filters-${this.value}]`, "required-ofn:first_nations_country", 'ofn:First_Nations_country');
toggleAndPopulate(`[filtered-by=products-list-filters-${this.value}]`, "required-dfc-b:suppliedBy.ofn:First_Nations_country", 'dfc-b:suppliedBy.ofn:First_Nations_country');
toggleAndPopulate(`[filtered-by=producers-list-filters-${this.value}]`, "required-ofn:First_Nations_led", 'ofn:First_Nations_led');
toggleAndPopulate(`[filtered-by=products-list-filters-${this.value}]`, "required-dfc-b:suppliedBy.ofn:First_Nations_led", 'dfc-b:suppliedBy.ofn:First_Nations_led');
this.blocked = false;
}, 0);
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment