@topconsultnpm/sdk-ts 6.19.0-dev1.7 → 6.19.0-dev1.9

package/dist/lib/Engine.js

@@ -490,6 +490,32 @@ export class DcmtTypeEngine extends BaseEngine {
         (_c = d.isUnique) !== null && _c !== void 0 ? _c : (d.isUnique = 0);
         return d;
     }
+    static NormalizeLayoutDescriptor(d, isNew) {
+        var _a, _b, _c, _d;
+        if (!d)
+            return;
+        (_a = d.id) !== null && _a !== void 0 ? _a : (d.id = 0);
+        (_b = d.isForArchive) !== null && _b !== void 0 ? _b : (d.isForArchive = false);
+        (_c = d.isForUpdate) !== null && _c !== void 0 ? _c : (d.isForUpdate = false);
+        (_d = d.tid) !== null && _d !== void 0 ? _d : (d.tid = 0);
+        if (d.items) {
+            for (let item of d.items) {
+                this.NormalizeLayoutItemDescriptor(item, isNew);
+            }
+        }
+        else {
+            d.items = [];
+        }
+        return d;
+    }
+    static NormalizeLayoutItemDescriptor(d, isNew) {
+        var _a, _b;
+        if (!d)
+            return;
+        (_a = d.layoutItemID) !== null && _a !== void 0 ? _a : (d.layoutItemID = 0);
+        (_b = d.parentID) !== null && _b !== void 0 ? _b : (d.parentID = 0);
+        return d;
+    }
     CreateAsync(d) {
         return __awaiter(this, void 0, void 0, function* () { var _a; return yield ((_a = this.TMSClient) === null || _a === void 0 ? void 0 : _a.dcmtTypeCreate(d)); });
     }
@@ -548,7 +574,7 @@ export class DcmtTypeEngine extends BaseEngine {
         return __awaiter(this, void 0, void 0, function* () { var _a; return yield ((_a = this.TMSClient) === null || _a === void 0 ? void 0 : _a.layoutCreate(ld)); });
     }
     LayoutRetrieveAsync(TID, layoutMode) {
-        return __awaiter(this, void 0, void 0, function* () { var _a; return yield ((_a = this.TMSClient) === null || _a === void 0 ? void 0 : _a.layoutRetrieve(TID, layoutMode)); });
+        return __awaiter(this, void 0, void 0, function* () { var _a; return DcmtTypeEngine.NormalizeLayoutDescriptor(yield ((_a = this.TMSClient) === null || _a === void 0 ? void 0 : _a.layoutRetrieve(TID, layoutMode)), false); });
     }
     LayoutRetrieveAdminAsync(TID, id) {
         return __awaiter(this, void 0, void 0, function* () { var _a; return yield ((_a = this.TMSClient) === null || _a === void 0 ? void 0 : _a.layoutRetrieveAdmin(TID, id)); });

package/dist/lib/helper/SDK_CacheServices.js

@@ -985,18 +985,18 @@ export class LayoutCacheService {
                     layoutMap = new Map();
                     this._cache.set(accessToken, layoutMap);
                 }
-                let layout = layoutMap.get(cacheKey);
-                if (!layout) {
-                    layout = yield tms.NewDcmtTypeEngine().LayoutRetrieveAsync(TID, layoutMode);
-                    if (layout) {
-                        layoutMap.set(cacheKey, layout);
-                    }
-                    else {
-                        console.warn(`LayoutRetrieveAsync(${TID}, ${layoutMode}) returned undefined for accessToken: ${accessToken}`);
+                let cached = layoutMap.get(cacheKey);
+                if (cached !== undefined) {
+                    if (cached === null)
                         return undefined;
-                    }
+                    return deepCopy ? this.cloneItem(cached) : cached;
+                }
+                let fetched = yield tms.NewDcmtTypeEngine().LayoutRetrieveAsync(TID, layoutMode);
+                layoutMap.set(cacheKey, fetched !== null && fetched !== void 0 ? fetched : null);
+                if (!fetched) {
+                    return undefined;
                 }
-                return deepCopy ? this.cloneItem(layout) : layout;
+                return deepCopy ? this.cloneItem(fetched) : fetched;
             }));
         });
     }

