@lightdash/cli 0.1420.0 → 0.1420.2

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

@@ -52,9 +52,13 @@ export declare const lightdashApi: <T extends string | boolean | unknown[] | imp
 } | {
     charts: import("@lightdash/common").ChartAsCode[];
     missingIds: string[];
+    total: number;
+    offset: number;
 } | {
     dashboards: import("@lightdash/common").DashboardAsCode[];
     missingIds: string[];
+    total: number;
+    offset: number;
 } | {
     edges: import("@lightdash/common").CatalogMetricsTreeEdge[];
 } | import("@lightdash/common").MetricTotalResults | null | undefined>({ method, url, body, }: LightdashApiProps) => Promise<T>;

package/dist/handlers/download.js

@@ -29,7 +29,7 @@ const parseContentFilters = (items) => {
 };
 const dumpIntoFiles = async (folder, items) => {
     const outputDir = path.join(process.cwd(), DOWNLOAD_FOLDER, folder);
-    console.info(`Writing ${items.length} ${folder} into ${outputDir}`);
+    globalState_1.default.debug(`Writing ${items.length} ${folder} into ${outputDir}`);
     // Make directory
     const created = await fs_1.promises.mkdir(outputDir, { recursive: true });
     if (created)
@@ -103,45 +103,80 @@ const downloadHandler = async (options) => {
         console.info(styles.warning(`No charts filters provided, skipping`));
     }
     else {
-        globalState_1.default.debug(`Downloading charts`);
+        const spinner = globalState_1.default.startSpinner(`Downloading charts`);
         const chartFilters = parseContentFilters(options.charts);
-        const chartsAsCode = await (0, apiClient_1.lightdashApi)({
-            method: 'GET',
-            url: `/api/v1/projects/${projectId}/charts/code${chartFilters}`,
-            body: undefined,
-        });
-        chartsAsCode.missingIds.forEach((missingId) => {
-            console.warn(styles.warning(`No chart with id "${missingId}"`));
-        });
-        await dumpIntoFiles('charts', chartsAsCode.charts);
+        let chartsAsCode;
+        let offset = 0;
+        do {
+            globalState_1.default.debug(`Downloading charts with offset "${offset}" and filters "${chartFilters}"`);
+            const queryParams = chartFilters
+                ? `${chartFilters}&offset=${offset}`
+                : `?offset=${offset}`;
+            chartsAsCode = await (0, apiClient_1.lightdashApi)({
+                method: 'GET',
+                url: `/api/v1/projects/${projectId}/charts/code${queryParams}`,
+                body: undefined,
+            });
+            spinner.start(`Downloaded ${chartsAsCode.offset} of ${chartsAsCode.total} charts`);
+            chartsAsCode.missingIds.forEach((missingId) => {
+                console.warn(styles.warning(`\nNo chart with id "${missingId}"`));
+            });
+            await dumpIntoFiles('charts', chartsAsCode.charts);
+            offset = chartsAsCode.offset;
+        } while (chartsAsCode.offset < chartsAsCode.total);
+        spinner.succeed(`Downloaded ${chartsAsCode.total} charts`);
     }
     // Download dashboards
     if (hasFilters && options.dashboards.length === 0) {
         console.info(styles.warning(`No dashboards filters provided, skipping`));
     }
     else {
-        globalState_1.default.debug(`Downloading dashboards`);
+        const spinner = globalState_1.default.startSpinner(`Downloading dashboards`);
         const dashboardFilters = parseContentFilters(options.dashboards);
-        const dashboardsAsCode = await (0, apiClient_1.lightdashApi)({
-            method: 'GET',
-            url: `/api/v1/projects/${projectId}/dashboards/code${dashboardFilters}`,
-            body: undefined,
-        });
-        dashboardsAsCode.missingIds.forEach((missingId) => {
-            console.warn(styles.warning(`No dashboard with id "${missingId}"`));
-        });
-        await dumpIntoFiles('dashboards', dashboardsAsCode.dashboards);
+        let offset = 0;
+        let dashboardsAsCode;
+        do {
+            globalState_1.default.debug(`Downloading dashboards with offset "${offset}" and filters "${dashboardFilters}"`);
+            const queryParams = dashboardFilters
+                ? `${dashboardFilters}&offset=${offset}`
+                : `?offset=${offset}`;
+            dashboardsAsCode = await (0, apiClient_1.lightdashApi)({
+                method: 'GET',
+                url: `/api/v1/projects/${projectId}/dashboards/code${queryParams}`,
+                body: undefined,
+            });
+            dashboardsAsCode.missingIds.forEach((missingId) => {
+                console.warn(styles.warning(`\nNo dashboard with id "${missingId}"`));
+            });
+            spinner?.start(`Downloaded ${dashboardsAsCode.offset} of ${dashboardsAsCode.total} dashboards`);
+            await dumpIntoFiles('dashboards', dashboardsAsCode.dashboards);
+            offset = dashboardsAsCode.offset;
+        } while (dashboardsAsCode.offset < dashboardsAsCode.total);
+        spinner.succeed(`Downloaded ${dashboardsAsCode.total} dashboards`);
     }
     // TODO delete files if chart don't exist ?*/
 };
 exports.downloadHandler = downloadHandler;
+const getPromoteAction = (action) => {
+    switch (action) {
+        case common_1.PromotionAction.CREATE:
+            return 'created';
+        case common_1.PromotionAction.UPDATE:
+            return 'updated';
+        case common_1.PromotionAction.DELETE:
+            return 'deleted';
+        case common_1.PromotionAction.NO_CHANGES:
+            return 'skipped';
+        default:
+            (0, common_1.assertUnreachable)(action, `Unknown promotion action: ${action}`);
+    }
+    return 'skipped';
+};
 const storeUploadChanges = (changes, promoteChanges) => {
     const getPromoteChanges = (resource) => {
         const promotions = promoteChanges[resource];
         return promotions.reduce((acc, promoteChange) => {
-            const action = promoteChange.action === common_1.PromotionAction.NO_CHANGES
-                ? 'skipped'
-                : promoteChange.action;
+            const action = getPromoteAction(promoteChange.action);
             const key = `${resource} ${action}`;
             acc[key] = (acc[key] ?? 0) + 1;
             return acc;
@@ -223,8 +258,21 @@ const uploadHandler = async (options) => {
         throw new Error('No project selected. Run lightdash config set-project');
     }
     let changes = {};
-    changes = await upsertResources('charts', projectId, changes, options.force, options.charts);
-    changes = await upsertResources('dashboards', projectId, changes, options.force, options.dashboards);
+    // If any filter is provided, we skip those items without filters
+    // eg: if a --charts filter is provided, we skip dashboards if no --dashboards filter is provided
+    const hasFilters = options.charts.length > 0 || options.dashboards.length > 0;
+    if (hasFilters && options.charts.length === 0) {
+        console.info(styles.warning(`No charts filters provided, skipping`));
+    }
+    else {
+        changes = await upsertResources('charts', projectId, changes, options.force, options.charts);
+    }
+    if (hasFilters && options.dashboards.length === 0) {
+        console.info(styles.warning(`No dashboard filters provided, skipping`));
+    }
+    else {
+        changes = await upsertResources('dashboards', projectId, changes, options.force, options.dashboards);
+    }
     logUploadChanges(changes);
 };
 exports.uploadHandler = uploadHandler;

package/package.json

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