@paroicms/server 1.30.0 → 1.31.0

package/dist/modules/core/leaf/leaf.queries.d.ts

@@ -1,9 +1,9 @@
 import { type DocumentSchema, type SiteSchema } from "@paroicms/anywhere-lib";
 import type { Tracker } from "@paroicms/server-lib";
 import type { EntityManager } from "typeorm";
+import { LeafEntity } from "../../../models/leaf.model";
 import type { SiteContext } from "../../../site-context/site-context.types";
-import type { TermFlagObjectType } from "../term-flag/term-flag.schema";
-import { LeafEntity } from "./leaf.model";
+import type { LabelingObjectType } from "../labeling/labeling.schema";
 export declare function getLeafTypeOf(siteContext: Pick<SiteContext, "cn">, leafId: string): Promise<string>;
 export declare function getDocumentSchemaOf(siteContext: Pick<SiteContext, "cn" | "siteSchema">, leafId: string): Promise<DocumentSchema>;
 export declare function findOneLeaf({ cn }: SiteContext, id: string): Promise<LeafEntity>;
@@ -11,7 +11,7 @@ export declare function setLeafPublishDate(siteContext: SiteContext, { leafId, p
     leafId: string;
     publishDate: Date;
 }): Promise<void>;
-export declare function flaggedWith({ cn }: SiteContext, flaggedId: string): Promise<TermFlagObjectType[]>;
+export declare function loadLabelingTermsOf({ cn }: SiteContext, labeledId: string): Promise<LabelingObjectType[]>;
 export declare function createLeaf(siteSchema: SiteSchema, cn: EntityManager, { parentId, depth, leafType, }: {
     parentId?: string;
     depth?: number;

package/dist/modules/core/leaf/leaf.queries.js

@@ -1,20 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getScheduledLeafs = exports.countLeafChildrenOf = exports.getLeafDepth = exports.createLeaf = exports.flaggedWith = exports.setLeafPublishDate = exports.findOneLeaf = exports.getDocumentSchemaOf = exports.getLeafTypeOf = void 0;
+exports.getScheduledLeafs = exports.countLeafChildrenOf = exports.getLeafDepth = exports.createLeaf = exports.loadLabelingTermsOf = exports.setLeafPublishDate = exports.findOneLeaf = exports.getDocumentSchemaOf = exports.getLeafTypeOf = void 0;
 const common_1 = require("@nestjs/common");
 const data_formatters_lib_1 = require("@paroi/data-formatters-lib");
 const anywhere_lib_1 = require("@paroicms/anywhere-lib");
 const data_format_1 = require("../../../common/data-format");
 const text_cache_1 = require("../../../common/text-cache");
 const relative_id_helper_1 = require("../../../helpers/relative-id-helper");
+const leaf_model_1 = require("../../../models/leaf.model");
 const ddl_migration_1 = require("../../../site-context/db-init/ddl-migration");
-const leaf_model_1 = require("./leaf.model");
 async function getLeafTypeOf(siteContext, leafId) {
     const row = await siteContext.cn
         .createQueryBuilder()
         .select("l.leafType", "leafType")
         .from("PaLeaf", "l")
-        .where("l.id = :leafId", { leafId })
+        .andWhere("l.id = :leafId", { leafId })
         .getRawOne();
     if (!row)
         throw new common_1.NotFoundException(`cannot find leaf '${leafId}'`);
@@ -45,7 +45,7 @@ async function setLeafPublishDate(siteContext, { leafId, publishDate }) {
         .createQueryBuilder()
         .select("l.publishDate", "publishDate")
         .from("PaLeaf", "l")
-        .where("l.id = :leafId", { leafId })
+        .andWhere("l.id = :leafId", { leafId })
         .getRawOne();
     if (!row)
         throw new common_1.NotFoundException(`cannot find leaf '${leafId}'`);
@@ -81,20 +81,20 @@ async function setLeafPublishDate(siteContext, { leafId, publishDate }) {
     }
 }
 exports.setLeafPublishDate = setLeafPublishDate;
-async function flaggedWith({ cn }, flaggedId) {
+async function loadLabelingTermsOf({ cn }, labeledId) {
     const rows = await cn
         .createQueryBuilder()
         .select("f.lead", "lead")
         .addSelect("f.termId", "termId")
         .addSelect("l2.leafType", "parentLeafType")
-        .from("PaTermFlag", "f")
+        .from("PaLabeling", "f")
         .innerJoin("PaLeaf", "l1", "l1.id = f.termId")
         .innerJoin("PaLeaf", "l2", "l2.id = l1.parentId")
-        .where("f.flaggedId = :flaggedId", { flaggedId })
+        .andWhere("f.labeledId = :labeledId", { labeledId })
         .getRawMany();
-    return (0, data_formatters_lib_1.listVal)(rows, data_format_1.formatTermFlagObjectType);
+    return (0, data_formatters_lib_1.listVal)(rows, data_format_1.formatLabelingObjectType);
 }
-exports.flaggedWith = flaggedWith;
+exports.loadLabelingTermsOf = loadLabelingTermsOf;
 async function createLeaf(siteSchema, cn, { parentId, depth, leafType, }) {
     const documentSchema = siteSchema.documentTypes[leafType];
     let leafDepth = depth;
@@ -106,7 +106,7 @@ async function createLeaf(siteSchema, cn, { parentId, depth, leafType, }) {
             .select("leafType", "leafType")
             .addSelect("depth", "depth")
             .from("PaLeaf", "l")
-            .where("l.id = :parentId", { parentId })
+            .andWhere("l.id = :parentId", { parentId })
             .getRawOne();
         if (!row)
             throw new Error(`cannot find parent leaf '${parentId}'`);
@@ -161,7 +161,7 @@ async function getLeafDepth(siteContext, tracker, leafId) {
         .createQueryBuilder()
         .select("l.depth", "depth")
         .from("PaLeaf", "l")
-        .where("l.id = :leafId", { leafId })
+        .andWhere("l.id = :leafId", { leafId })
         .getRawOne();
     tracker.trackAccess(ddl_migration_1.dbSchemaName, "PaLeaf", "read");
     if (!row)
@@ -174,7 +174,7 @@ async function countLeafChildrenOf(siteContext, parendId) {
         .createQueryBuilder()
         .select("count(1)", "cnt")
         .from("PaLeaf", "l")
-        .where("l.parentId = :parendId", { parendId })
+        .andWhere("l.parentId = :parendId", { parendId })
         .getRawOne();
     return (0, data_formatters_lib_1.nbVal)(row?.cnt);
 }
@@ -185,7 +185,7 @@ async function getScheduledLeafs(siteContext) {
         .select("l.id", "id")
         .addSelect("l.publishDate", "publishDate")
         .from("PaLeaf", "l")
-        .where("l.publishDate > current_timestamp")
+        .andWhere("l.publishDate > current_timestamp")
         .getRawMany();
     return rows.map((row) => ({
         leafId: (0, data_formatters_lib_1.strVal)(row.id),
@@ -200,7 +200,7 @@ function isLeafTypeChildOf(siteSchema, { parentLeafType, leafType }) {
         return parentSchema.children?.includes(child.leafType) ?? false;
     }
     for (const listType of parentSchema.partLists ?? []) {
-        if (listType.partLeafTypes.includes(leafType))
+        if (listType.parts.includes(leafType))
             return true;
     }
     return false;

package/dist/modules/core/leaf/leaf.queries.js.map

@@ -1 +1 @@
-{"version":3,"file":"leaf.queries.js","sourceRoot":"","sources":["../../../../src/modules/core/leaf/leaf.queries.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"leaf.queries.js","sourceRoot":"","sources":["../../../../src/modules/core/leaf/leaf.queries.ts"],"names":[],"mappings":";;;AAAA,2CAAwE;AACxE,oEAAmF;AACnF,yDAMgC;AAGhC,6DAAuE;AACvE,2DAKoC;AACpC,4EAA4E;AAC5E,2DAAwD;AACxD,+EAA2E;AAIpE,KAAK,UAAU,aAAa,CACjC,WAAoC,EACpC,MAAc;IAEd,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC,EAAE;SAC7B,kBAAkB,EAAE;SACpB,MAAM,CAAC,YAAY,EAAE,UAAU,CAAC;SAChC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC;SACnB,QAAQ,CAAC,gBAAgB,EAAE,EAAE,MAAM,EAAE,CAAC;SACtC,SAAS,EAAO,CAAC;IACpB,IAAI,CAAC,GAAG;QAAE,MAAM,IAAI,0BAAiB,CAAC,qBAAqB,MAAM,GAAG,CAAC,CAAC;IACtE,OAAO,IAAA,4BAAM,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC9B,CAAC;AAZD,sCAYC;AAEM,KAAK,UAAU,mBAAmB,CACvC,WAAmD,EACnD,MAAc;IAEd,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAC1D,MAAM,YAAY,GAAG,WAAW,CAAC,UAAU,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IACpE,IAAI,CAAC,YAAY;QAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,QAAQ,GAAG,CAAC,CAAC;IAC1E,OAAO,YAAY,CAAC;AACtB,CAAC;AARD,kDAQC;AAEM,KAAK,UAAU,WAAW,CAAC,EAAE,EAAE,EAAe,EAAE,EAAU;IAC/D,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,uBAAU,CAAC,CAAC,OAAO,CAAC;QACtD,KAAK,EAAE;YACL,EAAE;SACH;KACF,CAAC,CAAC;IAEH,IAAI,CAAC,IAAI;QAAE,MAAM,IAAI,0BAAiB,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC;IAChE,OAAO,IAAI,CAAC;AACd,CAAC;AATD,kCASC;AAEM,KAAK,UAAU,kBAAkB,CACtC,WAAwB,EACxB,EAAE,MAAM,EAAE,WAAW,EAAyC;IAG9D,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC,EAAE;SAC7B,kBAAkB,EAAE;SACpB,MAAM,CAAC,eAAe,EAAE,aAAa,CAAC;SACtC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC;SACnB,QAAQ,CAAC,gBAAgB,EAAE,EAAE,MAAM,EAAE,CAAC;SACtC,SAAS,EAAO,CAAC;IACpB,IAAI,CAAC,GAAG;QAAE,MAAM,IAAI,0BAAiB,CAAC,qBAAqB,MAAM,GAAG,CAAC,CAAC;IACtE,MAAM,eAAe,GAAG,IAAA,mCAAa,EAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAGvD,MAAM,WAAW,CAAC,EAAE,CAAC,aAAa,CAAC,uBAAU,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;IAG/E,MAAM,EAAE,GAAG,IAAI,IAAI,CAAC,WAAW,CAAC,CAAC;IACjC,MAAM,KAAK,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAC3B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,MAAM,YAAY,GAAG,eAAe,KAAK,SAAS,IAAI,IAAI,IAAI,CAAC,eAAe,CAAC,CAAC,OAAO,EAAE,IAAI,GAAG,CAAC;IAEjG,MAAM,QAAQ,GAAG,IAAA,mCAAsB,EAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IACpD,IAAI,KAAK,IAAI,GAAG,EAAE,CAAC;QAEjB,IAAI,YAAY,EAAE,CAAC;YAEjB,MAAM,IAAA,kCAAqB,EAAC,WAAW,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QACvD,CAAC;aAAM,CAAC;YAEN,MAAM,aAAa,GAAG,MAAM,IAAA,uCAA0B,EAAC,WAAW,EAAE;gBAClE,cAAc,EAAE,MAAM;gBACtB,QAAQ,EAAE,UAAU;aACrB,CAAC,CAAC;YACH,MAAM,WAAW,CAAC,SAAS,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;YACtD,MAAM,WAAW,CAAC,SAAS,CAAC,2BAA2B,CAAC,QAAQ,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;SAAM,CAAC;QAEN,IAAI,YAAY,EAAE,CAAC;YAEjB,MAAM,IAAA,+CAAkC,EAAC,WAAW,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACjF,CAAC;QAED,MAAM,aAAa,GAAG,MAAM,IAAA,uCAA0B,EAAC,WAAW,EAAE;YAClE,cAAc,EAAE,MAAM;YACtB,QAAQ,EAAE,UAAU;SACrB,CAAC,CAAC;QACH,MAAM,WAAW,CAAC,SAAS,CAAC,oBAAoB,CAAC,QAAQ,EAAE,aAAa,EAAE,EAAE,CAAC,CAAC;IAChF,CAAC;AACH,CAAC;AAnDD,gDAmDC;AAEM,KAAK,UAAU,mBAAmB,CACvC,EAAE,EAAE,EAAe,EACnB,SAAiB;IAEjB,MAAM,IAAI,GAAG,MAAM,EAAE;SAClB,kBAAkB,EAAE;SACpB,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC;SACxB,SAAS,CAAC,UAAU,EAAE,QAAQ,CAAC;SAC/B,SAAS,CAAC,aAAa,EAAE,gBAAgB,CAAC;SAC1C,IAAI,CAAC,YAAY,EAAE,GAAG,CAAC;SACvB,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,kBAAkB,CAAC;SAC7C,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,qBAAqB,CAAC;SAChD,QAAQ,CAAC,0BAA0B,EAAE,EAAE,SAAS,EAAE,CAAC;SACnD,UAAU,EAAO,CAAC;IAErB,OAAO,IAAA,6BAAO,EAAC,IAAI,EAAE,sCAAwB,CAAC,CAAC;AACjD,CAAC;AAhBD,kDAgBC;AAEM,KAAK,UAAU,UAAU,CAC9B,UAAsB,EACtB,EAAiB,EACjB,EACE,QAAQ,EACR,KAAK,EACL,QAAQ,GAKT;IAGD,MAAM,cAAc,GAAG,UAAU,CAAC,aAAa,CAAC,QAAQ,CAA+B,CAAC;IAExF,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAExD,MAAM,GAAG,GAAG,MAAM,EAAE;aACjB,kBAAkB,EAAE;aACpB,MAAM,CAAC,UAAU,EAAE,UAAU,CAAC;aAC9B,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC;aAC3B,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC;aACnB,QAAQ,CAAC,kBAAkB,EAAE,EAAE,QAAQ,EAAE,CAAC;aAC1C,SAAS,EAAO,CAAC;QACpB,IAAI,CAAC,GAAG;YAAE,MAAM,IAAI,KAAK,CAAC,4BAA4B,QAAQ,GAAG,CAAC,CAAC;QACnE,MAAM,UAAU,GAAG;YACjB,QAAQ,EAAE,IAAA,4BAAM,EAAC,GAAG,CAAC,QAAQ,CAAC;YAC9B,KAAK,EAAE,IAAA,2BAAK,EAAC,GAAG,CAAC,KAAK,CAAC;SACxB,CAAC;QACF,SAAS,GAAG,UAAU,CAAC,KAAK,GAAG,CAAC,CAAC;QAEjC,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,EAAE,QAAQ,EAAE,cAAc,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC;YACtF,MAAM,IAAI,4BAAmB,CAAC,2BAA2B,UAAU,CAAC,QAAQ,GAAG,CAAC,CAAC;QACnF,CAAC;IACH,CAAC;IAED,MAAM,cAAc,GAAG,0BAA0B,CAC/C,cAAc,EAAE,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,mBAAmB,CAAC,CAAC,CAAC,SAAS,CACpF,CAAC;IACF,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,OAAO,IAAI,EAAE,CAAC;QACZ,MAAM,aAAa,GAAG,cAAc,EAAE,CAAC;QACvC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,EAAE;iBACpB,kBAAkB,EAAE;iBACpB,MAAM,EAAE;iBACR,IAAI,CAAC,QAAQ,CAAC;iBACd,MAAM,CAAC;gBACN,QAAQ;gBACR,UAAU,EAAE,aAAa;gBACzB,KAAK,EAAE,SAAS;gBAChB,QAAQ;gBACR,WAAW,EAAE,GAAG,EAAE,CAAC,mBAAmB;aACvC,CAAC;iBACD,OAAO,EAAE,CAAC;YACb,MAAM,KAAK,GAAG,IAAA,4BAAM,EAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;YACtE,OAAO,MAAM,EAAE,CAAC,aAAa,CAAC,uBAAU,CAAC,CAAC,aAAa,CAAC;gBACtD,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE;aACrB,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,EAAE,OAAO,KAAK,EAAE;gBAAE,MAAM,GAAG,CAAC;QAElC,CAAC;IACH,CAAC;AACH,CAAC;AAnED,gCAmEC;AAED,SAAS,0BAA0B,CAAC,GAA+B;IACjE,MAAM,SAAS,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC;IACxC,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,MAAM,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,IAAA,2BAAK,EAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACxE,OAAO,GAAG,EAAE,CAAC,IAAA,0CAAqB,EAAC,EAAE,IAAI,EAAE,CAAC,CAAC;IAC/C,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,kCAAkC,SAAS,GAAG,CAAC,CAAC;AAClE,CAAC;AAEM,KAAK,UAAU,YAAY,CAChC,WAAoC,EACpC,OAAgB,EAChB,MAAc;IAEd,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC,EAAE;SAC7B,kBAAkB,EAAE;SACpB,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC;SAC1B,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC;SACnB,QAAQ,CAAC,gBAAgB,EAAE,EAAE,MAAM,EAAE,CAAC;SACtC,SAAS,EAAO,CAAC;IACpB,OAAO,CAAC,WAAW,CAAC,4BAAY,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;IACpD,IAAI,CAAC,GAAG;QAAE,MAAM,IAAI,0BAAiB,CAAC,qBAAqB,MAAM,GAAG,CAAC,CAAC;IACtE,OAAO,IAAA,2BAAK,EAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AAC1B,CAAC;AAdD,oCAcC;AAEM,KAAK,UAAU,mBAAmB,CACvC,WAAoC,EACpC,QAAgB;IAEhB,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC,EAAE;SAC7B,kBAAkB,EAAE;SACpB,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC;SACzB,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC;SACnB,QAAQ,CAAC,wBAAwB,EAAE,EAAE,QAAQ,EAAE,CAAC;SAChD,SAAS,EAAO,CAAC;IACpB,OAAO,IAAA,2BAAK,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AACzB,CAAC;AAXD,kDAWC;AAEM,KAAK,UAAU,iBAAiB,CACrC,WAAoC;IAEpC,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,EAAE;SAC9B,kBAAkB,EAAE;SACpB,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC;SACpB,SAAS,CAAC,eAAe,EAAE,aAAa,CAAC;SACzC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC;SACnB,QAAQ,CAAC,mCAAmC,CAAC;SAC7C,UAAU,EAAO,CAAC;IACrB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACxB,MAAM,EAAE,IAAA,4BAAM,EAAC,GAAG,CAAC,EAAE,CAAC;QACtB,WAAW,EAAE,IAAA,4BAAM,EAAC,GAAG,CAAC,WAAW,CAAC;KACrC,CAAC,CAAC,CAAC;AACN,CAAC;AAdD,8CAcC;AAED,SAAS,iBAAiB,CACxB,UAAsB,EACtB,EAAE,cAAc,EAAE,QAAQ,EAAgD;IAE1E,MAAM,YAAY,GAAG,IAAA,wCAAyB,EAAC,UAAU,EAAE,cAAc,CAAC,CAAC;IAC3E,IAAI,UAAU,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC;QACvC,MAAM,KAAK,GAAG,UAAU,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QACjD,OAAO,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,KAAK,CAAC;IAClE,CAAC;IAED,KAAK,MAAM,QAAQ,IAAI,YAAY,CAAC,SAAS,IAAI,EAAE,EAAE,CAAC;QACpD,IAAI,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAAE,OAAO,IAAI,CAAC;IACrD,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}

package/dist/modules/core/leaf/leaf.resolver.d.ts

@@ -1,9 +1,10 @@
 import type { GraphqlContext } from "../../graphql.types";
-import { TermFlagObjectType } from "../term-flag/term-flag.schema";
+import { LabelingObjectType } from "../labeling/labeling.schema";
 import { LeafObjectType } from "./leaf.schema";
 export declare class LeafResolver {
-    flaggedWith({ fqdn }: GraphqlContext, { id }: LeafObjectType): Promise<TermFlagObjectType[]>;
+    labeledBy({ fqdn }: GraphqlContext, { id }: LeafObjectType): Promise<LabelingObjectType[]>;
     planned({ publishDate }: LeafObjectType): boolean;
     setLeafPublishDate({ fqdn }: GraphqlContext, leafId: string, publishDate: Date): Promise<LeafObjectType>;
-    reorderLeafItems({ fqdn }: GraphqlContext, leafIds: string[], parentLeafId: string, listName: string): Promise<string[]>;
+    reorderDocuments({ fqdn }: GraphqlContext, leafIds: string[], parentLeafId: string): Promise<string[]>;
+    reorderParts({ fqdn }: GraphqlContext, leafIds: string[], parentLeafId: string, listName: string): Promise<string[]>;
 }

package/dist/modules/core/leaf/leaf.resolver.js

@@ -18,13 +18,13 @@ const graphql_1 = require("@nestjs/graphql");
 const data_format_1 = require("../../../common/data-format");
 const site_context_1 = require("../../../site-context/site-context");
 const jwt_auth_guard_1 = require("../auth/jwt.auth.guard");
-const leaf_item_queries_1 = require("../leaf-item/leaf-item.queries");
-const term_flag_schema_1 = require("../term-flag/term-flag.schema");
+const labeling_schema_1 = require("../labeling/labeling.schema");
 const leaf_queries_1 = require("./leaf.queries");
 const leaf_schema_1 = require("./leaf.schema");
+const ordered_leaf_queries_1 = require("./ordered-leaf.queries");
 let LeafResolver = class LeafResolver {
-    async flaggedWith({ fqdn }, { id }) {
-        return await (0, leaf_queries_1.flaggedWith)(await (0, site_context_1.getSiteContext)(fqdn), id);
+    async labeledBy({ fqdn }, { id }) {
+        return await (0, leaf_queries_1.loadLabelingTermsOf)(await (0, site_context_1.getSiteContext)(fqdn), id);
     }
     planned({ publishDate }) {
         if (!publishDate)
@@ -39,20 +39,24 @@ let LeafResolver = class LeafResolver {
         });
         return (0, data_format_1.leafEntityToObjectType)(await (0, leaf_queries_1.findOneLeaf)(siteContext, leafId));
     }
-    async reorderLeafItems({ fqdn }, leafIds, parentLeafId, listName) {
+    async reorderDocuments({ fqdn }, leafIds, parentLeafId) {
         const siteContext = await (0, site_context_1.getSiteContext)(fqdn);
-        return (0, leaf_item_queries_1.reorderLeafItems)(siteContext, leafIds, parentLeafId, listName);
+        return (0, ordered_leaf_queries_1.reorderLeafs)(siteContext, { leafIds, parentLeafId });
+    }
+    async reorderParts({ fqdn }, leafIds, parentLeafId, listName) {
+        const siteContext = await (0, site_context_1.getSiteContext)(fqdn);
+        return (0, ordered_leaf_queries_1.reorderLeafs)(siteContext, { leafIds, parentLeafId, listName });
     }
 };
 exports.LeafResolver = LeafResolver;
 __decorate([
-    (0, graphql_1.ResolveField)(() => [term_flag_schema_1.TermFlagObjectType]),
+    (0, graphql_1.ResolveField)(() => [labeling_schema_1.LabelingObjectType]),
     __param(0, (0, graphql_1.Context)()),
     __param(1, (0, graphql_1.Parent)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, leaf_schema_1.LeafObjectType]),
     __metadata("design:returntype", Promise)
-], LeafResolver.prototype, "flaggedWith", null);
+], LeafResolver.prototype, "labeledBy", null);
 __decorate([
     (0, graphql_1.ResolveField)(() => Boolean),
     __param(0, (0, graphql_1.Parent)()),
@@ -69,6 +73,15 @@ __decorate([
     __metadata("design:paramtypes", [Object, String, Date]),
     __metadata("design:returntype", Promise)
 ], LeafResolver.prototype, "setLeafPublishDate", null);
+__decorate([
+    (0, graphql_1.Mutation)(() => [String]),
+    __param(0, (0, graphql_1.Context)()),
+    __param(1, (0, graphql_1.Args)("leafIds", { type: () => [String] })),
+    __param(2, (0, graphql_1.Args)("parentLeafId", { type: () => String })),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Array, String]),
+    __metadata("design:returntype", Promise)
+], LeafResolver.prototype, "reorderDocuments", null);
 __decorate([
     (0, graphql_1.Mutation)(() => [String]),
     __param(0, (0, graphql_1.Context)()),
@@ -78,7 +91,7 @@ __decorate([
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Array, String, String]),
     __metadata("design:returntype", Promise)
-], LeafResolver.prototype, "reorderLeafItems", null);
+], LeafResolver.prototype, "reorderParts", null);
 exports.LeafResolver = LeafResolver = __decorate([
     (0, common_1.UseGuards)(jwt_auth_guard_1.JwtAuthGuard),
     (0, graphql_1.Resolver)(() => leaf_schema_1.LeafObjectType)

package/dist/modules/core/leaf/leaf.resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"leaf.resolver.js","sourceRoot":"","sources":["../../../../src/modules/core/leaf/leaf.resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"leaf.resolver.js","sourceRoot":"","sources":["../../../../src/modules/core/leaf/leaf.resolver.ts"],"names":[],"mappings":"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"}

package/dist/modules/core/leaf/ordered-leaf.queries.d.ts

@@ -0,0 +1,7 @@
+import type { SiteContext } from "../../../site-context/site-context.types";
+export declare function getOrderNumOf({ cn }: SiteContext, leafId: string): Promise<number | undefined>;
+export declare function reorderLeafs(siteContext: SiteContext, { leafIds, parentLeafId, listName, }: {
+    leafIds: string[];
+    parentLeafId: string;
+    listName?: string;
+}): Promise<string[]>;

package/dist/modules/core/leaf/ordered-leaf.queries.js

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.reorderLeafs = exports.getOrderNumOf = void 0;
+const data_formatters_lib_1 = require("@paroi/data-formatters-lib");
+const text_cache_1 = require("../../../common/text-cache");
+const ordered_leaf_model_1 = require("../../../models/ordered-leaf.model");
+async function getOrderNumOf({ cn }, leafId) {
+    const row = await cn
+        .createQueryBuilder()
+        .select("o.orderNum", "orderNum")
+        .from("PaOrderedLeaf", "o")
+        .andWhere("o.leafId = :leafId", { leafId })
+        .getRawOne();
+    return (0, data_formatters_lib_1.nbValOrUndef)(row?.orderNum);
+}
+exports.getOrderNumOf = getOrderNumOf;
+async function reorderLeafs(siteContext, { leafIds, parentLeafId, listName, }) {
+    const { cn } = siteContext;
+    const query = cn
+        .createQueryBuilder()
+        .select("l.id", "leafId")
+        .addSelect("o.orderNum", "orderNum")
+        .from("PaLeaf", "l")
+        .innerJoin("PaOrderedLeaf", "o", "l.id = o.leafId")
+        .andWhere("l.parentId = :parentLeafId", { parentLeafId })
+        .orderBy("o.orderNum", "ASC")
+        .addOrderBy("l.id", "ASC");
+    if (listName) {
+        query.innerJoin("PaPartLeaf", "p", "p.leafId = l.id");
+        query.andWhere("p.listName = :listName", { listName });
+    }
+    const rows = await query.getRawMany();
+    const oldItems = rows.map((row) => ({
+        leafId: (0, data_formatters_lib_1.strVal)(row.leafId),
+        orderNum: (0, data_formatters_lib_1.nbVal)(row.orderNum),
+    }));
+    let orderNum = 1;
+    const newItems = [];
+    for (const leafId of leafIds) {
+        newItems.push({ leafId, orderNum });
+        ++orderNum;
+    }
+    for (const item of oldItems) {
+        if (!leafIds.includes(item.leafId)) {
+            newItems.push({ leafId: item.leafId, orderNum });
+            ++orderNum;
+        }
+    }
+    await cn.transaction(async (tx) => {
+        const repo = tx.getRepository(ordered_leaf_model_1.OrderedLeafEntity);
+        for (const newItem of newItems) {
+            if (oldItems.find((old) => old.leafId === newItem.leafId)) {
+                await repo.update({ leafId: newItem.leafId }, { orderNum: newItem.orderNum });
+            }
+            else {
+                await repo.insert({
+                    leafId: newItem.leafId,
+                    orderNum: newItem.orderNum,
+                });
+            }
+        }
+    });
+    await (0, text_cache_1.invalidateMultipleDocumentsInCache)(siteContext, { leafId: parentLeafId });
+    return leafIds;
+}
+exports.reorderLeafs = reorderLeafs;
+//# sourceMappingURL=ordered-leaf.queries.js.map

package/dist/modules/core/leaf/ordered-leaf.queries.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ordered-leaf.queries.js","sourceRoot":"","sources":["../../../../src/modules/core/leaf/ordered-leaf.queries.ts"],"names":[],"mappings":"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"}

package/dist/modules/core/part/part-leaf.queries.d.ts

@@ -0,0 +1,9 @@
+import type { QueryBuilderConnection } from "@paroicms/server-lib";
+export declare function createPartLeaf(cn: QueryBuilderConnection, { leafId, listName, parentId, documentLeafId, isOrdered, }: {
+    leafId: string;
+    listName: string;
+    parentId: string;
+    documentLeafId: string;
+    isOrdered: boolean;
+}): Promise<void>;
+export declare function shiftPartLeafOrdersAfterDeletion(cn: QueryBuilderConnection, leafId: string): Promise<void>;

package/dist/modules/core/part/part-leaf.queries.js

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.shiftPartLeafOrdersAfterDeletion = exports.createPartLeaf = void 0;
+const common_1 = require("@nestjs/common");
+const data_formatters_lib_1 = require("@paroi/data-formatters-lib");
+async function createPartLeaf(cn, { leafId, listName, parentId, documentLeafId, isOrdered, }) {
+    await cn
+        .createQueryBuilder()
+        .insert()
+        .into("PaPartLeaf")
+        .values({ leafId, listName, documentLeafId })
+        .execute();
+    if (isOrdered) {
+        const row = await cn
+            .createQueryBuilder()
+            .select("max(o.orderNum)", "orderNum")
+            .from("PaLeaf", "l")
+            .innerJoin("PaPartLeaf", "p", "p.leafId = l.id")
+            .innerJoin("PaOrderedLeaf", "o", "o.leafId = l.id")
+            .andWhere("l.parentId = :parentId", { parentId })
+            .andWhere("p.listName = :listName", { listName })
+            .getRawOne();
+        await cn
+            .createQueryBuilder()
+            .insert()
+            .into("PaOrderedLeaf")
+            .values({ leafId, orderNum: ((0, data_formatters_lib_1.nbValOrUndef)(row?.orderNum) ?? 0) + 1 })
+            .execute();
+    }
+}
+exports.createPartLeaf = createPartLeaf;
+async function shiftPartLeafOrdersAfterDeletion(cn, leafId) {
+    const row = await cn
+        .createQueryBuilder()
+        .addSelect("l.parentId", "parentId")
+        .addSelect("p.listName", "listName")
+        .addSelect("o.orderNum", "orderNum")
+        .from("PaPartLeaf", "p")
+        .innerJoin("PaOrderedLeaf", "o", "o.leafId = p.leafId")
+        .andWhere("p.leafId = :leafId", { leafId })
+        .getRawOne();
+    if (!row)
+        throw new common_1.NotFoundException(`part-leaf '${leafId}' not found`);
+    const parentId = (0, data_formatters_lib_1.strVal)(row.parentId);
+    const listName = (0, data_formatters_lib_1.strVal)(row.listName);
+    const orderNum = (0, data_formatters_lib_1.nbVal)(row.orderNum);
+    await cn
+        .createQueryBuilder()
+        .update("PaOrderedLeaf")
+        .set({ orderNum: () => "orderNum - 1" })
+        .andWhere("PaOrderedLeaf.orderNum > :orderNum", { orderNum })
+        .andWhere(`exists (
+  select 1 
+  from PaLeaf l
+  inner join PaPartLeaf p on p.leafId = l.id
+  where PaOrderedLeaf.leafId = l.id
+  and l.parentId = :parentId
+  and p.listName = :listName
+)`, { listName, parentId })
+        .execute();
+}
+exports.shiftPartLeafOrdersAfterDeletion = shiftPartLeafOrdersAfterDeletion;
+//# sourceMappingURL=part-leaf.queries.js.map

package/dist/modules/core/part/part-leaf.queries.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"part-leaf.queries.js","sourceRoot":"","sources":["../../../../src/modules/core/part/part-leaf.queries.ts"],"names":[],"mappings":";;;AAAA,2CAAmD;AACnD,oEAAyE;AAIlE,KAAK,UAAU,cAAc,CAClC,EAA0B,EAC1B,EACE,MAAM,EACN,QAAQ,EACR,QAAQ,EACR,cAAc,EACd,SAAS,GAOV;IAED,MAAM,EAAE;SACL,kBAAkB,EAAE;SACpB,MAAM,EAAE;SACR,IAAI,CAAC,YAAY,CAAC;SAClB,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC;SAC5C,OAAO,EAAE,CAAC;IAEb,IAAI,SAAS,EAAE,CAAC;QACd,MAAM,GAAG,GAAG,MAAM,EAAE;aACjB,kBAAkB,EAAE;aACpB,MAAM,CAAC,iBAAiB,EAAE,UAAU,CAAC;aACrC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC;aACnB,SAAS,CAAC,YAAY,EAAE,GAAG,EAAE,iBAAiB,CAAC;aAC/C,SAAS,CAAC,eAAe,EAAE,GAAG,EAAE,iBAAiB,CAAC;aAClD,QAAQ,CAAC,wBAAwB,EAAE,EAAE,QAAQ,EAAE,CAAC;aAChD,QAAQ,CAAC,wBAAwB,EAAE,EAAE,QAAQ,EAAE,CAAC;aAChD,SAAS,EAAO,CAAC;QAEpB,MAAM,EAAE;aACL,kBAAkB,EAAE;aACpB,MAAM,EAAE;aACR,IAAI,CAAC,eAAe,CAAC;aACrB,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,IAAA,kCAAY,EAAC,GAAG,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;aACpE,OAAO,EAAE,CAAC;IACf,CAAC;AACH,CAAC;AAzCD,wCAyCC;AAEM,KAAK,UAAU,gCAAgC,CAAC,EAA0B,EAAE,MAAc;IAC/F,MAAM,GAAG,GAAG,MAAM,EAAE;SACjB,kBAAkB,EAAE;SACpB,SAAS,CAAC,YAAY,EAAE,UAAU,CAAC;SACnC,SAAS,CAAC,YAAY,EAAE,UAAU,CAAC;SACnC,SAAS,CAAC,YAAY,EAAE,UAAU,CAAC;SACnC,IAAI,CAAC,YAAY,EAAE,GAAG,CAAC;SACvB,SAAS,CAAC,eAAe,EAAE,GAAG,EAAE,qBAAqB,CAAC;SACtD,QAAQ,CAAC,oBAAoB,EAAE,EAAE,MAAM,EAAE,CAAC;SAC1C,SAAS,EAAO,CAAC;IAEpB,IAAI,CAAC,GAAG;QAAE,MAAM,IAAI,0BAAiB,CAAC,cAAc,MAAM,aAAa,CAAC,CAAC;IAEzE,MAAM,QAAQ,GAAG,IAAA,4BAAM,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACtC,MAAM,QAAQ,GAAG,IAAA,4BAAM,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACtC,MAAM,QAAQ,GAAG,IAAA,2BAAK,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAErC,MAAM,EAAE;SACL,kBAAkB,EAAE;SACpB,MAAM,CAAC,eAAe,CAAC;SACvB,GAAG,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,cAAc,EAAE,CAAC;SACvC,QAAQ,CAAC,oCAAoC,EAAE,EAAE,QAAQ,EAAE,CAAC;SAC5D,QAAQ,CACP;;;;;;;EAOJ,EACI,EAAE,QAAQ,EAAE,QAAQ,EAAE,CACvB;SACA,OAAO,EAAE,CAAC;AAgCf,CAAC;AAjED,4EAiEC"}

package/dist/modules/core/part/part.queries.d.ts

@@ -1,7 +1,7 @@
 import { type ParsedSectionId } from "@paroicms/anywhere-lib";
 import type { SiteContext } from "../../../site-context/site-context.types";
 import type { PartObjectType, PartPlaceholderObjectType } from "./part.schema";
-export declare function createPartOnLeaf(siteContext: SiteContext, sectionId: ParsedSectionId): Promise<ParsedSectionId>;
+export declare function createPartOnLeaf(siteContext: SiteContext, newId: ParsedSectionId): Promise<ParsedSectionId>;
 export declare function createLeafWithPart(siteContext: SiteContext, { parentSectionId, listName, leafType, }: {
     parentSectionId: ParsedSectionId;
     listName: string;

package/dist/modules/core/part/part.queries.js

@@ -7,53 +7,65 @@ const anywhere_lib_1 = require("@paroicms/anywhere-lib");
 const media_handles_helpers_1 = require("../../../common/media-handles.helpers");
 const text_cache_1 = require("../../../common/text-cache");
 const utils_helper_1 = require("../../../helpers/utils-helper");
+const leaf_model_1 = require("../../../models/leaf.model");
+const section_model_1 = require("../../../models/section.model");
 const load_documents_queries_1 = require("../document/load-documents.queries");
-const leaf_item_queries_1 = require("../leaf-item/leaf-item.queries");
-const leaf_model_1 = require("../leaf/leaf.model");
 const leaf_queries_1 = require("../leaf/leaf.queries");
-const section_model_1 = require("../section/section.model");
 const section_queries_1 = require("../section/section.queries");
-async function createPartOnLeaf(siteContext, sectionId) {
-    const newId = await siteContext.cn.transaction(async (tx) => {
-        return await createPartOnLeafWithManager(sectionId, { cn: tx });
-    });
-    await (0, text_cache_1.invalidateDocumentInCache)(siteContext, { parentOf: sectionId });
+const part_leaf_queries_1 = require("./part-leaf.queries");
+async function createPartOnLeaf(siteContext, newId) {
+    await siteContext.cn
+        .getRepository(section_model_1.SectionEntity)
+        .save({ lang: newId.language, leafId: newId.leafId, ready: true });
+    await (0, text_cache_1.invalidateDocumentInCache)(siteContext, { parentOf: newId });
     return newId;
 }
 exports.createPartOnLeaf = createPartOnLeaf;
 async function createLeafWithPart(siteContext, { parentSectionId, listName, leafType, }) {
     const { language, leafId: parentLeafId } = parentSectionId;
-    const parentLeafType = await (0, leaf_queries_1.getLeafTypeOf)(siteContext, parentLeafId);
+    const row = await siteContext.cn
+        .createQueryBuilder()
+        .select("l.leafType", "leafType")
+        .addSelect("p.documentLeafId", "documentLeafId")
+        .from("PaLeaf", "l")
+        .leftJoin("PaPartLeaf", "p", "p.leafId = l.id")
+        .andWhere("l.id = :leafId", { leafId: parentLeafId })
+        .getRawOne();
+    if (!row)
+        throw new common_1.NotFoundException(`cannot find part-leaf '${parentLeafId}'`);
+    const parentLeafType = (0, data_formatters_lib_1.strVal)(row.leafType);
+    const documentLeafId = (0, data_formatters_lib_1.strValOrUndef)(row.documentLeafId) ?? parentLeafId;
     const parentDocumentType = (0, anywhere_lib_1.getDocumentTypeByLeafType)(siteContext.siteSchema, parentLeafType);
     const listType = parentDocumentType.partLists?.find((l) => l.listName === listName);
     if (!listType) {
-        throw new common_1.BadRequestException(`listName '${listName}' not found in document '${parentLeafType}'`);
+        throw new common_1.BadRequestException(`unknown list '${listName}' in document type '${parentLeafType}'`);
     }
-    if (listType.partLimit !== undefined) {
-        const count = await countLeafItemsOfList(siteContext, {
-            listName: listType.listName,
+    if (listType.limit !== undefined) {
+        const count = await countPartsOfList(siteContext, {
+            listName,
             parentLeafId,
         });
-        if (count >= listType.partLimit)
+        if (count >= listType.limit)
             throw new common_1.BadRequestException("maximum parts reached");
     }
-    if (!listType.partLeafTypes.includes(leafType)) {
+    if (!listType.parts.includes(leafType)) {
         throw new common_1.BadRequestException({
             code: "invalid_section_type_for_this_list_name",
-            message: `Invalid sectionType leafType: '${leafType}' for listName '${listType.listName}'`,
+            message: `Invalid sectionType leafType: '${leafType}' for listName '${listName}'`,
         });
     }
     const newId = await siteContext.cn.transaction(async (tx) => {
         const leaf = await (0, leaf_queries_1.createLeaf)(siteContext.siteSchema, tx, { parentId: parentLeafId, leafType });
-        await (0, leaf_item_queries_1.createLeafItem)(siteContext, {
-            leafId: leaf.id,
-            listName: listType.listName,
+        const { id: leafId } = leaf;
+        await (0, part_leaf_queries_1.createPartLeaf)(tx, {
+            leafId,
+            listName,
             parentId: parentLeafId,
+            documentLeafId,
+            isOrdered: !!listType.orderBy,
         });
-        if (!leaf)
-            throw new Error("PartService, createLeafWithPart: Unexpected error");
-        const { id: leafId } = leaf;
-        return await createPartOnLeafWithManager({ language, leafId }, { cn: tx });
+        await tx.getRepository(section_model_1.SectionEntity).save({ lang: language, leafId, ready: true });
+        return { language, leafId };
     });
     await (0, text_cache_1.invalidateDocumentInCache)(siteContext, { documentId: parentSectionId });
     return newId;
@@ -67,7 +79,7 @@ async function loadPart(siteContext, sectionId) {
         .innerJoin("PaSection", "s", "s.leafId = l.id and s.lang = :language", {
         language: sectionId.language,
     })
-        .where("l.id = :leafId", { leafId: sectionId.leafId })
+        .andWhere("l.id = :leafId", { leafId: sectionId.leafId })
         .andWhere("not exists (select 1 from PaDocument d where d.leafId = l.id)")
         .getRawOne();
     if (!row)
@@ -91,12 +103,12 @@ async function deletePart(siteContext, sectionId) {
         await sectionRepo.delete((0, utils_helper_1.toDbId)(sectionId));
         const shouldDeleteLeaf = await (0, section_queries_1.isOrphanLeaf)(tx, sectionId.leafId);
         if (shouldDeleteLeaf) {
-            await (0, leaf_item_queries_1.updatePartsItemNumAfterDeletetion)(siteContext, sectionId.leafId);
+            await (0, part_leaf_queries_1.shiftPartLeafOrdersAfterDeletion)(tx, sectionId.leafId);
             await tx
                 .createQueryBuilder()
                 .delete()
                 .from("PaFieldVarchar")
-                .where("leafId = :leafId", { leafId: sectionId.leafId })
+                .andWhere("leafId = :leafId", { leafId: sectionId.leafId })
                 .execute();
             await tx.getRepository(leaf_model_1.LeafEntity).delete({ id: sectionId.leafId });
         }
@@ -114,21 +126,20 @@ exports.deletePart = deletePart;
 async function partsOf({ cn }, { listNames, parentId, }) {
     const parts = await cn
         .createQueryBuilder()
-        .select("i.itemNum", "itemNum")
-        .addSelect("i.leafId", "leafId")
+        .addSelect("l.id", "leafId")
+        .addSelect("l.leafType", "leafType")
+        .addSelect("o.orderNum", "orderNum")
         .addSelect("s.lang", "language")
         .addSelect("s.leafId", "sectionLeafId")
-        .addSelect("l.leafType", "leafType")
         .from("PaLeaf", "l")
-        .innerJoin("PaLeafItem", "i", "i.leafId = l.id and i.listName in (:...listNames)", {
-        listNames,
-    })
+        .innerJoin("PaPartLeaf", "p", "p.leafId = l.id")
+        .leftJoin("PaOrderedLeaf", "o", "o.leafId = l.id")
         .leftJoin("PaSection", "s", "s.leafId = l.id and s.lang = :language", {
         language: parentId.language,
     })
-        .where("l.parentId = :parentId", { parentId: parentId.leafId })
-        .andWhere("not exists (select 1 from PaDocument d where d.leafId = l.id)")
-        .orderBy("i.itemNum", "ASC")
+        .andWhere("l.parentId = :parentId", { parentId: parentId.leafId })
+        .andWhere("p.listName in (:...listNames)", { listNames })
+        .orderBy("o.orderNum", "ASC")
         .getRawMany();
     return parts.map((item) => {
         if ((0, data_formatters_lib_1.strValOrUndef)(item.sectionLeafId) === undefined) {
@@ -151,19 +162,14 @@ async function partsOf({ cn }, { listNames, parentId, }) {
     });
 }
 exports.partsOf = partsOf;
-async function createPartOnLeafWithManager({ language, leafId }, { cn, }) {
-    await cn.getRepository(section_model_1.SectionEntity).save({ lang: language, leafId, ready: true });
-    return { language, leafId };
-}
-async function countLeafItemsOfList({ cn }, { listName, parentLeafId, }) {
+async function countPartsOfList({ cn }, { listName, parentLeafId, }) {
     const row = await cn
         .createQueryBuilder()
         .addSelect("count(1)", "cnt")
         .from("PaLeaf", "l")
-        .innerJoin("PaLeafItem", "i", "i.leafId = l.id and i.listName = :listName", {
-        listName,
-    })
-        .where("l.parentId = :parentId", { parentId: parentLeafId })
+        .innerJoin("PaPartLeaf", "p", "p.leafId = l.id")
+        .andWhere("l.parentId = :parentId", { parentId: parentLeafId })
+        .andWhere("p.listName = :listName", { listName })
         .getRawOne();
     return (0, data_formatters_lib_1.nbVal)(row?.cnt);
 }