package/dist/types/Engine.d.ts

@@ -1,6 +1,6 @@
 import { ProgressCallbackData, TopMediaServiceClientEx } from "./TopMediaServiceClientEx";
 import { ITopMediaSession } from "./TopMediaSession";
-import { ArchiveDescriptor, AreaDescriptor, AreaFileDescriptor, BarcodeArchiverJobDescriptor, BarcodeDetectionDescriptor, BasketTypeDescriptor, BatchUpdaterJobDescriptor, COSCheckerJobDescriptor, CassettoDoganaleJobDescriptor, CheckSequenceJobDescriptor, CultureIDs, DcmtConverterJobDescriptor, DcmtDeleterJobDescriptor, DcmtNoteJobDescriptor, DcmtPrinterJobDescriptor, DcmtTypeDescriptor, DiskDescriptor, FEAttacherJobDescriptor, FECreatorTxtJobDescriptor, FEDetacherJobDescriptor, FESenderWsJobDescriptor, FESplitterJobDescriptor, FEValidatorJobDescriptor, FileArchiverJobDescriptor, FileArchiver_ArchiveItemDescriptor, FileCheckerJobDescriptor, FileDescriptor, FileExecJobDescriptor, FileExportJobDescriptor, FileFormats, FileMoverJobDescriptor, JobDescriptor, JobTypes, LexJobDescriptor, LinkerJobDescriptor, LogLineSeverities, MailArchiverJobDescriptor, MailQueryJobDescriptor, MailSenderJobDescriptor, MigrationJobDescriptor, NSOCreatorTxtJobDescriptor, NSODetacherJobDescriptor, NSOSenderWsJobDescriptor, NSOValidatorJobDescriptor, PDFArchiverJobDescriptor, PdDCreatorJobDescriptor, PdVArchiverJobDescriptor, PdVQueryJobDescriptor, PdVSenderJobDescriptor, PeppolQueryJobDescriptor, PeppolSenderJobDescriptor, PostelQueryJobDescriptor, PostelSenderJobDescriptor, QueryDescriptor, ReplicatorJobDescriptor, SAPAlignerJobDescriptor, SAPBarcodeJobDescriptor, SAPDataReaderJobDescriptor, SAPDataWriterJobDescriptor, SignerJobDescriptor, SpoolArchiverJobDescriptor, TopMediaServiceClient, UpdaterJobDescriptor, Updater_UpdateItemDescriptor, BooleanExpressionDescriptor, HttpAddressDescriptor, BasketDescriptor, BasketStatus, CommandSetDescriptor, DataSetDescriptor, PDFCommandSetDescriptor, ProcessDescriptor, ProcessCompleteReasons, LogLineDescriptor, ScheduleDescriptor, UserDescriptor, ChangePswDescriptor, UserLevels, ProcessHistoryLogDescriptor, MetadataDataTypes, OrchPlatformDescriptor, SearchResultDescriptor, DataListDescriptor, SignCertDescriptor, PINInfo, TSADescriptor, ScheduleDailyFrequency, ScheduleDuration, ScheduleRecurringMonthly, ScheduleRecurringWeekly, ScheduleRecurringDescriptor, ProcessNotificationDescriptor, UpsertDescriptor, BarcodeArchiver_ArchiveItemDescriptor, BarcodeArchiver_MetadataMappingDescriptor, MetadataMappingDescriptor, CommandBaseDescriptor, PDFCommandBaseDescriptor, PDFCommandTypes, SecureOperDescriptor, PDFArchiver_ArchiveItemDescriptor, PDFTextItemDescriptor, HomePage, TreeDescriptor, TreeContext, SavedQueryDescriptor, Replicator_ArchiveItemDescriptor, NotificationDescriptor, WorkingGroupDescriptor, WGTreeDescriptor, BlogPost, DossierDescriptor, WFDescriptor, ObjectClasses, ObjectRef, TaskDescriptor, RecentCategories, LayoutModes, LicenseDescriptor, RelationDescriptor, RelationTypes, RetrieveFileOptions, LayoutDescriptor, MetadataValueDescriptor, MailBoxDescriptor, MailArchiver_FolderDescriptor, MailClientTypes, MailFolderDescriptor, TID_DID, MailSender_MailFormatDescriptor, MailArchiver_WholeMailCfgDescriptor, MailSender_GroupingDescriptor, MailSender_MailPropertyMappingDescriptor, MailSender_AttachmentCfgDescriptor, MailArchiver_AttachmentCfgItemDescriptor, MailArchiver_MetadataMappingDescriptor, ADMRetrieveDcmtDescriptor, CassettoDoganalePlusJobDescriptor, NumeratorDescriptor, DataTableDescriptor, SignServerDescriptor, LDAPDescriptor, GroupDescriptor, FEDistillerJobDescriptor, FreeSearchDescriptor, MailQuery_ArchiveItemDescriptor, MetadataDescriptor, IndexDescriptor, VersioningDescriptor, CassettoFiscaleSenderJobDescriptor, CassettoFiscaleQueryJobDescriptor, TraceDescriptor, SAPLoginDescriptor, DcmtTypeGranteesPermission, ObjectGranteesPermission, CreateOperations, AccessLevels, CreatePermissionDescriptor, SignerInfoDescriptor, DossierTypeDescriptor, DossierDetail, Ds_ClassIDs } from "./openAPIs/TopMediaServiceClient";
+import { ArchiveDescriptor, AreaDescriptor, AreaFileDescriptor, BarcodeArchiverJobDescriptor, BarcodeDetectionDescriptor, BasketTypeDescriptor, BatchUpdaterJobDescriptor, COSCheckerJobDescriptor, CassettoDoganaleJobDescriptor, CheckSequenceJobDescriptor, CultureIDs, DcmtConverterJobDescriptor, DcmtDeleterJobDescriptor, DcmtNoteJobDescriptor, DcmtPrinterJobDescriptor, DcmtTypeDescriptor, DiskDescriptor, FEAttacherJobDescriptor, FECreatorTxtJobDescriptor, FEDetacherJobDescriptor, FESenderWsJobDescriptor, FESplitterJobDescriptor, FEValidatorJobDescriptor, FileArchiverJobDescriptor, FileArchiver_ArchiveItemDescriptor, FileCheckerJobDescriptor, FileDescriptor, FileExecJobDescriptor, FileExportJobDescriptor, FileFormats, FileMoverJobDescriptor, JobDescriptor, JobTypes, LexJobDescriptor, LinkerJobDescriptor, LogLineSeverities, MailArchiverJobDescriptor, MailQueryJobDescriptor, MailSenderJobDescriptor, MigrationJobDescriptor, NSOCreatorTxtJobDescriptor, NSODetacherJobDescriptor, NSOSenderWsJobDescriptor, NSOValidatorJobDescriptor, PDFArchiverJobDescriptor, PdDCreatorJobDescriptor, PdVArchiverJobDescriptor, PdVQueryJobDescriptor, PdVSenderJobDescriptor, PeppolQueryJobDescriptor, PeppolSenderJobDescriptor, PostelQueryJobDescriptor, PostelSenderJobDescriptor, QueryDescriptor, ReplicatorJobDescriptor, SAPAlignerJobDescriptor, SAPBarcodeJobDescriptor, SAPDataReaderJobDescriptor, SAPDataWriterJobDescriptor, SignerJobDescriptor, SpoolArchiverJobDescriptor, TopMediaServiceClient, UpdaterJobDescriptor, Updater_UpdateItemDescriptor, BooleanExpressionDescriptor, HttpAddressDescriptor, BasketDescriptor, BasketStatus, CommandSetDescriptor, DataSetDescriptor, PDFCommandSetDescriptor, ProcessDescriptor, ProcessCompleteReasons, LogLineDescriptor, ScheduleDescriptor, UserDescriptor, ChangePswDescriptor, UserLevels, ProcessHistoryLogDescriptor, MetadataDataTypes, OrchPlatformDescriptor, SearchResultDescriptor, DataListDescriptor, SignCertDescriptor, PINInfo, TSADescriptor, ScheduleDailyFrequency, ScheduleDuration, ScheduleRecurringMonthly, ScheduleRecurringWeekly, ScheduleRecurringDescriptor, ProcessNotificationDescriptor, UpsertDescriptor, BarcodeArchiver_ArchiveItemDescriptor, BarcodeArchiver_MetadataMappingDescriptor, MetadataMappingDescriptor, CommandBaseDescriptor, PDFCommandBaseDescriptor, PDFCommandTypes, SecureOperDescriptor, PDFArchiver_ArchiveItemDescriptor, PDFTextItemDescriptor, HomePage, TreeDescriptor, TreeContext, SavedQueryDescriptor, Replicator_ArchiveItemDescriptor, NotificationDescriptor, WorkingGroupDescriptor, WGTreeDescriptor, BlogPost, DossierDescriptor, WFDescriptor, ObjectClasses, ObjectRef, TaskDescriptor, RecentCategories, LayoutModes, LicenseDescriptor, RelationDescriptor, RelationTypes, RetrieveFileOptions, LayoutDescriptor, MetadataValueDescriptor, MailBoxDescriptor, MailArchiver_FolderDescriptor, MailClientTypes, MailFolderDescriptor, TID_DID, MailSender_MailFormatDescriptor, MailArchiver_WholeMailCfgDescriptor, MailSender_GroupingDescriptor, MailSender_MailPropertyMappingDescriptor, MailSender_AttachmentCfgDescriptor, MailArchiver_AttachmentCfgItemDescriptor, MailArchiver_MetadataMappingDescriptor, ADMRetrieveDcmtDescriptor, CassettoDoganalePlusJobDescriptor, NumeratorDescriptor, DataTableDescriptor, SignServerDescriptor, LDAPDescriptor, GroupDescriptor, FEDistillerJobDescriptor, FreeSearchDescriptor, MailQuery_ArchiveItemDescriptor, MetadataDescriptor, IndexDescriptor, VersioningDescriptor, CassettoFiscaleSenderJobDescriptor, CassettoFiscaleQueryJobDescriptor, TraceDescriptor, SAPLoginDescriptor, DcmtTypeGranteesPermission, ObjectGranteesPermission, CreateOperations, AccessLevels, CreatePermissionDescriptor, SignerInfoDescriptor, DossierTypeDescriptor, DossierDetail, Ds_ClassIDs, LayoutItemDescriptor } from "./openAPIs/TopMediaServiceClient";
 declare abstract class BaseEngine {
     TopMediaSession: ITopMediaSession;
     constructor(tms: ITopMediaSession);
@@ -100,6 +100,8 @@ export declare class DcmtTypeEngine extends BaseEngine implements IDcmtTypeEngin
     static NormalizeMetadata(d: MetadataDescriptor, isNew?: boolean): MetadataDescriptor | undefined;
     static NewIndexDescriptor(): IndexDescriptor | undefined;
     static NormalizeIndex(d: IndexDescriptor): IndexDescriptor | undefined;
+    static NormalizeLayoutDescriptor(d: LayoutDescriptor | undefined, isNew?: boolean): LayoutDescriptor | undefined;
+    static NormalizeLayoutItemDescriptor(d: LayoutItemDescriptor, isNew?: boolean): LayoutItemDescriptor | undefined;
     CreateAsync(d: DcmtTypeDescriptor): Promise<number | undefined>;
     RetrieveAdminAsync(id: number, localizationID?: CultureIDs): Promise<DcmtTypeDescriptor | undefined>;
     RetrieveAllAdminAsync(withCanUse?: boolean): Promise<DcmtTypeDescriptor[] | undefined>;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@topconsultnpm/sdk-ts",
-    "version": "6.19.0-dev1.7",
+    "version": "6.19.0-dev1.9",
     "description": "TopMedia SDK typescript",
     "main": "dist/lib/index.js",
     "types": "dist/types/index.d.ts",