@lightdash/cli 0.1386.4 → 0.1387.1

package/dist/handlers/dbt/apiClient.d.ts

@@ -49,9 +49,6 @@ export declare const lightdashApi: <T extends string | boolean | unknown[] | imp
     owner: string;
 } | import("@lightdash/common").KnexPaginatedData<import("@lightdash/common").ApiMetricsCatalogResults> | import("@lightdash/common").MetricsExplorerQueryResults | import("@lightdash/common").KnexPaginatedData<import("@lightdash/common").Group[] | import("@lightdash/common").GroupWithMembers[]> | {
     tagUuid: string;
-} | import("@lightdash/common").ChartAsCode[] | {
-    chart: import("@lightdash/common").ChartAsCode;
-    created: boolean;
-} | null | undefined>({ method, url, body, }: LightdashApiProps) => Promise<T>;
+} | import("@lightdash/common").ChartAsCode[] | null | undefined>({ method, url, body, }: LightdashApiProps) => Promise<T>;
 export declare const checkLightdashVersion: () => Promise<void>;
 export {};

package/dist/handlers/download.js

@@ -70,7 +70,22 @@ const uploadHandler = async (options) => {
             const filePath = path.join(inputDir, file);
             const fileContent = await fs_1.promises.readFile(filePath, 'utf-8');
             const chart = yaml.load(fileContent);
-            charts.push(chart);
+            const fileUpdatedAt = (await fs_1.promises.stat(filePath)).mtime;
+            // We override the updatedAt to the file's updatedAt
+            // in case there were some changes made locally
+            // do not override if the file was just created
+            const downloadedAt = chart.downloadedAt
+                ? new Date(chart.downloadedAt)
+                : undefined;
+            const needsUpdating = downloadedAt &&
+                Math.abs(fileUpdatedAt.getTime() - downloadedAt.getTime()) >
+                    30000;
+            const locallyUpdatedChart = {
+                ...chart,
+                updatedAt: needsUpdating ? fileUpdatedAt : chart.updatedAt,
+                needsUpdating: needsUpdating ?? true, // if downloadAt is not set, we force the update
+            };
+            charts.push(locallyUpdatedChart);
         }
     }
     catch (error) {
@@ -82,21 +97,51 @@ const uploadHandler = async (options) => {
     console.info(`Found ${charts.length} chart files`);
     let created = 0;
     let updated = 0;
+    let deleted = 0;
+    let skipped = 0;
+    let spacesCreated = 0;
+    let spacesUpdated = 0;
     try {
         for (const chart of charts) {
+            if (!chart.needsUpdating) {
+                globalState_1.default.debug(`Skipping chart "${chart.slug}" with no local changes`);
+                skipped += 1;
+                // eslint-disable-next-line no-continue
+                continue;
+            }
             globalState_1.default.debug(`Upserting chart ${chart.slug}`);
             const chartData = await (0, apiClient_1.lightdashApi)({
                 method: 'POST',
                 url: `/api/v1/projects/${projectId}/charts/${chart.slug}/code`,
                 body: JSON.stringify(chart),
             });
-            if (chartData.created) {
-                created += 1;
-                globalState_1.default.debug(`Created chart: ${chart.name}`);
+            globalState_1.default.debug(`Chart "${chart.name}": ${chartData.charts[0].action}`);
+            switch (chartData.spaces[0].action) {
+                case common_1.PromotionAction.CREATE:
+                    spacesCreated += 1;
+                    break;
+                case common_1.PromotionAction.UPDATE:
+                    spacesUpdated += 1;
+                    break;
+                default:
+                // ignore the rest
             }
-            else {
-                updated += 1;
-                globalState_1.default.debug(`Updated chart: ${chart.name}`);
+            switch (chartData.charts[0].action) {
+                case common_1.PromotionAction.CREATE:
+                    created += 1;
+                    break;
+                case common_1.PromotionAction.UPDATE:
+                    updated += 1;
+                    break;
+                case common_1.PromotionAction.DELETE:
+                    deleted += 1;
+                    break;
+                case common_1.PromotionAction.NO_CHANGES:
+                    skipped += 1;
+                    break;
+                default:
+                    globalState_1.default.debug(`Unknown action: ${chartData.charts[0].action}`);
+                    break;
             }
         }
     }
@@ -105,5 +150,10 @@ const uploadHandler = async (options) => {
     }
     console.info(`Total charts created: ${created} `);
     console.info(`Total charts updated: ${updated} `);
+    console.info(`Total charts skipped: ${skipped} `);
+    if (deleted > 0)
+        console.info(`Total charts deleted: ${deleted} `); // We should not delete charts from the CLI
+    console.info(`Total spaces created: ${spacesCreated} `);
+    console.info(`Total spaces updated: ${spacesUpdated} `);
 };
 exports.uploadHandler = uploadHandler;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@lightdash/cli",
-    "version": "0.1386.4",
+    "version": "0.1387.1",
     "license": "MIT",
     "bin": {
         "lightdash": "dist/index.js"
@@ -11,8 +11,8 @@
     ],
     "dependencies": {
         "@actions/core": "^1.11.1",
-        "@lightdash/common": "^0.1386.4",
-        "@lightdash/warehouses": "^0.1386.4",
+        "@lightdash/common": "^0.1387.1",
+        "@lightdash/warehouses": "^0.1387.1",
         "@types/columnify": "^1.5.1",
         "ajv": "^8.11.0",
         "ajv-formats": "^2.1.1",