Merge branch 'feature/move-blue-bar' into 'devel'

Move blue bar directly above data table Closes #1169 See merge request sds-dev/sd-connect/swift-browser-ui!209
CSCfi · Nov 7, 2023 · 0f13f6b · 0f13f6b
2 parents 3c5a2bb + 30921c8
commit 0f13f6b
Showing 1 changed file with 29 additions and 29 deletions.
diff --git a/swift_browser_ui_frontend/src/components/ObjectTable.vue b/swift_browser_ui_frontend/src/components/ObjectTable.vue
@@ -32,6 +32,35 @@
         </li>
       </ul>
     </div>
+
+    <c-row
+      id="optionsbar"
+      justify="space-between"
+    >
+      <c-text-field
+        id="search"
+        v-model="searchQuery"
+        v-csc-control
+        name="search"
+        :placeholder="$t('message.objects.filterBy')"
+        type="search"
+      >
+        <i
+          slot="pre"
+          class="mdi mdi-filter-variant mdi-24px"
+        />
+      </c-text-field>
+      <c-menu
+        :key="optionsKey"
+        :items.prop="tableOptions"
+        options-testid="table-options-selector"
+      >
+        <span class="menu-active display-options-menu">
+          <i class="mdi mdi-tune" />
+          {{ $t("message.tableOptions.displayOptions") }}
+        </span>
+      </c-menu>
+    </c-row>
     <div
       v-if="checkedRows.length"
       class="selection-bar"
@@ -64,35 +93,6 @@
         </c-button>
       </div>
     </div>
-
-    <c-row
-      id="optionsbar"
-      justify="space-between"
-    >
-      <c-text-field
-        id="search"
-        v-model="searchQuery"
-        v-csc-control
-        name="search"
-        :placeholder="$t('message.objects.filterBy')"
-        type="search"
-      >
-        <i
-          slot="pre"
-          class="mdi mdi-filter-variant mdi-24px"
-        />
-      </c-text-field>
-      <c-menu
-        :key="optionsKey"
-        :items.prop="tableOptions"
-        options-testid="table-options-selector"
-      >
-        <span class="menu-active display-options-menu">
-          <i class="mdi mdi-tune" />
-          {{ $t("message.tableOptions.displayOptions") }}
-        </span>
-      </c-menu>
-    </c-row>
     <div id="obj-table-wrapper">
       <CObjectTable
         :breadcrumb-clicked-prop="breadcrumbClicked"