diff --git a/.pnpmfile.cjs b/.pnpmfile.cjs
index f83d4d26..7030f830 100644
--- a/.pnpmfile.cjs
+++ b/.pnpmfile.cjs
@@ -1,5 +1,5 @@
const path = require("path");
-const merge = require("deepmerge");
+// const merge = require("deepmerge");
const additionalDeps = {
'@openstapps/eslint-config': require('./configuration/eslint-config/package.json'),
diff --git a/backend/backend/CHANGELOG.md b/backend/backend/CHANGELOG.md
index c5a49585..5e4103a7 100644
--- a/backend/backend/CHANGELOG.md
+++ b/backend/backend/CHANGELOG.md
@@ -1,18 +1,14 @@
# [1.0.0](https://gitlab.com/openstapps/backend/compare/v0.6.0...v1.0.0) (2023-05-08)
-
### Bug Fixes
-* openapi docs generation ([4ebe44a](https://gitlab.com/openstapps/backend/commit/4ebe44a5a7a1b7bfd0aa5b84d47d4056d3068ffe))
-* rename deprecated Gitlab CI variables ([3471591](https://gitlab.com/openstapps/backend/commit/3471591a7d458df70447c8dac91f96f3c83e763c))
-* semster boosting ([515a6ee](https://gitlab.com/openstapps/backend/commit/515a6eeea56305a37510d99b9f84a6b118b66f8a))
-
+- openapi docs generation ([4ebe44a](https://gitlab.com/openstapps/backend/commit/4ebe44a5a7a1b7bfd0aa5b84d47d4056d3068ffe))
+- rename deprecated Gitlab CI variables ([3471591](https://gitlab.com/openstapps/backend/commit/3471591a7d458df70447c8dac91f96f3c83e763c))
+- semster boosting ([515a6ee](https://gitlab.com/openstapps/backend/commit/515a6eeea56305a37510d99b9f84a6b118b66f8a))
### Features
-* update to of elasticsearch 8.4 ([c9b83b5](https://gitlab.com/openstapps/backend/commit/c9b83b5d71610f82bd1d99e837e29ad445758aea))
-
-
+- update to of elasticsearch 8.4 ([c9b83b5](https://gitlab.com/openstapps/backend/commit/c9b83b5d71610f82bd1d99e837e29ad445758aea))
# [0.6.0](https://gitlab.com/openstapps/backend/compare/v0.5.0...v0.6.0) (2023-01-30)
diff --git a/backend/backend/README.md b/backend/backend/README.md
index 515dbd5f..055bfc06 100644
--- a/backend/backend/README.md
+++ b/backend/backend/README.md
@@ -22,9 +22,10 @@ you with everything you need to run this backend.
# Local usage for development purposes
## Requirements
+
- Elasticsearch (8.4)
- * [ICU analysis plugin](https://www.elastic.co/guide/en/elasticsearch/plugins/current/analysis-icu.html)
- * OR Docker
+ - [ICU analysis plugin](https://www.elastic.co/guide/en/elasticsearch/plugins/current/analysis-icu.html)
+ - OR Docker
- Node.js (~14) / NPM
### Startup Behaviour
diff --git a/backend/backend/src/storage/elasticsearch/query.ts b/backend/backend/src/storage/elasticsearch/query.ts
deleted file mode 100644
index e69de29b..00000000
diff --git a/backend/backend/src/storage/elasticsearch/query/query.ts b/backend/backend/src/storage/elasticsearch/query/query.ts
index 3f158b89..74e8c982 100644
--- a/backend/backend/src/storage/elasticsearch/query/query.ts
+++ b/backend/backend/src/storage/elasticsearch/query/query.ts
@@ -14,9 +14,9 @@
*/
import {QueryDslQueryContainer} from '@elastic/elasticsearch/lib/api/types';
import {SCConfigFile, SCSearchQuery} from '@openstapps/core';
-import {ElasticsearchConfig} from '../types/elasticsearch-config';
-import {buildFilter} from './filter';
-import {buildScoringFunctions} from './boost/scoring-functions';
+import {ElasticsearchConfig} from '../types/elasticsearch-config.js';
+import {buildFilter} from './filter.js';
+import {buildScoringFunctions} from './boost/scoring-functions.js';
/**
* Builds body for Elasticsearch requests
diff --git a/backend/backend/src/storage/elasticsearch/query/sort.ts b/backend/backend/src/storage/elasticsearch/query/sort.ts
index 20733504..ed77635c 100644
--- a/backend/backend/src/storage/elasticsearch/query/sort.ts
+++ b/backend/backend/src/storage/elasticsearch/query/sort.ts
@@ -14,10 +14,10 @@
*/
import {Sort} from '@elastic/elasticsearch/lib/api/types';
import {SCSearchSort} from '@openstapps/core';
-import {buildDistanceSort} from './sort/distance';
-import {buildDucetSort} from './sort/ducet';
-import {buildGenericSort} from './sort/generic';
-import {buildPriceSort} from './sort/price';
+import {buildDistanceSort} from './sort/distance.js';
+import {buildDucetSort} from './sort/ducet.js';
+import {buildGenericSort} from './sort/generic.js';
+import {buildPriceSort} from './sort/price.js';
/**
* converts query to
@@ -28,14 +28,18 @@ import {buildPriceSort} from './sort/price';
export function buildSort(sorts: SCSearchSort[]): Sort {
return sorts.map(sort => {
switch (sort.type) {
- case 'generic':
+ case 'generic': {
return buildGenericSort(sort);
- case 'ducet':
+ }
+ case 'ducet': {
return buildDucetSort(sort);
- case 'distance':
+ }
+ case 'distance': {
return buildDistanceSort(sort);
- case 'price':
+ }
+ case 'price': {
return buildPriceSort(sort);
+ }
}
});
}
diff --git a/frontend/app/src/app/modules/dashboard/sections/search-section/search-section.component.html b/frontend/app/src/app/modules/dashboard/sections/search-section/search-section.component.html
index 27eceb5c..0acd2507 100644
--- a/frontend/app/src/app/modules/dashboard/sections/search-section/search-section.component.html
+++ b/frontend/app/src/app/modules/dashboard/sections/search-section/search-section.component.html
@@ -13,17 +13,6 @@
~ this program. If not, see
-
-
- {{ 'description' | thingTranslate: item }} -
+{{ 'description' | thingTranslate: item }}
{{ 'name' | thingTranslate: item.academicTerms[0] }}
@@ -34,12 +32,8 @@- {{ 'description' | thingTranslate: item }} -
-- {{ 'name' | thingTranslate: item.academicTerms[0] }} -
+{{ 'description' | thingTranslate: item }}
+{{ 'name' | thingTranslate: item.academicTerms[0] }}
- {{ 'description' | thingTranslate: item }} -
+{{ 'description' | thingTranslate: item }}