From 4c69932db3d45b373bc9ebbcbee50fb2ecb8aacb Mon Sep 17 00:00:00 2001 From: Pauline ESPALIEU Date: Tue, 27 Aug 2024 15:42:39 +0200 Subject: [PATCH 1/2] add sort on cloud and access --- internal/data_sources/access_product_data_source.go | 2 ++ internal/data_sources/cloud_product_data_source.go | 2 ++ internal/data_sources/transport_product_data_source.go | 3 --- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/internal/data_sources/access_product_data_source.go b/internal/data_sources/access_product_data_source.go index a9cf8cc..9bf19ef 100644 --- a/internal/data_sources/access_product_data_source.go +++ b/internal/data_sources/access_product_data_source.go @@ -174,10 +174,12 @@ func (d *accessProductDataSource) Read(ctx context.Context, req datasource.ReadR resp.Diagnostics.AddError("error getting filters", err.Error()) } filterStrings = append(filterStrings, filtersToAdd...) + sortStrings := getSortString(data.Sort) // Define the search request searchRequest := &meilisearch.SearchRequest{ Filter: filterStrings, + Sort: sortStrings, Facets: []string{ "location", "bandwidth", diff --git a/internal/data_sources/cloud_product_data_source.go b/internal/data_sources/cloud_product_data_source.go index 3c8f093..ec3c2ba 100644 --- a/internal/data_sources/cloud_product_data_source.go +++ b/internal/data_sources/cloud_product_data_source.go @@ -177,10 +177,12 @@ func (d *cloudProductDataSource) Read(ctx context.Context, req datasource.ReadRe if err != nil { resp.Diagnostics.AddError("error getting filters", err.Error()) } + sortStrings := getSortString(data.Sort) // Define the search request searchRequest := &meilisearch.SearchRequest{ Filter: filtersStrings, + Sort: sortStrings, Facets: []string{ "cspName", "cspRegion", diff --git a/internal/data_sources/transport_product_data_source.go b/internal/data_sources/transport_product_data_source.go index 882a77e..05fbaab 100644 --- a/internal/data_sources/transport_product_data_source.go +++ b/internal/data_sources/transport_product_data_source.go @@ -178,9 +178,6 @@ func (d *transportProductDataSource) Read(ctx context.Context, req datasource.Re resp.Diagnostics.AddError("error getting filters", err.Error()) } sortStrings := getSortString(data.Sort) - if err != nil { - resp.Diagnostics.AddError("error getting sort", err.Error()) - } // Define the search request searchRequest := &meilisearch.SearchRequest{ From 68890303c6443db9af2edd7fddbce2e6ffaaa635 Mon Sep 17 00:00:00 2001 From: Pauline ESPALIEU Date: Tue, 27 Aug 2024 15:47:03 +0200 Subject: [PATCH 2/2] merge main --- internal/data_sources/access_product_data_source.go | 2 -- internal/data_sources/access_products_data_source.go | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/data_sources/access_product_data_source.go b/internal/data_sources/access_product_data_source.go index 70dff08..34cd209 100644 --- a/internal/data_sources/access_product_data_source.go +++ b/internal/data_sources/access_product_data_source.go @@ -142,12 +142,10 @@ func (d *accessProductDataSource) Read(ctx context.Context, req datasource.ReadR resp.Diagnostics.AddError("error getting filters", err.Error()) } filterStrings = append(filterStrings, filtersToAdd...) - sortStrings := getSortString(data.Sort) // Define the search request searchRequest := &meilisearch.SearchRequest{ Filter: filterStrings, - Sort: sortStrings, Facets: []string{ "location", "bandwidth", diff --git a/internal/data_sources/access_products_data_source.go b/internal/data_sources/access_products_data_source.go index 78b06ff..9745b8f 100644 --- a/internal/data_sources/access_products_data_source.go +++ b/internal/data_sources/access_products_data_source.go @@ -174,10 +174,12 @@ func (d *accessProductsDataSource) Read(ctx context.Context, req datasource.Read resp.Diagnostics.AddError("error getting filters", err.Error()) } filterStrings = append(filterStrings, filtersToAdd...) + sortStrings := getSortString(data.Sort) // Define the search request searchRequest := &meilisearch.SearchRequest{ Filter: filterStrings, + Sort: sortStrings, Facets: []string{ "location", "bandwidth",