From 98bf8eefa9f1541e9986b08e1dd3835707d40ed9 Mon Sep 17 00:00:00 2001
From: Bruno <bruno@buddyweb.fr>
Date: Wed, 25 Sep 2024 12:51:50 +0200
Subject: [PATCH] feat(admin): file upload input and yield

---
 .vscode/settings.json                         |  2 +-
 package-lock.json                             |  2 ++
 .../yields/link-yield/link-yield.component.ts | 21 ++++++++++++++-----
 .../modules/shared/yields/yield.component.ts  |  3 ++-
 .../environments/environment.development.ts   |  2 +-
 packages/core/manifest/.gitignore             |  5 ++++-
 packages/core/manifest/manifest/backend.yml   |  1 +
 packages/core/manifest/src/main.ts            |  3 ++-
 .../src/upload/services/storage.service.ts    |  8 +++----
 9 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index de36bfda..195d2be9 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,6 +1,6 @@
 {
   "yaml.schemas": {
-    "./packages/core/manifest/src/manifest/json-schema/schema.json": "**/manifest/**/**backend.yml"
+    "./packages/core/json-schema/src/schema/schema.json": "**/manifest/**/**backend.yml"
   },
 
   "workbench.colorCustomizations": {
diff --git a/package-lock.json b/package-lock.json
index 4d926468..95b36136 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23956,6 +23956,7 @@
       }
     },
     "packages/core/json-schema": {
+      "name": "@repo/json-schema",
       "dependencies": {
         "fs": "^0.0.1-security",
         "json-schema-to-typescript": "^15.0.2",
@@ -23975,6 +23976,7 @@
         "@nestjs/typeorm": "^10.0.2",
         "@repo/admin": "*",
         "@repo/helpers": "*",
+        "@repo/json-schema": "*",
         "@repo/types": "*",
         "ajv": "^8.12.0",
         "chalk": "^4.1.2",
diff --git a/packages/core/admin/src/app/modules/shared/yields/link-yield/link-yield.component.ts b/packages/core/admin/src/app/modules/shared/yields/link-yield/link-yield.component.ts
index 5c5c7f12..7bdb423a 100644
--- a/packages/core/admin/src/app/modules/shared/yields/link-yield/link-yield.component.ts
+++ b/packages/core/admin/src/app/modules/shared/yields/link-yield/link-yield.component.ts
@@ -1,19 +1,27 @@
-import { NgIf } from '@angular/common'
+import { NgClass, NgIf } from '@angular/common'
 import { Component, Input } from '@angular/core'
 import { TruncatePipe } from '../../pipes/truncate.pipe'
+import { environment } from '../../../../../environments/environment'
 
 @Component({
   selector: 'app-link-yield',
   standalone: true,
-  imports: [NgIf, TruncatePipe],
+  imports: [NgIf, NgClass, TruncatePipe],
   template: ` <a
-      [href]="value"
+      [href]="external ? value : storageBaseUrl + '/' + value"
+      [download]="!external"
       target="_blank"
       class="is-inline-flex is-align-items-center"
       *ngIf="value"
     >
-      <i class="icon icon-external-link mr-1"></i>
-      <span *ngIf="compact">{{ value | truncate : 44 }}</span>
+      <i
+        class="icon icon-external-link mr-1"
+        [ngClass]="{
+          'icon-external-link': external,
+          'icon-download': !external
+        }"
+      ></i>
+      <span *ngIf="compact">{{ value | truncate: 44 }}</span>
       <span *ngIf="!compact">{{ value }}</span>
     </a>
     <span class="is-nowrap" *ngIf="!value"> - </span>`,
@@ -22,4 +30,7 @@ import { TruncatePipe } from '../../pipes/truncate.pipe'
 export class LinkYieldComponent {
   @Input() value: string
   @Input() compact: boolean = true
+  @Input() external: boolean = true
+
+  storageBaseUrl = environment.storageBaseUrl
 }
diff --git a/packages/core/admin/src/app/modules/shared/yields/yield.component.ts b/packages/core/admin/src/app/modules/shared/yields/yield.component.ts
index 14d86904..e1cc948e 100644
--- a/packages/core/admin/src/app/modules/shared/yields/yield.component.ts
+++ b/packages/core/admin/src/app/modules/shared/yields/yield.component.ts
@@ -43,8 +43,9 @@ import { TimestampYieldComponent } from './timestamp-yield/timestamp-yield.compo
       [value]="value"
     ></app-number-yield>
     <app-link-yield
-      *ngIf="prop.type === PropType.Link"
+      *ngIf="prop.type === PropType.Link || prop.type === PropType.File"
       [value]="value"
+      [external]="prop.type === PropType.Link"
       [compact]="compact"
     ></app-link-yield>
     <app-boolean-yield
diff --git a/packages/core/admin/src/environments/environment.development.ts b/packages/core/admin/src/environments/environment.development.ts
index f68a3471..95b1010c 100644
--- a/packages/core/admin/src/environments/environment.development.ts
+++ b/packages/core/admin/src/environments/environment.development.ts
@@ -1,5 +1,5 @@
 export const environment = {
   production: false,
   apiBaseUrl: 'http://localhost:1111/api',
-  storageBaseUrl: '/storage'
+  storageBaseUrl: 'http://localhost:1111/storage'
 }
diff --git a/packages/core/manifest/.gitignore b/packages/core/manifest/.gitignore
index 6bce3715..1a339b1d 100644
--- a/packages/core/manifest/.gitignore
+++ b/packages/core/manifest/.gitignore
@@ -36,4 +36,7 @@ lerna-debug.log*
 !.vscode/settings.json
 !.vscode/tasks.json
 !.vscode/launch.json
-!.vscode/extensions.json
\ No newline at end of file
+!.vscode/extensions.json
+
+# Storage
+/public
\ No newline at end of file
diff --git a/packages/core/manifest/manifest/backend.yml b/packages/core/manifest/manifest/backend.yml
index 38809d70..2f9e786a 100644
--- a/packages/core/manifest/manifest/backend.yml
+++ b/packages/core/manifest/manifest/backend.yml
@@ -8,6 +8,7 @@ entities:
       - { name: birthdate, type: date }
       - { name: aquiredAt, type: timestamp }
       - { name: hiddenProp, type: boolean, hidden: true }
+      - { name: certificate, type: file }
     belongsTo:
       - { name: owner, entity: User }
     policies:
diff --git a/packages/core/manifest/src/main.ts b/packages/core/manifest/src/main.ts
index 64fbed0a..27b396a4 100644
--- a/packages/core/manifest/src/main.ts
+++ b/packages/core/manifest/src/main.ts
@@ -38,9 +38,10 @@ async function bootstrap() {
   }
 
   const adminPanelFolder: string = configService.get('paths').adminPanelFolder
-
   app.use(express.static(adminPanelFolder))
 
+  app.use('/storage', express.static('public/storage'))
+
   // Redirect all requests to the client app index.
   app.use((req, res, next) => {
     if (req.url.startsWith('/api') || req.url.startsWith('/storage')) {
diff --git a/packages/core/manifest/src/upload/services/storage.service.ts b/packages/core/manifest/src/upload/services/storage.service.ts
index ce50d0d2..5e0148b8 100644
--- a/packages/core/manifest/src/upload/services/storage.service.ts
+++ b/packages/core/manifest/src/upload/services/storage.service.ts
@@ -4,7 +4,7 @@ import { STORAGE_PATH } from '../../constants'
 
 import * as fs from 'fs'
 import * as mkdirp from 'mkdirp'
-import * as uniqid from 'uniqid'
+import uniqid from 'uniqid'
 
 @Injectable()
 export class StorageService {
@@ -41,7 +41,7 @@ export class StorageService {
 
     const filePath: string = `${folder}/${uniqid()}-${file.originalname}`
 
-    fs.writeFileSync(filePath, file.buffer)
+    fs.writeFileSync(`${STORAGE_PATH}/${filePath}`, file.buffer)
 
     return filePath
   }
@@ -61,9 +61,9 @@ export class StorageService {
       new Date().toLocaleString('en-us', { month: 'short' }) +
       new Date().getFullYear()
 
-    const folder: string = `${STORAGE_PATH}/${kebabize(entity)}/${kebabize(property)}/${dateString}`
+    const folder: string = `${kebabize(entity)}/${kebabize(property)}/${dateString}`
 
-    mkdirp.sync(folder)
+    mkdirp.sync(`${STORAGE_PATH}/${folder}`)
 
     return folder
   }