From 4a2e6d31bb81c9fb537b6a604b70e7ef7ab8046c Mon Sep 17 00:00:00 2001
From: EdwardAJ <13517115@std.stei.itb.ac.id>
Date: Fri, 10 Apr 2020 23:49:01 +0700
Subject: [PATCH] Fix foldering when folder does not exist
---
frontend/components/dropdown/Dropdown.vue | 31 ++++++++++++++++++-----
frontend/components/label/Label.vue | 3 ++-
2 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/frontend/components/dropdown/Dropdown.vue b/frontend/components/dropdown/Dropdown.vue
index f3a7755..017e066 100644
--- a/frontend/components/dropdown/Dropdown.vue
+++ b/frontend/components/dropdown/Dropdown.vue
@@ -49,15 +49,34 @@ export default {
var urlGet = '/api/image/datasets'
const response = await this.$axios.get(urlGet).catch((error) => console.error(error))
if (response.data.status === "success") {
- response.data.data.forEach((dataset) => {
- var key = "value"
- var obj = {}
- obj[key] = dataset
- this.config.options.push(obj)
- })
+ if (response.data.data) {
+ response.data.data.forEach((dataset) => {
+ var key = "value"
+ var obj = {}
+ obj[key] = dataset
+ this.config.options.push(obj)
+ })
+ }
}
if (this.dropdownValue) {
this.config.placeholder = this.dropdownValue
+ } else {
+ if (!this.isFolderNotExist()) {
+ if (this.isUpload) {
+ this.config.placeholder = this.config.options[1].value
+ } else {
+ this.config.placeholder = this.config.options[0].value
+ }
+ this.dataset = this.config.placeholder
+ this.$emit("onDatasetChanged", this.dataset)
+ }
+ }
+ },
+ isFolderNotExist () {
+ if (this.isUpload) {
+ return this.config.options.length <= 1
+ } else {
+ return this.config.options.length <= 0
}
},
async setNewSelectedOption(selectedOption) {
diff --git a/frontend/components/label/Label.vue b/frontend/components/label/Label.vue
index 412d4c6..80354ab 100644
--- a/frontend/components/label/Label.vue
+++ b/frontend/components/label/Label.vue
@@ -98,7 +98,7 @@ export default {
images: {},
keyword: '',
isViewerActive: false,
- perPage: 3,
+ perPage: 12,
totalRows: 0,
page: 1,
timer: '',
@@ -243,6 +243,7 @@ export default {
.slot-margin {
margin-left: 1.5rem;
+ margin-top: -0.15rem;
}
.flex-display {
--
GitLab