Skip to content

Commit c7aff64

Browse files
be-smithml-evs
authored andcommitted
Used folder select component for selecting folders
1 parent 48fed54 commit c7aff64

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

webapp/src/components/datablocks/XRDInsituBlock.vue

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,20 @@
99
@change="onFileChange"
1010
/>
1111
<div v-show="file_id">
12-
<div class="form-inline">
13-
<div class="form-group mb-2">
12+
<div class="row">
13+
<div class="col-lg-4 col-md-6 col-sm-12 mb-2">
1414
<label class="mr-2"><b>XRD folder name</b></label>
15-
<v-select
15+
<FolderSelect
1616
v-model="xrd_folder_name"
1717
:options="availableFolders"
18-
:reduce="(folder) => folder"
19-
class="folder-select mr-2"
20-
placeholder="Select a folder"
2118
@update:model-value="onFolderSelected"
2219
/>
20+
</div>
21+
<div class="col-lg-4 col-md-6 col-sm-12 mb-2">
2322
<label class="mr-2"><b>Temperature or Echem folder name</b></label>
24-
<v-select
23+
<FolderSelect
2524
v-model="time_series_folder_name"
2625
:options="availableFolders"
27-
:reduce="(folder) => folder"
28-
class="folder-select"
29-
placeholder="Select a folder"
3026
@update:model-value="onFolderSelected"
3127
/>
3228
</div>
@@ -69,6 +65,7 @@
6965
<script>
7066
import DataBlockBase from "@/components/datablocks/DataBlockBase";
7167
import FileSelectDropdown from "@/components/FileSelectDropdown";
68+
import FolderSelect from "@/components/FolderSelect";
7269
import BokehPlot from "@/components/BokehPlot";
7370
import vSelect from "vue-select";
7471
@@ -79,6 +76,7 @@ export default {
7976
components: {
8077
DataBlockBase,
8178
FileSelectDropdown,
79+
FolderSelect,
8280
BokehPlot,
8381
vSelect,
8482
},

0 commit comments

Comments
 (0)