kui-crm_actions 0.0.62 → 0.0.64

package/index.d.ts

@@ -1,9 +1,8 @@
 import * as kui_crm from 'kui-crm';
-import { InputParams, ResourceTypes, MeterTypes, InputFileWithVisibilityFields, MeterFeaturesFormFields, InspectionTypes, InspectionRoomPhotoTypes, ParkingTypes, ContractLinkModel, ImageBodyRequest, FileBodyRequest, RoomType, ApartmentMainInfoModelFields, TaxesTypes, ApartmentDetailInfoModelFields, CityParams, RoomTypes, RenovationParams, RoomParams, PhoneParams, WifiParams, InternetProviderParams, TVTypes, CompanyAutocompleteFields, CountryAutocompleteFields, MetersCountParams, FillingTagsAutocompleteFields, ApartmentFillingVariants, FillingInfoFormFields as FillingInfoFormFields$1, GeolocationParams } from 'kui-crm';
+import { InputParams, ResourceTypes, MeterTypes, FileStore, InputFileWithVisibilityFields, MeterFeaturesFormFields, InspectionTypes, InspectionRoomPhotoTypes, ParkingTypes, CityParams, RoomTypes, RenovationParams, RoomParams, PhoneParams, WifiParams, InternetProviderParams, TVTypes, CompanyAutocompleteFields, CountryAutocompleteFields, TaxesTypes, MetersCountParams, FillingTagsAutocompleteFields, ApartmentFillingVariants, ImageBodyRequest, FillingInfoFormFields as FillingInfoFormFields$1, ContractLinkModel, FileBodyRequest, RoomType, ApartmentMainInfoModelFields, ApartmentDetailInfoModelFields, GeolocationParams } from 'kui-crm';
 import { DateTime } from 'luxon';
 import { Loader, MultistepForm, PhoneParams as PhoneParams$1 } from 'kui-utils';
 import * as yup from 'yup';
-import UploadFileParams$2, { UploadFileParams as UploadFileParams$1 } from 'kui-complex/dist/FileItem';
 import { InputWithAddressFields } from 'kui-complex/dist/InputWithAddressAutocomplete';
 import { ReactElement } from 'react';
 
@@ -13,26 +12,6 @@ declare const getPartialMeterInfoSchema: (valuesFields: InputParams<any>[]) => y
     [x: string]: any;
 }, "">;
 
