kui-crm_actions 0.0.131 → 0.0.133

package/index.d.ts

@@ -1002,14 +1002,11 @@ declare type InspectionsLiteStoreInterface = {
     setCanUpdateDB: (value: boolean) => void;
     setIndexDB: (db: any) => void;
 };
-declare type OverviewLiteStoreInterface = {
-    id: number | null;
-};
 declare type ApartmentLiteStoreInterface = {
     metersStore: ApartmentMetersStoreInterface;
     fillingStore: FillingListStore;
     inspectionsStore: InspectionsLiteStoreInterface;
-    overviewStore: OverviewLiteStoreInterface;
+    apartmentId?: number | null;
 };
 declare type InspectionIndexDBConstants = {
     dbCreationTime: string;

package/index.js

@@ -1025,8 +1025,8 @@ var getRoomsImagesSteps = function (type, settings, roomsParams) { return __spre
     __assign({ type: "kitchen" }, settings.kitchen)
 ], new Array(Number((roomsParams === null || roomsParams === void 0 ? void 0 : roomsParams.bedroomsNumber) || 0))
     .fill(0)
-    .map(function (_, index) { return (__assign({ type: "bedroom" }, settings.bedroom((roomsParams === null || roomsParams === void 0 ? void 0 : roomsParams.bedroomsNumber) ? "".concat(index + 1, " ") : ""))); }), true), new Array(Number((roomsParams === null || roomsParams === void 0 ? void 0 : roomsParams.roomsNumber) || 0) -
-    Number((roomsParams === null || roomsParams === void 0 ? void 0 : roomsParams.bedroomsNumber) || 0))
+    .map(function (_, index) { return (__assign({ type: "bedroom" }, settings.bedroom((roomsParams === null || roomsParams === void 0 ? void 0 : roomsParams.bedroomsNumber) ? "".concat(index + 1, " ") : ""))); }), true), new Array(Math.max(Number((roomsParams === null || roomsParams === void 0 ? void 0 : roomsParams.roomsNumber) || 0) -
+    Number((roomsParams === null || roomsParams === void 0 ? void 0 : roomsParams.bedroomsNumber) || 0), 0))
     .fill(0)
     .map(function (_, index) { return (__assign({ type: "room" }, settings.room((roomsParams === null || roomsParams === void 0 ? void 0 : roomsParams.roomsNumber)
     ? "".concat(index + 1 + ((roomsParams === null || roomsParams === void 0 ? void 0 : roomsParams.bedroomsNumber) || 0), " ")
@@ -1216,10 +1216,10 @@ var useFillingList = function (apartmentId, formStore, fillingStore, shouldBeLoa
 };
 
 var onInspectionModalOpen = function (apartmentStore, constants, openModal) {
-    var inspectionsStore = apartmentStore.inspectionsStore, overviewStore = apartmentStore.overviewStore;
+    var inspectionsStore = apartmentStore.inspectionsStore, apartmentId = apartmentStore.apartmentId;
     var formStateName = constants.formStateName, formFieldsName = constants.formFieldsName;
     var fields = inspectionsStore.creationForm.fields;
-    if (fields && fields.apartmentId !== (overviewStore === null || overviewStore === void 0 ? void 0 : overviewStore.id)) {
+    if (fields && fields.apartmentId !== apartmentId) {
         clearIndexStores(inspectionsStore.indexDB, [formStateName, formFieldsName]);
     }
     inspectionsStore.setCanUpdateDB(true);
@@ -1238,7 +1238,7 @@ var onInspectionModalClose = function (apartmentStore, constants, closeModal) {
 
 var useInspectionData = function (apartmentStore) {
     var _a;
-    var overviewStore = apartmentStore.overviewStore, inspectionsStore = apartmentStore.inspectionsStore, metersStore = apartmentStore.metersStore, fillingStore = apartmentStore.fillingStore;
+    var apartmentId = apartmentStore.apartmentId, inspectionsStore = apartmentStore.inspectionsStore, metersStore = apartmentStore.metersStore, fillingStore = apartmentStore.fillingStore;
     var _b = useState(false), isMetersLoaded = _b[0], setIsMetersLoader = _b[1];
     var _c = useState(false), isFillingLoaded = _c[0], setIsFillingLoaded = _c[1];
     var formStore = inspectionsStore.creationForm;
@@ -1259,13 +1259,13 @@ var useInspectionData = function (apartmentStore) {
         }
     }, [isMetersLoaded, isFillingLoaded, fillingLoading, metersLoading]);
     useMetersValues(formStore, metersStore, canBeLoad, handleMetersLoad);
-    useFillingList((overviewStore === null || overviewStore === void 0 ? void 0 : overviewStore.id) || null, formStore, fillingStore, canBeLoad, handleFillingLoad);
+    useFillingList(apartmentId || null, formStore, fillingStore, canBeLoad, handleFillingLoad);
 };
 
 var EXPIRATION_TIME = 24 * 60 * 60 * 1000; // 24 часа
 var useInspectionIndexDB = function (constants, apartmentStore, openModal) {
     var dbCreationTime = constants.dbCreationTime, formFieldsName = constants.formFieldsName, formStateName = constants.formStateName, inspectionCreationFormName = constants.inspectionCreationFormName;
-    var inspectionsStore = apartmentStore.inspectionsStore, overviewStore = apartmentStore.overviewStore;
+    var inspectionsStore = apartmentStore.inspectionsStore, apartmentId = apartmentStore.apartmentId;
     var creationForm = inspectionsStore.creationForm, actionLoader = inspectionsStore.actionLoader, indexDB = inspectionsStore.indexDB, setCanUpdateDB = inspectionsStore.setCanUpdateDB, canUpdateDB = inspectionsStore.canUpdateDB;
     var dbName = inspectionCreationFormName;
     var onupgradeneeded = function (db) {
@@ -1297,7 +1297,7 @@ var useInspectionIndexDB = function (constants, apartmentStore, openModal) {
                         case 1:
                             formFields = _a.sent();
                             if (formFields) {
-                                if ((formFields === null || formFields === void 0 ? void 0 : formFields.apartmentId) === (overviewStore === null || overviewStore === void 0 ? void 0 : overviewStore.id)) {
+                                if ((formFields === null || formFields === void 0 ? void 0 : formFields.apartmentId) === apartmentId) {
                                     creationForm.updateFormFields(__assign(__assign({}, formFields), { date: formFields.date ? DateTime.fromISO(formFields.date) : null }));
                                     if (openModal)
                                         openModal();
@@ -1323,7 +1323,7 @@ var useInspectionIndexDB = function (constants, apartmentStore, openModal) {
                     return [4 /*yield*/, readFromIndexDB(indexDB, formFieldsName, actionLoader)];
                 case 2:
                     formFields = _a.sent();
-                    if (formState && (formFields === null || formFields === void 0 ? void 0 : formFields.apartmentId) === (overviewStore === null || overviewStore === void 0 ? void 0 : overviewStore.id)) {
+                    if (formState && (formFields === null || formFields === void 0 ? void 0 : formFields.apartmentId) === apartmentId) {
                         creationForm.setStep(Number(formState.step));
                     }
                     setCanUpdateDB(true);
@@ -1332,9 +1332,9 @@ var useInspectionIndexDB = function (constants, apartmentStore, openModal) {
         });
     }); };
     useEffect(function () {
-        if (overviewStore === null || overviewStore === void 0 ? void 0 : overviewStore.id)
+        if (apartmentId)
             initInspectionIndexDB();
-    }, [overviewStore === null || overviewStore === void 0 ? void 0 : overviewStore.id]);
+    }, [apartmentId]);
     useEffect(function () {
         if (inspectionsStore.canLoadDB && indexDB) {
             initFormState();