@learnpack/learnpack 5.0.343 → 5.0.346

package/lib/commands/publish.d.ts

@@ -1,8 +1,14 @@
 import SessionCommand from "../utils/SessionCommand";
+type ExistingAssetInfo = {
+    lang: string;
+    slug: string;
+    exists: boolean;
+    academyId?: number;
+};
 export declare const handleAssetCreation: (sessionPayload: {
     token: string;
     rigobotToken: string;
-}, learnJson: any, selectedLang: string, learnpackDeployUrl: string, b64IndexReadme: string, academyId: number | undefined, all_translations?: string[]) => Promise<any>;
+}, learnJson: any, selectedLang: string, learnpackDeployUrl: string, b64IndexReadme: string, academyId: number | undefined, preflightInfo?: ExistingAssetInfo, all_translations?: string[]) => Promise<any>;
 declare class BuildCommand extends SessionCommand {
     static description: string;
     static flags: {

package/lib/commands/publish.js

@@ -45,7 +45,33 @@ const getLocalizedValue = (translations, lang, fallbackLangs = ["en", "us"]) =>
     const first = firstKey ? translations[firstKey] : "";
     return typeof first === "string" ? first : "";
 };
-const handleAssetCreation = async (sessionPayload, learnJson, selectedLang, learnpackDeployUrl, b64IndexReadme, academyId, all_translations = []) => {
+const getExistingAssetsInfo = async (token, learnJson) => {
+    const availableLangs = getAvailableLangs(learnJson);
+    const results = [];
+    for (const lang of availableLangs) {
+        const assetTitle = getLocalizedValue(learnJson === null || learnJson === void 0 ? void 0 : learnJson.title, lang);
+        if (!assetTitle)
+            continue;
+        let slug = (0, creatorUtilities_1.slugify)(assetTitle).slice(0, 47);
+        slug = `${slug}-${lang}`;
+        // eslint-disable-next-line no-await-in-loop
+        const { exists, academyId } = await api_1.default.doesAssetExists(token, slug);
+        results.push({ lang, slug, exists, academyId });
+    }
+    return results;
+};
+const determinePublishAcademyMode = (existingAssets) => {
+    const academyIds = existingAssets
+        .filter((a) => a.exists && a.academyId !== undefined)
+        .map((a) => a.academyId);
+    const unique = [...new Set(academyIds)];
+    if (unique.length === 0)
+        return { type: "select" };
+    if (unique.length === 1)
+        return { type: "locked", academyId: unique[0] };
+    return { type: "conflict", academies: unique };
+};
+const handleAssetCreation = async (sessionPayload, learnJson, selectedLang, learnpackDeployUrl, b64IndexReadme, academyId, preflightInfo, all_translations = []) => {
     const category = "uncategorized";
     try {
         const user = await api_1.default.validateToken(sessionPayload.token);
@@ -56,15 +82,8 @@ const handleAssetCreation = async (sessionPayload, learnJson, selectedLang, lear
         }
         let slug = (0, creatorUtilities_1.slugify)(assetTitle).slice(0, 47);
         slug = `${slug}-${selectedLang}`;
-        const { exists, academyId: existingAcademyId } = await api_1.default.doesAssetExists(sessionPayload.token, slug);
-        // Compare academy IDs if asset exists and academyId is provided
-        if (exists &&
-            existingAcademyId !== undefined &&
-            academyId !== undefined &&
-            existingAcademyId !== academyId) {
-            console_1.default.warning(`Asset exists in academy ${existingAcademyId}, but attempting to publish to academy ${academyId}. ` +
-                `The asset will be updated in its current academy (${existingAcademyId}).`);
-        }
+        // Use pre-flight info when available to avoid an extra GET request
+        const { exists, academyId: existingAcademyId } = preflightInfo !== null && preflightInfo !== void 0 ? preflightInfo : (await api_1.default.doesAssetExists(sessionPayload.token, slug));
         // const technologies: unknown[] = Array.isArray(learnJson?.technologies) ?
         //   learnJson.technologies :
         //   []
@@ -105,14 +124,19 @@ const handleAssetCreation = async (sessionPayload, learnJson, selectedLang, lear
             return asset;
         }
         console_1.default.info("Asset exists, updating it");
-        const asset = await api_1.default.updateAsset(sessionPayload.token, slug, {
+        const updatePayload = {
             graded: true,
             learnpack_deploy_url: learnpackDeployUrl,
             title: assetTitle,
             category: category,
             description: assetDescription,
             all_translations,
-        });
+        };
+        // Only set academy when the asset has none yet and the user selected one
+        if (existingAcademyId === undefined && academyId !== undefined) {
+            updatePayload.academy_id = academyId;
+        }
+        const asset = await api_1.default.updateAsset(sessionPayload.token, slug, updatePayload);
         try {
             await api_1.default.updateRigoPackage(sessionPayload.rigobotToken.trim(), learnJson.slug, {
                 asset_id: asset.id,
@@ -130,7 +154,7 @@ const handleAssetCreation = async (sessionPayload, learnJson, selectedLang, lear
     }
 };
 exports.handleAssetCreation = handleAssetCreation;
-const createMultiLangAssetFromDisk = async (sessionPayload, learnJson, deployUrl) => {
+const createMultiLangAssetFromDisk = async (sessionPayload, learnJson, deployUrl, selectedAcademyId, existingAssetsInfo = []) => {
     const availableLangs = getAvailableLangs(learnJson);
     if (availableLangs.length === 0) {
         console_1.default.error("No languages found in learn.json.title. Add at least one language (e.g. title.en).");
@@ -150,9 +174,10 @@ const createMultiLangAssetFromDisk = async (sessionPayload, learnJson, deployUrl
             indexReadmeString = "";
         }
         const b64IndexReadme = Buffer.from(indexReadmeString).toString("base64");
+        const preflightInfo = existingAssetsInfo.find((a) => a.lang === lang);
         try {
             // eslint-disable-next-line no-await-in-loop
-            const asset = await (0, exports.handleAssetCreation)(sessionPayload, learnJson, lang, deployUrl, b64IndexReadme, undefined, all_translations);
+            const asset = await (0, exports.handleAssetCreation)(sessionPayload, learnJson, lang, deployUrl, b64IndexReadme, selectedAcademyId, preflightInfo, all_translations);
             if (!asset) {
                 console_1.default.debug("Could not create/update asset for lang", lang);
                 continue;
@@ -230,7 +255,7 @@ class BuildCommand extends SessionCommand_1.default {
         await this.initSession(flags);
     }
     async run() {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         const buildDir = path.join(process.cwd(), "build");
         const { flags } = this.parse(BuildCommand);
         const strict = flags.strict;
@@ -269,17 +294,35 @@ class BuildCommand extends SessionCommand_1.default {
             console_1.default.debug("Building exercises");
             (_c = this.configManager) === null || _c === void 0 ? void 0 : _c.buildIndex();
         }
+        const learnJsonPath = path.join(process.cwd(), "learn.json");
+        if (!fs.existsSync(learnJsonPath)) {
+            this.error("learn.json not found");
+        }
+        const learnJson = JSON.parse(fs.readFileSync(learnJsonPath, "utf-8"));
         const academies = await api_1.default.listUserAcademies(sessionPayload.token);
         if (academies.length === 0) {
             console_1.default.error("It seems you cannot publish tutorials. Make sure you creator subscription is up to date here: https://4geeks.com/profile/subscriptions. If you believe there is an issue you can always contact support@4geeks.com");
             process.exit(1);
         }
-        const { academy, category } = await selectAcademy(academies, sessionPayload.token);
-        const learnJsonPath = path.join(process.cwd(), "learn.json");
-        if (!fs.existsSync(learnJsonPath)) {
-            this.error("learn.json not found");
+        console_1.default.info("Checking existing assets...");
+        const existingAssetsInfo = await getExistingAssetsInfo(sessionPayload.token, learnJson);
+        const academyMode = determinePublishAcademyMode(existingAssetsInfo);
+        let selectedAcademyId;
+        if (academyMode.type === "conflict") {
+            console_1.default.warning(`Some of your assets are associated with different academies ` +
+                `(${academyMode.academies.join(", ")}). ` +
+                `Academy assignment will be skipped to avoid conflicts.`);
+        }
+        else if (academyMode.type === "locked") {
+            const lockedAcademy = academies.find((a) => a.id === academyMode.academyId);
+            console_1.default.info(`This package is associated with academy: ${(_d = lockedAcademy === null || lockedAcademy === void 0 ? void 0 : lockedAcademy.name) !== null && _d !== void 0 ? _d : academyMode.academyId}. Academy cannot be changed.`);
+            selectedAcademyId = academyMode.academyId;
+        }
+        else {
+            // mode === "select": all existing assets have no academy, user picks one
+            const { academy } = await selectAcademy(academies, sessionPayload.token);
+            selectedAcademyId = academy === null || academy === void 0 ? void 0 : academy.id;
         }
-        const learnJson = JSON.parse(fs.readFileSync(learnJsonPath, "utf-8"));
         const zipFilePath = path.join(process.cwd(), `${learnJson.slug}.zip`);
         // Ensure build directory exists
         if (!fs.existsSync(buildDir)) {
@@ -405,7 +448,7 @@ class BuildCommand extends SessionCommand_1.default {
                 console.log(res.data);
                 fs.unlinkSync(zipFilePath);
                 this.removeDirectory(buildDir);
-                await createMultiLangAssetFromDisk({ token: sessionPayload.token, rigobotToken: rigoToken }, learnJson, res.data.url);
+                await createMultiLangAssetFromDisk({ token: sessionPayload.token, rigobotToken: rigoToken }, learnJson, res.data.url, selectedAcademyId, existingAssetsInfo);
             }
             catch (error) {
                 if (axios_1.default.isAxiosError(error)) {