-type FileParams = {
-  id: number | null
-  name: string
-  url: string
-  date: DateTime | null
-  size: number | null
-  createdBy: string
-  extension: string
-}
-
-type UploadFileParams = {
-  id?: number | null
-  index?: number | string
-  size?: number | null
-  file?: File | FileParams
-  name?: string
-  title?: string
-  url?: string
-}
-
 type PartialMeterInfoStepProps = {
   resource: ResourceTypes
   index: number
@@ -48,18 +27,18 @@ type PartialMeterInfoFields = {
   T1?: string | number | null
   T2?: string | number | null
   T3?: string | number | null
-  images: UploadFileParams[]
+  images: FileStore[]
 }
 
-type InspectionMeterFields$1 = {
+type InspectionMeterFields = {
   id?: number
   resource: ResourceTypes
   passportFile?: InputFileWithVisibilityFields
-  images: UploadFileParams$1[]
+  images: FileStore[]
 } & MeterFeaturesFormFields
 
-type InspectionMetersStepFields$1 = {
-  meters: InspectionMeterFields$1[]
+type InspectionMetersStepFields = {
+  meters: InspectionMeterFields[]
 }
 
 type InspectionPartialMetersStepFields = {
@@ -81,7 +60,7 @@ type CommonInspectionFormFields = {
 
 type InspectionRoomImagesParams = {
   type: InspectionRoomPhotoTypes
-  files: UploadFileParams$2[]
+  files: FileStore[]
   comment: string
 }
 
@@ -102,6 +81,51 @@ type InspectionImageFieldsSettings = {
   [key: string]: any
 }
 
+type BasicApartmentInfoStepFields = {
+  apartment: InputWithAddressFields
+  apartmentNumber: number | string | null
+  city: CityParams | null
+  zipCode?: string
+}
+
+type SecurityApartmentInfoStepFields = {
+  typeOfObject: RoomTypes | null
+  entrance: string
+  hasIntercom: boolean | null
+  intercomCode: string
+  hasGate: boolean | null
+  gateCode: string
+}
+
+type RoomsApartmentInfoStepFields = {
+  floor: number | null
+  floorCount: number | null
+  roomsNumber: number | null
+  bedroomsNumber: number | null
+  bathroomsNumber: number | null
+  restroomsNumber: number | null
+  combinedBathroomsNumber: number | null
+}
+
+type DetailApartmentInfoStepFields = {
+  area: number | string | null
+  livingArea: number | string | null
+  kitchenArea: number | string | null
+  ceilingHeight: number | string | null
+  numberOfWindows: number | null
+  renovation: RenovationParams | null
+  rooms: RoomParams[]
+}
+
+type InitialInspectionFormFields = CommonInspectionFormFields &
+  InitialInspectionInfoFields &
+  InspectionRoomsImagesFields
+
+type InitialInspectionInfoFields = BasicApartmentInfoStepFields &
+  SecurityApartmentInfoStepFields &
+  RoomsApartmentInfoStepFields &
+  DetailApartmentInfoStepFields
+
 type TransferInspectionTypes =
   | "maroom_tenant"
   | "tenant_maroom"
@@ -132,6 +156,87 @@ type MeterValuesFields = {
   initialValueT3?: MeterValue
 }
 
+type HouseServicesInfoStepFields = {
+  hasBarrier: boolean | null
+  barrierPhone: PhoneParams | null
+  hasConcierge: boolean | null
+  conciergePhone: PhoneParams | null
+  hasSecurity: boolean | null
+  securityPhone: PhoneParams | null
+  hasVideoControl: boolean | null
+  videoControlPhone: PhoneParams | null
+  parkingType: ParkingTypes | null
+  parkingNumber: string
+  passengerElevatorsCount: number | null
+  serviceElevatorsCount: number | null
+}
+
+type TelecommunicationsInfoStepFields = {
+  wifi: WifiParams | null
+  internetProvider: InternetProviderParams | null
+  tvType: TVTypes | null
+  homePhone: PhoneParams | null
+}
+
+type ApartmentPaymentsFormFields = {
+  payerCode: string
+  communalServicesAccount: string
+  company: CompanyAutocompleteFields | null
+  countryOfResidence: CountryAutocompleteFields | null
+  taxesType: TaxesTypes | null
+}
+
+type AdditionalInfoStepFields = {
+  withPets: boolean
+  withChildren: boolean
+  additionalTerms: string
+} & ApartmentPaymentsFormFields
+
+type MetersInfoStepFields = {
+  maxMeters: MetersCountParams | null
+}
+
+type FillingInfoFormFields = {
+  tag: FillingTagsAutocompleteFields
+  serialNumber?: string
+  numberOfSubjects?: string | number | null
+  name?: string
+  type?: ApartmentFillingVariants
+  instruction?: InputFileWithVisibilityFields
+  tempImages?: ImageBodyRequest[]
+}
+
+type FillingInfoStepFields = {
+  images: FileStore[]
+} & FillingInfoFormFields$1
+
+type FillingListInfoStepFields = {
+  fillingList: FillingInfoStepFields[]
+}
+
+
+type InventoryInspectionFormFields = CommonInspectionFormFields &
+  HouseServicesInfoStepFields &
+  TelecommunicationsInfoStepFields &
+  AdditionalInfoStepFields &
+  MetersInfoStepFields &
+  InspectionMetersStepFields &
+  FillingListInfoStepFields &
+  InspectionRoomsImagesFields
+
+declare const inspectionsRequests: {
+    createInspection(apartmentId: number, body: any, loader: Loader): Promise<number | undefined>;
+    createInitialInspection(data: InitialInspectionFormFields, apartmentId: number, loader: Loader): Promise<number | null | undefined>;
+    createRegularInspection(data: RegularInspectionFormFields, apartmentId: number, loader: Loader): Promise<number | null | undefined>;
+    createTransferInspection(data: TransferInspectionFormFields, apartmentId: number, loader: Loader): Promise<number | null | undefined>;
+    createInventoryInspection(data: InventoryInspectionFormFields, apartmentId: number, loader: Loader): Promise<number | null | undefined>;
+    getRoomParams(rooms: InspectionRoomImagesParams[]): {
+        purpose: kui_crm.InspectionRoomPhotoTypes;
+        comment: string;
+        photos: kui_crm.ImageBodyRequest[];
+    }[];
+};
+
 declare type InspectionAppraisalLiteModel = {
     id: number;
     date: string;
@@ -259,150 +364,12 @@ declare type InspectionRoomPhotoRequest = {
     room_order_number?: number;
 };
 
-type BasicApartmentInfoStepFields = {
-  apartment: InputWithAddressFields
-  apartmentNumber: number | string | null
-  city: CityParams | null
-  zipCode?: string
-}
-
-type SecurityApartmentInfoStepFields = {
-  typeOfObject: RoomTypes | null
-  entrance: string
-  hasIntercom: boolean | null
-  intercomCode: string
-  hasGate: boolean | null
-  gateCode: string
-}
-
-type RoomsApartmentInfoStepFields = {
-  floor: number | null
-  floorCount: number | null
-  roomsNumber: number | null
-  bedroomsNumber: number | null
-  bathroomsNumber: number | null
-  restroomsNumber: number | null
-  combinedBathroomsNumber: number | null
-}
-
-type DetailApartmentInfoStepFields = {
-  area: number | string | null
-  livingArea: number | string | null
-  kitchenArea: number | string | null
-  ceilingHeight: number | string | null
-  numberOfWindows: number | null
-  renovation: RenovationParams | null
-  rooms: RoomParams[]
-}
-
-type InitialInspectionFormFields = CommonInspectionFormFields &
-  InitialInspectionInfoFields &
-  InspectionRoomsImagesFields
-
-type InitialInspectionInfoFields = BasicApartmentInfoStepFields &
-  SecurityApartmentInfoStepFields &
-  RoomsApartmentInfoStepFields &
-  DetailApartmentInfoStepFields
-
-type HouseServicesInfoStepFields = {
-  hasBarrier: boolean | null
-  barrierPhone: PhoneParams | null
-  hasConcierge: boolean | null
-  conciergePhone: PhoneParams | null
-  hasSecurity: boolean | null
-  securityPhone: PhoneParams | null
-  hasVideoControl: boolean | null
-  videoControlPhone: PhoneParams | null
-  parkingType: ParkingTypes | null
-  parkingNumber: string
-  passengerElevatorsCount: number | null
-  serviceElevatorsCount: number | null
-}
-
-type TelecommunicationsInfoStepFields = {
-  wifi: WifiParams | null
-  internetProvider: InternetProviderParams | null
-  tvType: TVTypes | null
-  homePhone: PhoneParams | null
-}
-
-type ApartmentPaymentsFormFields = {
-  payerCode: string
-  communalServicesAccount: string
-  company: CompanyAutocompleteFields | null
-  countryOfResidence: CountryAutocompleteFields | null
-  taxesType: TaxesTypes | null
-}
-
-type AdditionalInfoStepFields = {
-  withPets: boolean
-  withChildren: boolean
-  additionalTerms: string
-} & ApartmentPaymentsFormFields
-
-type MetersInfoStepFields = {
-  maxMeters: MetersCountParams | null
-}
-
-type FillingInfoFormFields = {
-  tag: FillingTagsAutocompleteFields
-  serialNumber?: string
-  numberOfSubjects?: string | number | null
-  name?: string
-  type?: ApartmentFillingVariants
-  instruction?: InputFileWithVisibilityFields
-  tempImages?: ImageBodyRequest[]
-}
-
-type InspectionMeterFields = {
-  id?: number
-  resource: ResourceTypes
-  passportFile?: InputFileWithVisibilityFields
-  images: UploadFileParams$1[]
-} & MeterFeaturesFormFields
-
-type InspectionMetersStepFields = {
-  meters: InspectionMeterFields[]
-}
-
-type FillingInfoStepFields = {
-  images: UploadFileParams$1[]
-} & FillingInfoFormFields$1
-
-type FillingListInfoStepFields = {
-  fillingList: FillingInfoStepFields[]
-}
-
-
-type InventoryInspectionFormFields = CommonInspectionFormFields &
-  HouseServicesInfoStepFields &
-  TelecommunicationsInfoStepFields &
-  AdditionalInfoStepFields &
-  MetersInfoStepFields &
-  InspectionMetersStepFields &
-  FillingListInfoStepFields &
-  InspectionRoomsImagesFields
-
-declare const inspectionsRequests: {
-    createInspection(apartmentId: number, body: any, loader: Loader): Promise<number | undefined>;
-    loadInspectionImages(loader: Loader, roomsImages: InspectionRoomImagesParams[]): Promise<InspectionRoomPhotoRequest[]>;
-    createInitialInspection(data: InitialInspectionFormFields, apartmentId: number, loader: Loader): Promise<number | null | undefined>;
-    createRegularInspection(data: RegularInspectionFormFields, apartmentId: number, loader: Loader): Promise<number | null | undefined>;
-    createTransferInspection(data: TransferInspectionFormFields, apartmentId: number, loader: Loader): Promise<number | null | undefined>;
-    createInventoryInspection(data: InventoryInspectionFormFields, apartmentId: number, loader: Loader): Promise<number | null | undefined>;
-    getRoomParams(room: InspectionRoomImagesParams, photos?: ImageBodyRequest[] | undefined): {
-        purpose: kui_crm.InspectionRoomPhotoTypes;
-        comment: string;
-        photos: ImageBodyRequest[];
-    };
-};
-
 declare const inspectionsRequestBody: {
     getPostBodyInitialInspection(inspection: InitialInspectionFormFields, roomsImages: InspectionRoomPhotoRequest[]): InitialInspectionPostBody;
     getInitialInspectionFields(inspection: InitialInspectionInfoFields): InitialInspectionFieldsBody;
-    getPostBodyRegularInspection(inspection: RegularInspectionFormFields, roomsImages: InspectionRoomPhotoRequest[], metersImages: ImageBodyRequest[][]): RegularInspectionPostBody;
-    getPostBodyTransferInspection(inspection: TransferInspectionFormFields, roomsImages: InspectionRoomPhotoRequest[], metersImages: ImageBodyRequest[][]): TransferInspectionPostBody;
-    getPartialInspectionMeters(meters: PartialMeterInfoFields[], metersImages: ImageBodyRequest[][]): {
+    getPostBodyRegularInspection(inspection: RegularInspectionFormFields, roomsImages: InspectionRoomPhotoRequest[]): RegularInspectionPostBody;
+    getPostBodyTransferInspection(inspection: TransferInspectionFormFields, roomsImages: InspectionRoomPhotoRequest[]): TransferInspectionPostBody;
+    getPartialInspectionMeters(meters: PartialMeterInfoFields[]): {
         meters: {
             id: number;
             resource_type: kui_crm.ResourceTypes;
@@ -414,8 +381,8 @@ declare const inspectionsRequestBody: {
             };
         }[];
     };
-    getPostBodyInventoryInspection(inspection: InventoryInspectionFormFields, roomsImages: InspectionRoomPhotoRequest[], fillingFiles: FileBodyRequest[], metersFiles: FileBodyRequest[], metersImages: ImageBodyRequest[][], fillingImages: ImageBodyRequest[][]): InventoryInspectionPostBody;
-    getInventoryInspectionMeters(meters: InspectionMeterFields$1[], metersFiles: FileBodyRequest[], metersImages: ImageBodyRequest[][]): {
+    getPostBodyInventoryInspection(inspection: InventoryInspectionFormFields, roomsImages: InspectionRoomPhotoRequest[], fillingFiles: FileBodyRequest[], metersFiles: FileBodyRequest[]): InventoryInspectionPostBody;
+    getInventoryInspectionMeters(meters: InspectionMeterFields[], metersFiles: FileBodyRequest[], metersImages?: ImageBodyRequest[][] | undefined): {
         meters: {
             passport: FileBodyRequest;
             values: {
@@ -460,7 +427,7 @@ declare const inspectionsRequestBody: {
         cold?: undefined;
         hot?: undefined;
     };
-    getMeterCommonFields(meter: InspectionMeterFields$1): {
+    getMeterCommonFields(meter: InspectionMeterFields): {
         id: number | undefined;
         meter_type: kui_crm.MeterTypes | undefined;
         passport_number: string;
@@ -473,6 +440,7 @@ declare const inspectionsRequestBody: {
     getMeterValues(initialValue?: string | number | null | undefined, lastValue?: string | number | null | undefined): {
         [key: string]: any;
     };
+    getFilesParams(files: FileStore[]): ImageBodyRequest[];
 };
 
 declare const getBasicApartmentInfoFields: (handlePlaceSelect?: ((coords: google.maps.LatLngLiteral) => void) | undefined, settings?: InspectionFieldsSettings | undefined) => InputParams<BasicApartmentInfoStepFields>[];
@@ -837,4 +805,4 @@ type ApartmentOverlayProps = {
 
 declare const ApartmentInspectionOverlay: (props: ApartmentOverlayProps) => JSX.Element;
 
-export { AdditionalInfoFieldsSchema, AdditionalInfoStepFields, AdditionalInfoStepSchema, ApartmentInspectionModel, ApartmentInspectionOverlay, ApartmentInspectionParams, ApartmentLinkParams, ApartmentPaymentsFormFields, BasicApartmentInfoFieldsSchema, BasicApartmentInfoStepFields, BasicApartmentInfoStepSchema, CommonInspectionFields, CommonInspectionFormFields, DetailApartmentInfoFieldsSchema, DetailApartmentInfoStepFields, DetailApartmentInfoStepSchema, FillingInfoFieldsSchema, FillingInfoFormFields, FillingInfoStepFields, FillingListInfoStepFields, HouseServicesInfoFieldsSchema, HouseServicesInfoStepFields, HouseServicesInfoStepSchema, InitialInspectionFieldsBody, InitialInspectionFormFields, InitialInspectionInfoFields, InitialInspectionPostBody, InitialInspectionRoomParams, InspectionAppraisalLiteModel, InspectionFieldsSettings, InspectionFillingParams, InspectionImpairmentLiteModel, InspectionMeterCommonFields, InspectionMeterFields$1 as InspectionMeterFields, InspectionMeterValueModel, InspectionMetersStepFields$1 as InspectionMetersStepFields, InspectionPartialMetersStepFields, InspectionRoomImagesParams, InspectionRoomPhotoRequest, InspectionRoomsImagesFields, InventoryInspectionFieldsBody, InventoryInspectionFormFields, InventoryInspectionPostBody, InventoryMeterModel, MeterInfoStepProps, MeterValueModel, MeterValuesFields, MetersInfoFieldsSchema, MetersInfoStepFields, MetersInfoStepSchema, MetroStationParams, PartialMeterInfoFields, PartialMeterInfoStepProps, PartialMeterModel, PostApartmentInspectionRequest, RegularInspectionFormFields, RegularInspectionPostBody, RegularlyInspectionFieldsBody, RoomsApartmentInfoFieldsSchema, RoomsApartmentInfoStepFields, RoomsApartmentInfoStepSchema, SecurityApartmentInfoFieldsSchema, SecurityApartmentInfoStepFields, SecurityApartmentInfoStepSchema, TelecommunicationsInfoFieldsSchema, TelecommunicationsInfoStepFields, TelecommunicationsInfoStepSchema, TenantParams, TransferInspectionFieldsBody, TransferInspectionFormFields, TransferInspectionPostBody, TransferInspectionTypes, getAdditionalInfoStepFields, getBasicApartmentInfoFields, getDetailApartmentInfoFields, getFillingInfoFields, getHouseServicesInfoStep, getMetersInfoStepFields, getPartialMeterInfoSchema, getRoomsApartmentInfoFields, getRoomsImagesSteps, getSecurityApartmentInfoFields, getTelecommunicationsInfoStepFields, inspectionsRequestBody, inspectionsRequests, renderMetersSteps, useMetersValues };
+export { AdditionalInfoFieldsSchema, AdditionalInfoStepFields, AdditionalInfoStepSchema, ApartmentInspectionModel, ApartmentInspectionOverlay, ApartmentInspectionParams, ApartmentLinkParams, ApartmentPaymentsFormFields, BasicApartmentInfoFieldsSchema, BasicApartmentInfoStepFields, BasicApartmentInfoStepSchema, CommonInspectionFields, CommonInspectionFormFields, DetailApartmentInfoFieldsSchema, DetailApartmentInfoStepFields, DetailApartmentInfoStepSchema, FillingInfoFieldsSchema, FillingInfoFormFields, FillingInfoStepFields, FillingListInfoStepFields, HouseServicesInfoFieldsSchema, HouseServicesInfoStepFields, HouseServicesInfoStepSchema, InitialInspectionFieldsBody, InitialInspectionFormFields, InitialInspectionInfoFields, InitialInspectionPostBody, InitialInspectionRoomParams, InspectionAppraisalLiteModel, InspectionFieldsSettings, InspectionFillingParams, InspectionImpairmentLiteModel, InspectionMeterCommonFields, InspectionMeterFields, InspectionMeterValueModel, InspectionMetersStepFields, InspectionPartialMetersStepFields, InspectionRoomImagesParams, InspectionRoomPhotoRequest, InspectionRoomsImagesFields, InventoryInspectionFieldsBody, InventoryInspectionFormFields, InventoryInspectionPostBody, InventoryMeterModel, MeterInfoStepProps, MeterValueModel, MeterValuesFields, MetersInfoFieldsSchema, MetersInfoStepFields, MetersInfoStepSchema, MetroStationParams, PartialMeterInfoFields, PartialMeterInfoStepProps, PartialMeterModel, PostApartmentInspectionRequest, RegularInspectionFormFields, RegularInspectionPostBody, RegularlyInspectionFieldsBody, RoomsApartmentInfoFieldsSchema, RoomsApartmentInfoStepFields, RoomsApartmentInfoStepSchema, SecurityApartmentInfoFieldsSchema, SecurityApartmentInfoStepFields, SecurityApartmentInfoStepSchema, TelecommunicationsInfoFieldsSchema, TelecommunicationsInfoStepFields, TelecommunicationsInfoStepSchema, TenantParams, TransferInspectionFieldsBody, TransferInspectionFormFields, TransferInspectionPostBody, TransferInspectionTypes, getAdditionalInfoStepFields, getBasicApartmentInfoFields, getDetailApartmentInfoFields, getFillingInfoFields, getHouseServicesInfoStep, getMetersInfoStepFields, getPartialMeterInfoSchema, getRoomsApartmentInfoFields, getRoomsImagesSteps, getSecurityApartmentInfoFields, getTelecommunicationsInfoStepFields, inspectionsRequestBody, inspectionsRequests, renderMetersSteps, useMetersValues };

package/index.js

@@ -1,5 +1,5 @@
 import * as yup from 'yup';
-import { requests, uploadImages, uploadFiles, CountryAutocomplete, RegionAutocomplete, CityAutocomplete, RenovationTypeValues, RenovationStyleValues, RoomTypeValues, RoomTypesValues, BooleanValues, ParkingTypesValues, fieldWithConditionSchema, defaultRequiredMessage, getApartmentPaymentFields, phoneWithConditionSchema, positiveNumberSchema, getNumbersValues, TVTypesValues, phoneNonRequiredSchema, InputFileWithVisibility, FillingTypeValues, FillingTagsAutocomplete, PreviewContent, Link, UserBadge, useMapCards, MapOverlay } from 'kui-crm';
+import { requests, uploadFiles, CountryAutocomplete, RegionAutocomplete, CityAutocomplete, RenovationTypeValues, RenovationStyleValues, RoomTypeValues, RoomTypesValues, BooleanValues, ParkingTypesValues, fieldWithConditionSchema, defaultRequiredMessage, getApartmentPaymentFields, phoneWithConditionSchema, positiveNumberSchema, getNumbersValues, TVTypesValues, phoneNonRequiredSchema, InputFileWithVisibility, FillingTypeValues, FillingTagsAutocomplete, PreviewContent, Link, UserBadge, useMapCards, MapOverlay } from 'kui-crm';
 import { clearNotValidFields, getPhoneNumberFromPhoneParams, resHandler, callPromises, addToArrayByCondition } from 'kui-utils';
 import to from 'await-to-js';
 import { DateTime } from 'luxon';
@@ -161,27 +161,27 @@ var inspectionsRequestBody = {
             }); }),
         };
     },
-    getPostBodyRegularInspection: function (inspection, roomsImages, metersImages) {
+    getPostBodyRegularInspection: function (inspection, roomsImages) {
         return {
             date: DateTime.now().toISODate(),
             inspection_type: "regular",
             based_on: null,
             dropbox_link: inspection.dropboxLink,
             photo_groups: roomsImages,
-            regular: this.getPartialInspectionMeters(inspection.meters, metersImages),
+            regular: this.getPartialInspectionMeters(inspection.meters),
         };
     },
-    getPostBodyTransferInspection: function (inspection, roomsImages, metersImages) {
+    getPostBodyTransferInspection: function (inspection, roomsImages) {
         return {
             date: DateTime.now().toISODate(),
             inspection_type: "transfer",
             based_on: null,
             dropbox_link: inspection.dropboxLink,
             photo_groups: roomsImages,
-            transfer: __assign({ transfer_type: inspection.transferType }, this.getPartialInspectionMeters(inspection.meters, metersImages)),
+            transfer: __assign({ transfer_type: inspection.transferType }, this.getPartialInspectionMeters(inspection.meters)),
         };
     },
-    getPartialInspectionMeters: function (meters, metersImages) {
+    getPartialInspectionMeters: function (meters) {
         var _this = this;
         return {
             meters: meters.map(function (meter, index) { return ({
@@ -189,12 +189,13 @@ var inspectionsRequestBody = {
                 resource_type: meter.resource,
                 meter_type: meter.type,
                 passport_number: meter.number,
-                photos: metersImages[index],
+                photos: _this.getFilesParams(meter.images),
                 values: clearNotValidFields(_this.getInspectionMeterValues(meter)),
             }); }),
         };
     },
-    getPostBodyInventoryInspection: function (inspection, roomsImages, fillingFiles, metersFiles, metersImages, fillingImages) {
+    getPostBodyInventoryInspection: function (inspection, roomsImages, fillingFiles, metersFiles) {
+        var _this = this;
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         return {
             date: DateTime.now().toISODate(),
@@ -219,16 +220,18 @@ var inspectionsRequestBody = {
                         description: filling.name,
                         serial_code: filling.serialNumber,
                         amount: filling.numberOfSubjects,
-                        photos: fillingImages[index],
+                        photos: _this.getFilesParams(filling.images),
                         instruction: fillingFiles[index],
                     });
-                }) }, this.getInventoryInspectionMeters(inspection.meters, metersFiles, metersImages)),
+                }) }, this.getInventoryInspectionMeters(inspection.meters, metersFiles)),
         };
     },
     getInventoryInspectionMeters: function (meters, metersFiles, metersImages) {
         var _this = this;
         return {
-            meters: (meters === null || meters === void 0 ? void 0 : meters.map(function (meter, index) { return (__assign(__assign({}, _this.getMeterCommonFields(meter)), { passport: metersFiles[index], values: clearNotValidFields(_this.getInspectionMeterValues(meter, "initialValue")), photos: metersImages[index], no_tariff: meter.noTariff, auto_sending: meter.withAutoSending })); })) || [],
+            meters: (meters === null || meters === void 0 ? void 0 : meters.map(function (meter, index) { return (__assign(__assign({}, _this.getMeterCommonFields(meter)), { passport: metersFiles[index], values: clearNotValidFields(_this.getInspectionMeterValues(meter, "initialValue")), photos: metersImages
+                    ? metersImages[index]
+                    : _this.getFilesParams(meter.images), no_tariff: meter.noTariff, auto_sending: meter.withAutoSending })); })) || [],
         };
     },
     getInspectionMeterValues: function (meter, fieldName) {
@@ -271,6 +274,11 @@ var inspectionsRequestBody = {
             last_value: lastValue,
         });
     },
+    getFilesParams: function (files) {
+        return files
+            .map(function (file) { return file.uploadedData; })
+            .filter(function (data) { return data; });
+    },
 };
 
 var inspectionsRequests = {
@@ -289,138 +297,79 @@ var inspectionsRequests = {
             });
         });
     },
-    loadInspectionImages: function (loader, roomsImages) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function () {
-            var promises, images, bedroomCount, roomIndex, bedroomIndex;
-            var _this = this;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        promises = [];
-                        roomsImages.forEach(function (room) {
-                            promises.push(uploadImages(loader, room.files));
-                        });
-                        return [4 /*yield*/, callPromises(promises)];
-                    case 1:
-                        images = _b.sent();
-                        bedroomCount = (_a = roomsImages.filter(function (imagesGroup) { return imagesGroup.type === "bedroom"; })) === null || _a === void 0 ? void 0 : _a.length;
-                        roomIndex = bedroomCount || 0;
-                        bedroomIndex = 0;
-                        return [2 /*return*/, roomsImages.map(function (room, index) {
-                                if (room.type === "room") {
-                                    return __assign(__assign({}, _this.getRoomParams(room, images[index])), { 
-                                        // eslint-disable-next-line no-plusplus
-                                        room_order_number: roomIndex++ });
-                                }
-                                if (room.type === "bedroom") {
-                                    return __assign(__assign({}, _this.getRoomParams(room, images[index])), { 
-                                        // eslint-disable-next-line no-plusplus
-                                        room_order_number: bedroomIndex++ });
-                                }
-                                return _this.getRoomParams(room, images[index]);
-                            })];
-                }
-            });
-        });
-    },
     createInitialInspection: function (data, apartmentId, loader) {
         return __awaiter(this, void 0, void 0, function () {
             var roomsImages, body;
             return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!apartmentId) return [3 /*break*/, 2];
-                        loader.startLoading("inspection creation");
-                        return [4 /*yield*/, this.loadInspectionImages(loader, data.roomsImages)];
-                    case 1:
-                        roomsImages = _a.sent();
-                        body = inspectionsRequestBody.getPostBodyInitialInspection(data, roomsImages);
-                        return [2 /*return*/, this.createInspection(apartmentId, body, loader)];
-                    case 2: return [2 /*return*/, null];
+                if (apartmentId) {
+                    loader.startLoading("inspection creation");
+                    roomsImages = this.getRoomParams(data.roomsImages);
+                    body = inspectionsRequestBody.getPostBodyInitialInspection(data, roomsImages);
+                    return [2 /*return*/, this.createInspection(apartmentId, body, loader)];
                 }
+                return [2 /*return*/, null];
             });
         });
     },
     createRegularInspection: function (data, apartmentId, loader) {
-        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var metersImages, files, body;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        if (!apartmentId) return [3 /*break*/, 2];
-                        loader.startLoading("inspection creation");
-                        metersImages = ((_a = data.meters) === null || _a === void 0 ? void 0 : _a.map(function (meter) { return uploadImages(loader, meter.images); })) || [];
-                        return [4 /*yield*/, callPromises(__spreadArray([
-                                this.loadInspectionImages(loader, data.roomsImages)
-                            ], metersImages, true))];
-                    case 1:
-                        files = _b.sent();
-                        body = inspectionsRequestBody.getPostBodyRegularInspection(data, files[0], files.slice(1));
-                        return [2 /*return*/, this.createInspection(apartmentId, body, loader)];
-                    case 2: return [2 /*return*/, null];
+            var roomsImages, body;
+            return __generator(this, function (_a) {
+                if (apartmentId) {
+                    loader.startLoading("inspection creation");
+                    roomsImages = this.getRoomParams(data.roomsImages);
+                    body = inspectionsRequestBody.getPostBodyRegularInspection(data, roomsImages);
+                    return [2 /*return*/, this.createInspection(apartmentId, body, loader)];
                 }
+                return [2 /*return*/, null];
             });
         });
     },
     createTransferInspection: function (data, apartmentId, loader) {
-        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var metersImages, files, body;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        if (!apartmentId) return [3 /*break*/, 2];
-                        loader.startLoading("inspection creation");
-                        metersImages = ((_a = data.meters) === null || _a === void 0 ? void 0 : _a.map(function (meter) { return uploadImages(loader, meter.images); })) || [];
-                        return [4 /*yield*/, callPromises(__spreadArray([
-                                this.loadInspectionImages(loader, data.roomsImages)
-                            ], metersImages, true))];
-                    case 1:
-                        files = _b.sent();
-                        body = inspectionsRequestBody.getPostBodyTransferInspection(data, files[0], files.slice(1));
-                        return [2 /*return*/, this.createInspection(apartmentId, body, loader)];
-                    case 2: return [2 /*return*/, null];
+            var roomsImages, body;
+            return __generator(this, function (_a) {
+                if (apartmentId) {
+                    loader.startLoading("inspection creation");
+                    roomsImages = this.getRoomParams(data.roomsImages);
+                    body = inspectionsRequestBody.getPostBodyTransferInspection(data, roomsImages);
+                    return [2 /*return*/, this.createInspection(apartmentId, body, loader)];
                 }
+                return [2 /*return*/, null];
             });
         });
     },
     createInventoryInspection: function (data, apartmentId, loader) {
-        var _a, _b;
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var fillingFiles, metersFiles, metersImages, fillingImages, files, body;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var fillingFiles, metersFiles, files, roomsImages, body;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         if (!apartmentId) return [3 /*break*/, 2];
                         loader.startLoading("inspection creation");
                         fillingFiles = data.fillingList.map(function (filling) { return filling.instruction; });
                         metersFiles = ((_a = data.meters) === null || _a === void 0 ? void 0 : _a.map(function (meter) { return meter.passportFile; })) || [];
-                        metersImages = ((_b = data.meters) === null || _b === void 0 ? void 0 : _b.map(function (meter) { return uploadImages(loader, meter.images); })) || [];
-                        fillingImages = data.fillingList.map(function (filling) {
-                            return uploadImages(loader, filling.images);
-                        });
-                        return [4 /*yield*/, callPromises(__spreadArray(__spreadArray([
-                                this.loadInspectionImages(loader, data.roomsImages),
+                        return [4 /*yield*/, callPromises([
                                 uploadFiles(loader, fillingFiles),
-                                uploadFiles(loader, metersFiles)
-                            ], metersImages, true), fillingImages, true))];
+                                uploadFiles(loader, metersFiles),
+                            ])];
                     case 1:
-                        files = _c.sent();
-                        body = inspectionsRequestBody.getPostBodyInventoryInspection(data, files[0], files[1], files[2], files.slice(3, metersImages.length + 3), files.slice(metersImages.length + 3));
+                        files = _b.sent();
+                        roomsImages = this.getRoomParams(data.roomsImages);
+                        body = inspectionsRequestBody.getPostBodyInventoryInspection(data, roomsImages, files[0], files[1]);
                         return [2 /*return*/, this.createInspection(apartmentId, body, loader)];
                     case 2: return [2 /*return*/, null];
                 }
             });
         });
     },
-    getRoomParams: function (room, photos) {
-        return {
+    getRoomParams: function (rooms) {
+        return rooms.map(function (room) { return ({
             purpose: room.type,
             comment: room.comment,
-            photos: photos || [],
-        };
+            photos: inspectionsRequestBody.getFilesParams(room.files),
+        }); });
     },
 };