@reekon-tools/boldr-utils 1.4.5 → 1.4.7

package/dist/formulas/calculateFormula.js

@@ -18,7 +18,7 @@ export const calculateFormula = (formula, formulas, columns, measurements, unit)
     // Build valueMap from group.columns and measurementMap
     const valueMap = {};
     // Map column IDs to their actual measurement values
-    for (const [columnId, measurementId] of columns.entries()) {
+    for (const [columnId, measurementId] of Object.entries(columns)) {
         const measurement = measurements.find((m) => m.id === measurementId);
         if (measurement?.value !== undefined) {
             valueMap[columnId] = measurement.value;

package/dist/types/firestore.d.ts

@@ -62,6 +62,12 @@ export interface Project extends FirestoreDoc, Timestamps {
     city: string;
     zipCode: string;
     state: string;
+    collectionId: string | null;
+    index: number | null;
+}
+export declare enum TemplateType {
+    Layout = "layout",
+    Annotation = "annotation"
 }
 export interface Template {
     id: string;
@@ -69,6 +75,7 @@ export interface Template {
     description: string;
     diagramFileId: string | null;
     diagramUrl: string;
+    type?: TemplateType;
     tableConfig: ColumnConfig[];
     tolerances?: {
         [key: string]: {
@@ -78,12 +85,43 @@ export interface Template {
             deviation: number;
         };
     };
+    isPublic: boolean;
+    orgId: string;
+    orgName: string;
+    parentFolderId?: string | null;
+}
+export interface SelectedTemplate {
+    count: number;
+    isPublic: boolean;
+    name: string;
+    groupType?: string;
+}
+export declare enum FileUploadType {
+    Annotation = "annotation",
+    Template = "template"
+}
+export interface FileUpload {
+    id: string;
+    name: string;
+    projectId: string;
+    jobId: string;
+    groupId: string;
+    type: FileUploadType;
+    folderPath: string;
+    thumbnailUrl: string | null;
+    fileType: string | null;
 }
 export declare enum FolderType {
     Project = "project",
-    Job = "job"
+    Job = "job",
+    Template = "template"
 }
-export interface Folder extends FirestoreDoc {
+export interface ProjectFolder extends FirestoreDoc, Timestamps {
+    name: string;
+    parentFolderId: string | null;
+    projectId: string;
+}
+export interface Folder extends FirestoreDoc, Timestamps {
     name: string;
     index: number;
     parentFolderId?: string | null;
@@ -99,7 +137,8 @@ export interface Job extends FirestoreDoc, Timestamps {
     folderId: string;
     progress: number;
     projectId: string;
-    totalTasks: string;
+    totalTasks: number;
+    lastAccessed: Date;
     toleranceConfig?: {
         thresholds: {
             id: string;
@@ -111,7 +150,7 @@ export interface Job extends FirestoreDoc, Timestamps {
     areaMapFileId?: string;
     type?: JobType;
 }
-export interface Section {
+export interface Section extends Timestamps {
     id: string;
     name: string;
     tableConfig: ColumnConfig[];
@@ -140,6 +179,11 @@ export interface Group extends FirestoreDoc, Timestamps {
     formula?: any;
     isCompleted?: boolean;
     type?: string;
+    details?: {
+        material: string;
+        finish: string;
+        finishDate: string;
+    };
 }
 export declare enum ColumnType {
     Text = "text",
@@ -155,7 +199,7 @@ export declare enum ColumnType {
 export interface Formula extends FirestoreDoc, Timestamps {
     expression: string;
     name: string;
-    varaibles: string[];
+    variables: string[];
     variableToColumnMap: Record<string, any>;
 }
 export interface ColumnConfig {
@@ -208,6 +252,7 @@ export declare enum Units {
     FeetInchesFractional = "ft_in_frac"
 }
 export declare const convertUnitsToReadable: (targetUnit: Units) => "cm" | "mm" | "m" | "in" | "ft" | "in (fractional)" | "ft-in (decimal)" | "ft-in (fractional)" | null;
+export declare const convertUnitsToReadableShort: (targetUnit: Units) => "cm" | "mm" | "m" | "in" | "ft" | "ft-in";
 export declare enum FractionalTolerance {
     Fourth = "4",
     Eighth = "8",

package/dist/types/firestore.js

@@ -10,10 +10,21 @@ export var InvitationStatus;
     InvitationStatus["Pending"] = "pending";
     InvitationStatus["Accepted"] = "accepted";
 })(InvitationStatus || (InvitationStatus = {}));
+export var TemplateType;
+(function (TemplateType) {
+    TemplateType["Layout"] = "layout";
+    TemplateType["Annotation"] = "annotation";
+})(TemplateType || (TemplateType = {}));
+export var FileUploadType;
+(function (FileUploadType) {
+    FileUploadType["Annotation"] = "annotation";
+    FileUploadType["Template"] = "template";
+})(FileUploadType || (FileUploadType = {}));
 export var FolderType;
 (function (FolderType) {
     FolderType["Project"] = "project";
     FolderType["Job"] = "job";
+    FolderType["Template"] = "template";
 })(FolderType || (FolderType = {}));
 export var JobType;
 (function (JobType) {
@@ -70,6 +81,28 @@ export const convertUnitsToReadable = (targetUnit) => {
             return null;
     }
 };
+export const convertUnitsToReadableShort = (targetUnit) => {
+    switch (targetUnit) {
+        case Units.Meters:
+            return 'm';
+        case Units.Millimeters:
+            return 'mm';
+        case Units.Centimeters:
+            return 'cm';
+        case Units.Feet:
+            return 'ft';
+        case Units.FractionalInches:
+            return 'in';
+        case Units.Inches:
+            return 'in';
+        case Units.FeetInchesDecimal:
+            return 'ft-in';
+        case Units.FeetInchesFractional:
+            return 'ft-in';
+        default:
+            return targetUnit;
+    }
+};
 export var FractionalTolerance;
 (function (FractionalTolerance) {
     FractionalTolerance["Fourth"] = "4";

package/package.json

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