@reekon-tools/boldr-utils 1.4.29 → 1.4.31

package/dist/types/firestore.d.ts

@@ -100,19 +100,57 @@ export interface SelectedTemplate extends FirestoreDoc {
 }
 export declare enum FileUploadType {
     Annotation = "annotation",
-    Template = "template"
+    Template = "template",
+    Background = "background",
+    LayoutGroup = "layoutGroup",
+    Calculator = "calculator"
+}
+export interface AnnotationFileData {
+    fileType: 'sketch' | 'document';
+    isLabel?: boolean;
+}
+export interface CalculatorFileData {
+    templateId: string;
+    templateName: string;
+    templatePath: string;
+    tableConfig: ColumnConfig[];
+    diagramFileId: string | null;
+    columns: Record<string, any>;
+    isCompleted: boolean;
 }
-export interface FileUpload {
+interface FileUploadBase {
     id: string;
     name: string;
     projectId: string;
     jobId: string;
     groupId: string;
-    type: FileUploadType;
     folderPath: string;
     thumbnailUrl: string | null;
-    fileType: string | null;
-}
+    createdBy?: {
+        userId: string;
+        firstName?: string;
+        lastName?: string;
+    };
+    createdAt?: Date;
+    layoutGroupId?: string | null;
+    layoutId?: string | null;
+}
+export type FileUpload = FileUploadBase & ({
+    type: FileUploadType.Annotation;
+    fileData: AnnotationFileData;
+} | {
+    type: FileUploadType.Calculator;
+    fileData: CalculatorFileData;
+} | {
+    type: FileUploadType.LayoutGroup;
+    fileData?: undefined;
+} | {
+    type: FileUploadType.Background;
+    fileData?: undefined;
+} | {
+    type: FileUploadType.Template;
+    fileData?: undefined;
+});
 export declare enum FolderType {
     Project = "project",
     Job = "job",
@@ -131,16 +169,15 @@ export interface Folder extends FirestoreDoc, Timestamps {
     type: FolderType;
     isPublic?: boolean;
 }
-export declare enum JobType {
-    DEFAULT = "default",
-    CUTLIST = "cutlist"
+export declare enum GroupType {
+    LIST = "list",
+    FORM = "form"
 }
 export interface Job extends FirestoreDoc, Timestamps {
     name: string;
     folderId: string;
     progress: number;
     projectId: string;
-    totalTasks: number;
     lastAccessed: Date;
     toleranceConfig?: {
         thresholds: {
@@ -151,7 +188,6 @@ export interface Job extends FirestoreDoc, Timestamps {
         updatedAt: Date;
     };
     areaMapFileId?: string;
-    type?: JobType;
     address?: string;
     description?: string;
 }
@@ -162,6 +198,7 @@ export interface Section extends Timestamps {
     measurements: string[];
     projectId: string;
     jobId: string;
+    isTemplate?: boolean;
 }
 export interface Group extends FirestoreDoc, Timestamps {
     projectId: string;
@@ -170,6 +207,7 @@ export interface Group extends FirestoreDoc, Timestamps {
     name: string;
     sortIndex: number;
     columns: Record<string, any>;
+    type?: GroupType;
     groupIndex: number;
     descriptions?: Record<string, string>;
     tolerances?: {
@@ -182,14 +220,11 @@ export interface Group extends FirestoreDoc, Timestamps {
     };
     diagramFileId?: string;
     formula?: any;
-    isCompleted?: boolean;
-    type?: string;
     details?: {
         material: string;
         finish: string;
         finishDate: string;
     };
-    path?: string;
     groups?: Group[];
     sections?: Section[];
 }
@@ -210,21 +245,52 @@ export interface Formula extends FirestoreDoc, Timestamps {
     variables: string[];
     variableToColumnMap: Record<string, any>;
 }
-export interface ColumnConfig {
-    id: string;
-    name: string;
-    type: ColumnType;
-    formulaId?: string;
-    mappings?: Record<string, string>;
-    withTolerance?: boolean;
-    options?: string[];
-    conversions?: Conversion[];
-    size?: number;
-}
 export interface Conversion {
     label: string;
     value: string;
 }
+export interface FormulaColumnData {
+    formulaId: string;
+    mappings?: Record<string, string>;
+}
+export interface SelectColumnData {
+    options: string[];
+}
+export interface ConversionTableColumnData {
+    conversions: Conversion[];
+}
+interface ColumnConfigBase {
+    id: string;
+    name: string;
+}
+export type ColumnConfig = ColumnConfigBase & ({
+    type: ColumnType.Formula;
+    columnData: FormulaColumnData;
+} | {
+    type: ColumnType.SingleSelect;
+    columnData: SelectColumnData;
+} | {
+    type: ColumnType.MultiSelect;
+    columnData: SelectColumnData;
+} | {
+    type: ColumnType.ConversionTable;
+    columnData: ConversionTableColumnData;
+} | {
+    type: ColumnType.Text;
+    columnData?: undefined;
+} | {
+    type: ColumnType.Number;
+    columnData?: undefined;
+} | {
+    type: ColumnType.Measurement;
+    columnData?: undefined;
+} | {
+    type: ColumnType.Boolean;
+    columnData?: undefined;
+} | {
+    type: ColumnType.Angle;
+    columnData?: undefined;
+});
 export interface Row {
     [key: string]: any;
 }
@@ -343,4 +409,17 @@ export interface UserDocument extends FirestoreDoc, Timestamps {
     printLogoFileId: string;
     devices?: Record<string, string>;
 }
+export interface UserComment extends FirestoreDoc, Timestamps {
+    comment: string;
+    createdByProfileUri: string;
+    files: string[];
+    groupId: string;
+    jobId: string;
+    projectId: string;
+    createdBy: {
+        userId: string;
+        firstName: string;
+        lastName: string;
+    };
+}
 export {};

package/dist/types/firestore.js

@@ -19,6 +19,9 @@ export var FileUploadType;
 (function (FileUploadType) {
     FileUploadType["Annotation"] = "annotation";
     FileUploadType["Template"] = "template";
+    FileUploadType["Background"] = "background";
+    FileUploadType["LayoutGroup"] = "layoutGroup";
+    FileUploadType["Calculator"] = "calculator";
 })(FileUploadType || (FileUploadType = {}));
 export var FolderType;
 (function (FolderType) {
@@ -26,11 +29,11 @@ export var FolderType;
     FolderType["Job"] = "job";
     FolderType["Template"] = "template";
 })(FolderType || (FolderType = {}));
-export var JobType;
-(function (JobType) {
-    JobType["DEFAULT"] = "default";
-    JobType["CUTLIST"] = "cutlist";
-})(JobType || (JobType = {}));
+export var GroupType;
+(function (GroupType) {
+    GroupType["LIST"] = "list";
+    GroupType["FORM"] = "form";
+})(GroupType || (GroupType = {}));
 export var ColumnType;
 (function (ColumnType) {
     ColumnType["Text"] = "text";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reekon-tools/boldr-utils",
-  "version": "1.4.29",
+  "version": "1.4.31",
   "description": "Shared utilities for formulas and measurement conversion used in Reekon apps",
   "author": "REEKON Tools",
   "license": "MIT",