move service unit filter next to basic search in leases view

City-of-Helsinki · May 3, 2024 · fa4f9de · fa4f9de
1 parent a72e31c
commit fa4f9de
Showing 1 changed file with 21 additions and 22 deletions.
diff --git a/src/leases/components/search/Search.js b/src/leases/components/search/Search.js
@@ -236,6 +236,27 @@ class Search extends PureComponent<Props, State> {
             />
           </Column>
         </Row>
+        <SearchRow>
+          <SearchLabelColumn>
+            <SearchLabel>Palvelukokonaisuus</SearchLabel>
+          </SearchLabelColumn>
+          <SearchInputColumn>
+            <FormField
+              autoBlur
+              disableDirty
+              fieldAttributes={{
+                label: 'Palvelukokonaisuus',
+                type: FieldTypes.CHOICE,
+                read_only: false,
+              }}
+              invisibleLabel
+              name='service_unit'
+              overrideValues={{
+                options: serviceUnitOptions,
+              }}
+            />
+          </SearchInputColumn>
+        </SearchRow>
         {!isBasicSearch &&
           <Fragment>
             <Row>
@@ -737,28 +758,6 @@ class Search extends PureComponent<Props, State> {
                     />
                   </SearchInputColumn>
                 </SearchRow>
-
-                <SearchRow>
-                  <SearchLabelColumn>
-                    <SearchLabel>Palvelukokonaisuus</SearchLabel>
-                  </SearchLabelColumn>
-                  <SearchInputColumn>
-                    <FormField
-                      autoBlur
-                      disableDirty
-                      fieldAttributes={{
-                        label: 'Palvelukokonaisuus',
-                        type: FieldTypes.CHOICE,
-                        read_only: false,
-                      }}
-                      invisibleLabel
-                      name='service_unit'
-                      overrideValues={{
-                        options: serviceUnitOptions,
-                      }}
-                    />
-                  </SearchInputColumn>
-                </SearchRow>
               </Column>
             </Row>
           </Fragment>