Update dependencies and move duplicated TS types into separate file

#29

Dockerfile

 # build stage
 FROM node:16 as build-stage
 WORKDIR /app
+HEALTHCHECK --interval=35s --timeout=4s CMD curl -f http://localhost || exit 1
 # RUN apk add yarn
 COPY package.json ./
 COPY package-lock.json ./

package.json

@@ -11,15 +11,15 @@
     "generate-client": "openapi --input http://localhost:9999/api/openapi.json --output src/client --client axios"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.216.0",
-    "@aws-sdk/s3-request-presigner": "^3.216.0",
-    "@aws-sdk/lib-storage": "^3.216.0",
+    "@aws-sdk/client-s3": "^3.238.0",
+    "@aws-sdk/s3-request-presigner": "^3.238.0",
+    "@aws-sdk/lib-storage": "^3.238.0",
     "@popperjs/core": "^2.11.6",
     "bootstrap": "^5.2.3",
-    "bootstrap-icons": "^1.10.2",
-    "dayjs": "^1.11.6",
-    "filesize": "^10.0.5",
-    "pinia": "^2.0.26",
+    "bootstrap-icons": "^1.10.3",
+    "dayjs": "^1.11.7",
+    "filesize": "^10.0.6",
+    "pinia": "^2.0.28",
     "vue": "^3.2.45",
     "vue-router": "^4.1.6",
     "vue3-cookies": "^1.0.6"
@@ -34,16 +34,16 @@
     "@vue/eslint-config-prettier": "^7.0.0",
     "@vue/eslint-config-typescript": "^11.0.2",
     "@vue/tsconfig": "^0.1.3",
-    "axios": "^1.2.0",
+    "axios": "^1.2.1",
     "eslint": "^8.28.0",
     "eslint-plugin-vue": "^9.7.0",
     "npm-run-all": "^4.1.5",
     "openapi-typescript-codegen": "^0.23.0",
-    "prettier": "^2.8.0",
+    "prettier": "^2.8.1",
     "rollup-plugin-node-polyfills": "^0.2.1",
     "sass": "^1.56.1",
     "typescript": "~4.7.4",
-    "vite": "^3.2.4",
-    "vue-tsc": "^1.0.9"
+    "vite": "^3.2.5",
+    "vue-tsc": "^1.0.18"
   }
 }

src/components/BucketView.vue

@@ -6,6 +6,11 @@ import type {
   BucketPermissionOut,
   BucketOut,
 } from "@/client";
+import type {
+  FolderTree,
+  S3PseudoFolder,
+  S3ObjectWithFolder,
+} from "@/types/PseudoFolder";
 import { ObjectService } from "@/client";
 import BootstrapIcon from "@/components/BootstrapIcon.vue";
 import { filesize } from "filesize";
@@ -51,7 +56,6 @@ let client = new S3Client({
     accessKeyId: authStore.s3key?.access_key ?? "",
     secretAccessKey: authStore.s3key?.secret_key ?? "",
   },
-  tls: import.meta.env.VITE_S3_URL.startsWith("https"),
 });
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
@@ -71,7 +75,6 @@ authStore.$onAction(({ name, args }) => {
           accessKeyId: args[0].access_key,
           secretAccessKey: args[0].secret_key,
         },
-        tls: import.meta.env.VITE_S3_URL.startsWith("https"),
       });
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore
@@ -92,26 +95,6 @@ const props = defineProps<{
 const randomIDSuffix = Math.random().toString(16).substr(2, 8);
 let successToast: Toast | null = null;
 
-// Typescript types
-// -----------------------------------------------------------------------------
-interface S3ObjectWithFolder extends S3ObjectMetaInformation {
-  folder: string[];
-  pseudoFileName: string;
-}
-
-type S3PseudoFolder = {
-  size: number;
-  parentFolder: string[];
-  last_modified: string;
-  name: string;
-  key: string;
-};
-
-type FolderTree = {
-  subFolders: Record<string, FolderTree>;
-  files: S3ObjectWithFolder[];
-};
-
 // Reactive State
 // -----------------------------------------------------------------------------
 

src/components/Modals/PermissionListModal.vue

 <script setup lang="ts">
-import type {
-  BucketPermissionIn,
-  BucketPermissionOut,
-  S3ObjectMetaInformation,
-} from "@/client";
+import type { BucketPermissionIn, BucketPermissionOut } from "@/client";
+import type { FolderTree } from "@/types/PseudoFolder";
 import { reactive } from "vue";
 import { BucketPermissionsService } from "@/client";
 import { onBeforeMount, watch } from "vue";
 import BootstrapModal from "@/components/Modals/BootstrapModal.vue";
 import PermissionModal from "@/components/Modals/PermissionModal.vue";
-// Types
-// -----------------------------------------------------------------------------
-interface S3ObjectWithFolder extends S3ObjectMetaInformation {
-  folder: string[];
-  pseudoFileName: string;
-}
-
-type FolderTree = {
-  subFolders: Record<string, FolderTree>;
-  files: S3ObjectWithFolder[];
-};
 
 // Props
 // -----------------------------------------------------------------------------

src/components/Modals/PermissionModal.vue

@@ -8,27 +8,15 @@ import dayjs from "dayjs";
 import type {
   BucketPermissionOut,
   BucketPermissionIn,
-  S3ObjectMetaInformation,
   BucketPermissionParameters,
   User,
 } from "@/client";
+import type { FolderTree } from "@/types/PseudoFolder";
 import type { ComputedRef, Ref } from "vue";
 import { PermissionEnum, BucketPermissionsService } from "@/client";
 import { Toast } from "bootstrap";
 import BootstrapIcon from "@/components/BootstrapIcon.vue";
 
-// Types
-// -----------------------------------------------------------------------------
-interface S3ObjectWithFolder extends S3ObjectMetaInformation {
-  folder: string[];
-  pseudoFileName: string;
-}
-
-type FolderTree = {
-  subFolders: Record<string, FolderTree>;
-  files: S3ObjectWithFolder[];
-};
-
 // Props
 // -----------------------------------------------------------------------------
 const props = defineProps<{

src/types/PseudoFolder.ts

+import type { S3ObjectMetaInformation } from "@/client";
+
+export interface S3ObjectWithFolder extends S3ObjectMetaInformation {
+  folder: string[];
+  pseudoFileName: string;
+}
+
+export type S3PseudoFolder = {
+  size: number;
+  parentFolder: string[];
+  last_modified: string;
+  name: string;
+  key: string;
+};
+
+export type FolderTree = {
+  subFolders: Record<string, FolderTree>;
+  files: S3ObjectWithFolder[];
+};