From ff9e229262274926f3919113868ba975e6a7b0b4 Mon Sep 17 00:00:00 2001
From: Hironsan <light.tree.1.13@gmail.com>
Date: Wed, 3 Feb 2021 22:11:58 +0900
Subject: [PATCH 1/3] Add a single file rules

---
 frontend/components/organisms/labels/LabelImportForm.vue | 6 +++---
 frontend/rules/index.js                                  | 7 +++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/frontend/components/organisms/labels/LabelImportForm.vue b/frontend/components/organisms/labels/LabelImportForm.vue
index 41c655b3..8c79259c 100644
--- a/frontend/components/organisms/labels/LabelImportForm.vue
+++ b/frontend/components/organisms/labels/LabelImportForm.vue
@@ -32,7 +32,7 @@
         <h2>{{ $t('labels.importMessage2') }}</h2>
         <v-file-input
           v-model="file"
-          :rules="uploadFileRules($t('rules.uploadFileRules'))"
+          :rules="uploadSingleFileRules($t('rules.uploadFileRules'))"
           accept=".json"
           :label="$t('labels.filePlaceholder')"
         />
@@ -43,7 +43,7 @@
 
 <script>
 import BaseCard from '@/components/molecules/BaseCard'
-import { uploadFileRules } from '@/rules/index'
+import { uploadSingleFileRules } from '@/rules/index'
 
 export default {
   components: {
@@ -60,7 +60,7 @@ export default {
     return {
       valid: false,
       file: null,
-      uploadFileRules,
+      uploadSingleFileRules,
       showError: false
     }
   },
diff --git a/frontend/rules/index.js b/frontend/rules/index.js
index edaad7e8..07b69a09 100644
--- a/frontend/rules/index.js
+++ b/frontend/rules/index.js
@@ -61,6 +61,13 @@ export const uploadFileRules = (msg) => {
   ]
 }
 
+export const uploadSingleFileRules = (msg) => {
+  return [
+    v => !!v || msg.fileRequired,
+    v => !v || v.size < 1000000 || msg.fileLessThan1MB
+  ]
+}
+
 // Rules for user.
 export const passwordRules = (msg) => {
   return [

From 8d5ff35cf2c8c6a94b3aee0aa121c4f28bd104c9 Mon Sep 17 00:00:00 2001
From: Hironsan <light.tree.1.13@gmail.com>
Date: Sun, 7 Feb 2021 21:09:46 +0900
Subject: [PATCH 2/3] Update libpq-dev version to avoid build failure

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 0e7aa7c2..82489ab7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@ FROM python:${PYTHON_VERSION}-slim-buster AS backend-builder
 RUN apt-get update \
  && apt-get install -y --no-install-recommends \
     netcat=1.10-41.1 \
-    libpq-dev=11.9-0+deb10u1 \
+    libpq-dev=11.10-0+deb10u1 \
     unixodbc-dev=2.3.6-0.1 \
     g++=4:8.3.0-1 \
     libssl-dev=1.1.1d-0+deb10u4 \

From 84cfe7305771aa4f40238c462f6eec891eebe11b Mon Sep 17 00:00:00 2001
From: Hironsan <light.tree.1.13@gmail.com>
Date: Mon, 8 Feb 2021 06:56:25 +0900
Subject: [PATCH 3/3] Update libpq-dev version to avoid build failure

---
 app/Dockerfile.dev  | 2 +-
 app/Dockerfile.prod | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Dockerfile.dev b/app/Dockerfile.dev
index eea2f035..72cc4b7b 100644
--- a/app/Dockerfile.dev
+++ b/app/Dockerfile.dev
@@ -5,7 +5,7 @@ RUN apt-get update \
  && apt-get install -y --no-install-recommends \
     wget=1.20.1-1.1 \
     netcat=1.10-41.1 \
-    libpq-dev=11.9-0+deb10u1 \
+    libpq-dev=11.10-0+deb10u1 \
     unixodbc-dev=2.3.6-0.1 \
     g++=4:8.3.0-1 \
     libssl-dev=1.1.1d-0+deb10u4 \
diff --git a/app/Dockerfile.prod b/app/Dockerfile.prod
index a2814c04..aabf786e 100644
--- a/app/Dockerfile.prod
+++ b/app/Dockerfile.prod
@@ -15,7 +15,7 @@ COPY ./Pipfile* /app/
 RUN apt-get update \
  && apt-get install -y --no-install-recommends \
     netcat=1.10-41.1 \
-    libpq-dev=11.9-0+deb10u1 \
+    libpq-dev=11.10-0+deb10u1 \
     unixodbc-dev=2.3.6-0.1 \
     g++=4:8.3.0-1 \
  && pip install --no-cache-dir pipenv==2020.11.15 \