Merge pull request #900 from City-of-Helsinki/UHF-9327

UHF-9327: Unified number of search results for the filter searches

hdbt.libraries.yml

@@ -141,7 +141,7 @@ nav-global:
     - hdbt/nav-toggle
 
 event-list:
-  version: 1.1
+  version: 1.2
   js:
     dist/js/linkedevents.min.js: {
       preprocess: false
@@ -152,7 +152,7 @@ event-list:
     - core/drupal
 
 school-search:
-  version: 1.3
+  version: 1.4
   js:
     dist/js/school-search.min.js: {
       preprocess: false
@@ -183,7 +183,7 @@ job-search:
     - core/drupal
 
 district-and-project-search:
-  version: 1.1
+  version: 1.2
   js:
     dist/js/district-and-project-search.min.js: {
       preprocess: false
@@ -216,7 +216,7 @@ table-figcaption:
     - core/once
 
 health-station-search:
-  version: 1.1
+  version: 1.2
   js:
     dist/js/health-station-search.min.js: {
       preprocess: false
@@ -226,7 +226,7 @@ health-station-search:
     - core/drupal
 
 maternity-and-child-health-clinic-search:
-  version: 1.0
+  version: 1.1
   js:
     dist/js/maternity-and-child-health-clinic-search.min.js: {
       preprocess: false

src/js/react/apps/district-and-project-search/enum/Global.ts

@@ -1,5 +1,5 @@
 const Global = {
-  size: 10,
+  size: 15,
 };
 
 export default Global;

src/js/react/apps/health-station-search/enum/AppSettings.ts

@@ -1,7 +1,7 @@
 const AppSettings = {
   index: 'health_stations',
   locationsBaseUrl: 'https://api.hel.fi/servicemap/v2/administrative_division/?municipality=helsinki&type=health_station_district&unit_include=id',
-  size: 10
+  size: 15
 };
 
 export default AppSettings;

src/js/react/apps/linkedevents/components/ResultCard.tsx

@@ -76,7 +76,9 @@ function ResultCard({ end_time, id, location, name, keywords=[], start_time, ima
     return urlPattern.test(urlToCheck);
   }
 
-  const getOffers = (): boolean => offers?.some(({ info_url }) => isValidUrl(info_url[currentLanguage])) ?? false;
+  const getOffers = (): boolean => offers?.some(({ info_url }) =>
+    info_url != null && info_url[currentLanguage] != null && isValidUrl(info_url[currentLanguage])
+  ) ?? false;
 
   const imageToElement = (image: EventImage): JSX.Element => {
     const imageProps: React.ImgHTMLAttributes<HTMLImageElement> & { 'data-photographer'?:string } = {};

src/js/react/apps/linkedevents/components/SubmitButton.tsx

@@ -6,7 +6,7 @@ type SubmitButtonProps =  {
 
 function SubmitButton({ disabled }: SubmitButtonProps) {
   return (
-    <Button type="submit" disabled={disabled} className='hdbt-search__submit-button event-list__submit-button'>{Drupal.t('Search', {}, { context: 'React search' })}</Button>
+    <Button type="submit" disabled={disabled} className='hdbt-search--react__submit-button event-list__submit-button'>{Drupal.t('Search', {}, { context: 'React search' })}</Button>
   );
 }
 

src/js/react/apps/maternity-and-child-health-clinic-search/enum/AppSettings.ts

@@ -1,7 +1,7 @@
 const AppSettings = {
   index: 'maternity_and_child_health_clinic',
   locationsBaseUrl: 'https://api.hel.fi/servicemap/v2/administrative_division/?municipality=helsinki&type=maternity_clinic_district&unit_include=id',
-  size: 10
+  size: 15
 };
 
 export default AppSettings;

src/js/react/apps/school-search/containers/ProximityFormContainer.tsx

@@ -42,7 +42,7 @@ const ProximityFormContainer = () => {
         label={Drupal.t('The child\'s home address', {}, { context: 'School search: input label'})}
         type='search'
       />
-      <Button className='hdbt-search__submit-button' type='submit'>{Drupal.t('Search')}</Button>
+      <Button className='hdbt-search--react__submit-button' type='submit'>{Drupal.t('Search')}</Button>
     </form>
   );
 };

src/js/react/apps/school-search/enum/AppSettings.ts

@@ -1,7 +1,7 @@
 const AppSettings = {
   index: 'schools',
   locationsBaseUrl: 'https://api.hel.fi/servicemap/v2/administrative_division/?municipality=helsinki&unit_include=id&type=lower_comprehensive_school_district_fi,lower_comprehensive_school_district_sv,upper_comprehensive_school_district_fi,upper_comprehensive_school_district_sv',
-  size: 10
+  size: 15
 };
 
 export default AppSettings;

src/scss/06_components/forms/_react-forms.scss

@@ -58,7 +58,8 @@
 }
 
 .hdbt-search--react__submit-button {
-  margin-block: $spacing-double;
+  margin-bottom: $spacing-double;
+  margin-top: $spacing;
   max-width: 280px;
   width: 100%;
 }
@@ -78,25 +79,7 @@
   --color-focus: var(--hdbt-color-black);
   --color-hover-focus: var(--hdbt-color-black);
   --focus-outline-color: var(--hdbt-color-black);
-  margin-block: $spacing-double;
-}
-
-// Need specific selector here to override HDS styles
-.hdbt-search__submit-button:not(:disabled) {
-  --background-color: var(--hdbt-color-black);
-  --background-color-hover: var(--hdbt-text-color);
-  --background-color-focus: var(--hdbt-text-color);
-  --background-color-hover-focus: var(--hdbt-text-color);
-  --border-color: var(--hdbt-color-black);
-  --border-color-hover: var(--hdbt-color-black);
-  --border-color-focus: var(--hdbt-color-black);
-  --border-color-hover-focus: var(--hdbt-color-black);
-  --color: var(--hdbt-text-color);
-  --color-hover: var(--hdbt-color-black);
-  --color-focus: var(--hdbt-color-black);
-  --color-hover-focus: var(--hdbt-color-black);
-  --focus-outline-color: var(--hdbt-color-black);
-  margin-bottom: $spacing-triple;
+  margin-bottom: $spacing-double;
   margin-top: $spacing;
 }
 

src/scss/06_components/paragraphs/_react-search.scss

@@ -130,7 +130,6 @@ fieldset .hdbt-search--react__checkbox:not(:first-of-type) {
 
 .hdbt-search--ploughing-schedule__submit-button:not(:disabled) {
   margin-bottom: 0;
-  margin-top: $spacing;
 }
 
 .hdbt-search--ploughing-schedule__result-card {