fix: many error

SocialGouv · Feb 8, 2024 · b12aaec · b12aaec
1 parent 313763a
commit b12aaec
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 25 deletions.
diff --git a/package.json b/package.json
@@ -18,7 +18,7 @@
     "test:e2e": "playwright test --workers=1",
     "compile": "cross-env 'NODE_OPTIONS=\"--max-old-space-size=4096\"' electron-webpack",
     "dist:win": "electron-builder --x64 --ia32 --win portable msi nsis",
-    "dist:mac": "electron-builder --mac dmg zip",
+    "dist:mac": "electron-builder --mac --x64 --arm64",
     "dist:mac-local": "CSC_IDENTITY_AUTO_DISCOVERY=false electron-builder --mac dmg",
     "dist:linux": "electron-builder --linux AppImage",
     "lint": "eslint src/",

diff --git a/src/renderer/exporters/audit/audit-report-values-computer.ts b/src/renderer/exporters/audit/audit-report-values-computer.ts
@@ -95,15 +95,18 @@ export const countFileTypes: Mapper<
   FileTypeMap<number>
 > = compose(
   defaults({
-    [FileType.PUBLICATION]: 0,
-    [FileType.PRESENTATION]: 0,
-    [FileType.SPREADSHEET]: 0,
-    [FileType.EMAIL]: 0,
+    [FileType.ARCHIVE]: 0,
+    [FileType.AUDIO]: 0,
+    [FileType.DATA]: 0,
     [FileType.DOCUMENT]: 0,
+    [FileType.EMAIL]: 0,
     [FileType.IMAGE]: 0,
-    [FileType.VIDEO]: 0,
-    [FileType.AUDIO]: 0,
     [FileType.OTHER]: 0,
+    [FileType.PRESENTATION]: 0,
+    [FileType.PUBLICATION]: 0,
+    [FileType.SPREADSHEET]: 0,
+    [FileType.VIDEO]: 0,
+    [FileType.WEB]: 0,
   }),
   countBy(identity),
   map(getFileType),
@@ -119,15 +122,18 @@ export const countFileSizes: Mapper<
   FileTypeMap<number>
 > = compose(
   defaults({
-    [FileType.PUBLICATION]: 0,
-    [FileType.PRESENTATION]: 0,
-    [FileType.SPREADSHEET]: 0,
-    [FileType.EMAIL]: 0,
+    [FileType.ARCHIVE]: 0,
+    [FileType.AUDIO]: 0,
+    [FileType.DATA]: 0,
     [FileType.DOCUMENT]: 0,
+    [FileType.EMAIL]: 0,
     [FileType.IMAGE]: 0,
-    [FileType.VIDEO]: 0,
-    [FileType.AUDIO]: 0,
     [FileType.OTHER]: 0,
+    [FileType.PRESENTATION]: 0,
+    [FileType.PUBLICATION]: 0,
+    [FileType.SPREADSHEET]: 0,
+    [FileType.VIDEO]: 0,
+    [FileType.WEB]: 0,
   }),
   mapValues(sumBy("size")),
   groupBy("type"),
@@ -162,15 +168,18 @@ export const percentFileTypes: Mapper<
  */
 export const getExtensionsList: Accessor<FileTypeMap<string>> = compose(
   defaults({
-    [FileType.PUBLICATION]: "",
-    [FileType.PRESENTATION]: "",
-    [FileType.SPREADSHEET]: "",
-    [FileType.EMAIL]: "",
+    [FileType.ARCHIVE]: "",
+    [FileType.AUDIO]: "",
+    [FileType.DATA]: "",
     [FileType.DOCUMENT]: "",
+    [FileType.EMAIL]: "",
     [FileType.IMAGE]: "",
-    [FileType.VIDEO]: "",
-    [FileType.AUDIO]: "",
     [FileType.OTHER]: "",
+    [FileType.PRESENTATION]: "",
+    [FileType.PUBLICATION]: "",
+    [FileType.SPREADSHEET]: "",
+    [FileType.VIDEO]: "",
+    [FileType.WEB]: "",
   }),
   mapValues(join(", ")),
   getExtensionsForEachFileType

diff --git a/src/renderer/logging/winston-console-logger.ts b/src/renderer/logging/winston-console-logger.ts
@@ -1,3 +1,4 @@
+import type { VoidFunction } from "@common/utils/function";
 import type { UnknownMapping } from "@common/utils/type";
 import { LEVEL, MESSAGE } from "triple-beam";
 import TransportStream from "winston-transport";

diff --git a/src/renderer/utils/color.ts b/src/renderer/utils/color.ts
@@ -12,7 +12,7 @@ import type {
 } from "../reducers/files-and-folders/files-and-folders-types";
 import type { FilesAndFoldersMetadataMap } from "../reducers/files-and-folders-metadata/files-and-folders-metadata-types";
 import { IcicleColorMode } from "../reducers/icicle-sort-method/icicle-sort-method-types";
-import { FileType, getFileTypeFromFileName } from "./file-types";
+import { FileType, FolderType, getFileTypeFromFileName } from "./file-types";
 
 type RgbaTuple = [
   red: number,
@@ -56,7 +56,7 @@ export const leastRecentDate = (): RgbaTuple => [20, 86, 130, 1];
 
 export const PLACEHOLDER_COLOR: RgbaHex = "#8a8c93";
 
-export const colors: Record<FileType, RgbaHex> = {
+export const colors: Record<FileType | FolderType, RgbaHex> = {
   [FileType.PUBLICATION]: "#b4250c",
   [FileType.PRESENTATION]: "#f75b40",
   [FileType.SPREADSHEET]: "#52d11a",
@@ -69,7 +69,7 @@ export const colors: Record<FileType, RgbaHex> = {
   [FileType.DATA]: "#ff9900",
   [FileType.WEB]: "#ff6600",
   [FileType.ARCHIVE]: "#7a7a7a",
-  [FileType.FOLDER]: "#fabf0b",
+  [FolderType.FOLDER]: "#fabf0b",
 };
 
 export const getFileOrFolderColor = (file: FilesAndFolders): RgbaHex =>
@@ -78,7 +78,7 @@ export const getFileOrFolderColor = (file: FilesAndFolders): RgbaHex =>
       ? getFileTypeFromFileName(file.name)
       : isArchiveFolder(file)
       ? FileType.ARCHIVE
-      : FileType.FOLDER
+      : FolderType.FOLDER
   ];
 /**
  * Hook that returns the fillColorByType method. It allows to get the color of a node using its id.

diff --git a/src/renderer/utils/file-types.ts b/src/renderer/utils/file-types.ts
@@ -10,7 +10,6 @@ export enum FileType {
   DATA = "data",
   DOCUMENT = "document",
   EMAIL = "email",
-  FOLDER = "folder",
   IMAGE = "image",
   OTHER = "other",
   PRESENTATION = "presentation",
@@ -19,8 +18,11 @@ export enum FileType {
   VIDEO = "video",
   WEB = "web",
 }
-/* eslint-enable @typescript-eslint/naming-convention */
+export enum FolderType {
+  FOLDER = "folder",
+}
 
+/* eslint-enable @typescript-eslint/naming-convention */
 export const fileTypesByExtensions: Record<string, FileType | undefined> = {
   ".arc": FileType.OTHER,
   ".avi": FileType.VIDEO,