fix(links): config panel layout

simwrapper · Oct 8, 2021 · 0d750f0 · 0d750f0
1 parent 3e0324a
commit 0d750f0
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/src/plugins/links-gl/ConfigPanel.vue b/src/plugins/links-gl/ConfigPanel.vue
@@ -2,8 +2,9 @@
 .config-panel
 
   //- time-of-day slider
-  .panel-item(v-if="useSlider")
-    p: b {{ $t('timeOfDay') }}
+  .panel-item.expand(v-if="useSlider")
+    p: b {{ $t('timeOfDay') }}:
+       | &nbsp; {{ header[activeColumn] }}
 
     button.button.full-width.is-warning.is-loading(v-if="activeColumn < 0"
           aria-haspopup="true" aria-controls="dropdown-menu-column-selector")
@@ -279,12 +280,16 @@ input {
   }
 }
 
+.expand {
+  flex: 1;
+}
+
 .vert-space {
   // margin-top: 4rem;
 }
 
 .time-slider {
-  width: 14rem;
+  width: 100%;
 }
 
 @media only screen and (max-width: 640px) {

diff --git a/src/plugins/links-gl/LinkVolumes.vue b/src/plugins/links-gl/LinkVolumes.vue
@@ -39,7 +39,7 @@ de:
       .panel-items
 
         //- button/dropdown for selecting column
-        .panel-item
+        .panel-item.config-section
           config-panel(
             :header="csvData.header"
             :activeColumn="csvData.activeColumn"
@@ -642,6 +642,9 @@ export default MyPlugin
 }
 
 .panel-items {
+  width: 100%;
+  display: flex;
+  flex-direction: row;
   margin: 0rem 0.5rem;
 }
 
@@ -662,8 +665,7 @@ input {
 }
 
 .toggle {
-  margin-bottom: 0.25rem;
-  margin-right: 0.5rem;
+  margin: 0.25rem 0.5rem 0.25rem 0;
 }
 
 #dropdown-menu-color-selector {
@@ -678,8 +680,12 @@ input {
   margin-top: 0rem;
 }
 
+.config-section {
+  flex: 1;
+}
+
 .diff-section {
-  margin-top: 1rem;
+  margin-top: 0.7rem;
 }
 
 @media only screen and (max-width: 640px) {

diff --git a/src/workers/DataFetcher.thread.ts b/src/workers/DataFetcher.thread.ts
@@ -37,8 +37,9 @@ expose({
     _dataset = _config.dataset
 
     // if dataset has a path in it, we need to fetch the correct subfolder contents
-    if (_config.dataset.startsWith('.') || _config.dataset.startsWith('/')) {
-      const mergedFolder = `${_subfolder}/${_config.dataset}`
+    const slash = _config.dataset.indexOf('/')
+    if (slash > -1) {
+      const mergedFolder = slash === 0 ? _config.dataset : `${_subfolder}/${_config.dataset}`
       _dataset = mergedFolder.substring(1 + mergedFolder.lastIndexOf('/'))
       _subfolder = mergedFolder.substring(0, mergedFolder.lastIndexOf('/'))