Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@agility/cli",
"version": "1.0.0",
"version": "1.0.0-beta.11",
"description": "Agility CLI for working with your content. (Public Beta)",
"repository": {
"type": "git",
Expand Down
4 changes: 0 additions & 4 deletions src/core/logs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -922,10 +922,6 @@ export class Logs {
// Log to file using logger summary
this.summary(this.operationType, totalSuccessful, totalFailed, 0);

// Console output
console.log(ansiColors.cyan("\nSummary:"));
console.log(`Processed ${results.length} GUID/locale combinations`);
console.log(`${totalSuccessful} successful, ${totalFailed} failed`);
console.log(`Total time: ${timeDisplay}`);

// Success/failure message
Expand Down
1 change: 0 additions & 1 deletion src/lib/mappers/gallery-mapper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ export class GalleryMapper {
}

getGalleryMapping(gallery: mgmtApi.assetMediaGrouping, type: 'source' | 'target'): GalleryMapping | null {
debugger;
const mapping = this.mappings.find((m: GalleryMapping) =>
type === 'source' ? m.sourceMediaGroupingID === gallery.mediaGroupingID : m.targetMediaGroupingID === gallery.mediaGroupingID
);
Expand Down
2 changes: 1 addition & 1 deletion src/lib/pushers/model-pusher.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export async function pushModels(sourceData: mgmtApi.Model[], targetData: mgmtAp


// special case for the default RichTextArea model
const defaultRichTextArea = model.referenceName === 'RichTextArea' && hasSourceChanged && hasTargetChanged;
const defaultRichTextArea = model.referenceName === 'RichTextArea' && !mapping && targetModel;
if(defaultRichTextArea){
// force create the mapping for the default RichTextArea model
referenceMapper.addMapping(model, targetModel);
Expand Down
2 changes: 1 addition & 1 deletion src/lib/pushers/orchestrate-pushers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ export class Pushers {
(Array.isArray(elementData) && elementData.length === 0) ||
!elements.some((element) => config.elements.includes(element))
) {
console.log(ansiColors.gray(`Skipping ${config.description} - no data or not requested`));
console.log(ansiColors.yellow(`⚠️ Skipping ${config.description} for locale ${locale} - no data or filtered by --locales`));
return;
}

Expand Down
7 changes: 7 additions & 0 deletions src/lib/pushers/page-pusher/process-sitemap.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,13 @@ interface Props {
// This is separate from pagesInProgress which tracks concurrent processing
const processedPageIDs = new Set<number>();

/**
* Reset the processed page IDs tracking - should be called at the start of each pushPages operation
*/
export function resetProcessedPageIDs(): void {
processedPageIDs.clear();
}

export async function processSitemap({
channel,
pageMapper,
Expand Down
23 changes: 17 additions & 6 deletions src/lib/pushers/page-pusher/push-pages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { state, getApiClient, getLoggerForGuid } from "core/state";
import { PusherResult } from "../../../types/sourceData";
import { SitemapHierarchy } from "lib/pushers/page-pusher/sitemap-hierarchy";
import { PageMapper } from "lib/mappers/page-mapper";
import { processSitemap } from "./process-sitemap";
import { processSitemap, resetProcessedPageIDs } from "./process-sitemap";
import ansiColors from "ansi-colors";

export async function pushPages(
Expand All @@ -24,6 +24,9 @@ export async function pushPages(

const sitemapHierarchy = new SitemapHierarchy();

// Reset processed page IDs tracking for this locale
resetProcessedPageIDs();

const sitemaps = sitemapHierarchy.loadAllSitemaps(sourceGuid[0], locale);
const channels = Object.keys(sitemaps);

Expand All @@ -40,6 +43,12 @@ export async function pushPages(
for (const channel of channels) {
const sitemap = sitemaps[channel];

// Skip if sitemap is null or empty
if (!sitemap || sitemap.length === 0) {
console.log(ansiColors.yellow(`⚠️ Skipping channel ${channel} - no sitemap data found for locale ${locale}`));
continue;
}

const { sourceGuid, targetGuid, overwrite } = state;
const apiClient = getApiClient();

Expand All @@ -59,12 +68,14 @@ export async function pushPages(
logger
})

successful = res.successful;
failed = res.failed;
skipped = res.skipped;
publishableIds = res.publishableIds;
successful += res.successful;
failed += res.failed;
skipped += res.skipped;
if (res.publishableIds && res.publishableIds.length > 0) {
publishableIds.push(...res.publishableIds);
}

if (failed > 0) {
if (res.failed > 0) {
status = "error";
}

Expand Down
25 changes: 18 additions & 7 deletions src/lib/pushers/page-pusher/sitemap-hierarchy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,24 @@ export class SitemapHierarchy {

const sitemaps: { [key: string]: SitemapNode[] | null } = {};

fs.readdirSync(sitemapDir).forEach(fileName => {
if (!fileName.endsWith('.json')) {
return; // Skip non-JSON files
}
const channel = path.basename(fileName, '.json');
sitemaps[channel] = this.loadNestedSitemap(path.join(sitemapDir, fileName));
});
// Check if directory exists before trying to read it
if (!fs.existsSync(sitemapDir)) {
console.warn(`⚠️ Nested sitemap directory not found for locale ${locale}: ${sitemapDir}`);
return sitemaps; // Return empty object if directory doesn't exist
}

try {
fs.readdirSync(sitemapDir).forEach(fileName => {
if (!fileName.endsWith('.json')) {
return; // Skip non-JSON files
}
const channel = path.basename(fileName, '.json');
sitemaps[channel] = this.loadNestedSitemap(path.join(sitemapDir, fileName));
});
} catch (error: any) {
console.error(`Error reading sitemap directory ${sitemapDir}: ${error.message}`);
return sitemaps; // Return empty object on error
}

return sitemaps;
}
Expand Down