ISTWCMS-5128: removing catalog search in favour of one component for form view...

ISTWCMS-5128: removing catalog search in favour of one component for form view searches and fixing views view to include services view

source/_patterns/04-components/catalog-search/_catalog-search.scss → source/_patterns/04-components/form-view-search/_form-view-search.scss

-.uw-catalog-search {
+.uw-search-form {
   margin:0 0 gesso-spacing(sm) 0;
-  .catalog-search-form {
+  .catalog-search-form,
+  .service-search-form {
     display:grid;
     grid-template-columns: auto 3rem;
     padding:0;

source/_patterns/04-components/catalog-search/catalog-search.twig → source/_patterns/04-components/form-view-search/form-view-search.twig

-<div class="uw-catalog-search">
+<div class="uw-form-search">
   {% if pattern_lab %}
-    <div class="uw-catalog-search">
-      <form class="catalog-search-form" data-drupal-selector="catalog-search-all-form" action="/catalogs" method="post" id="catalog-search-form" accept-charset="UTF-8" data-drupal-form-fields="edit-search-input,edit-submit">
+    <div class="uw-form-search">
+      <form class="form-search-form" data-drupal-selector="form-search-all-form" action="/catalogs" method="post" id="form-search-form" accept-charset="UTF-8" data-drupal-form-fields="edit-search-input,edit-submit">
         <div class="js-form-item form-item js-form-type-textfield form-type-textfield js-form-item-search-input form-item-search-input form-no-label">
           <input data-drupal-selector="edit-search-input" type="text" id="edit-search-input" name="search_input" value="" size="60" maxlength="128" placeholder="Search within all catalogs" class="form-text required" required="required" aria-required="true">
 
         </div>
-        <input aria-label="search" class="catalog-search-submit button js-form-submit form-submit" data-drupal-selector="edit-submit" type="submit" id="edit-submit" name="op" value="">
+        <input aria-label="search" class="form-search-submit button js-form-submit form-submit" data-drupal-selector="edit-submit" type="submit" id="edit-submit" name="op" value="">
         <input autocomplete="off" data-drupal-selector="form-sxccibplaegc-73-lec694bsvanum6b-j-wflacshoi" type="hidden" name="form_build_id" value="form-sxCCiBplaegC_73_LEC694bSvAnuM6B-j-wFlACShOI">
-        <input data-drupal-selector="edit-catalog-search-all-form-form-token" type="hidden" name="form_token" value="ZwUmrQqVQLNwYel4ZKfXoIqHlDdO3R2L2wIyZNBPVPM">
-        <input data-drupal-selector="edit-catalog-search-all-form" type="hidden" name="form_id" value="catalog_search_all_form">
+        <input data-drupal-selector="edit-form-search-all-form-form-token" type="hidden" name="form_token" value="ZwUmrQqVQLNwYel4ZKfXoIqHlDdO3R2L2wIyZNBPVPM">
+        <input data-drupal-selector="edit-form-search-all-form" type="hidden" name="form_id" value="form_search_all_form">
       </form>
     </div>
 
   {% else %}
-    {{ catalog_search }}
+    <div class="uw-search-form">
+      {{ form_search }}
+    </div>
   {% endif %}
 </div>

source/_patterns/04-components/view/_view.scss

@@ -161,6 +161,7 @@ $sidebar-width: 18.75rem;
   &-uw-view-catalog-show-terms,
   &-uw-view-taxonomy-show-nodes,
   &-uw-view-taxonomy-show-terms,
+  &-uw-view-service,
   &-uw-view-service-show-nodes,
   &-uw-view-service-show-terms{
     display: inherit;