@lightdash/cli 0.2029.1 → 0.2030.1

package/dist/handlers/download.d.ts

@@ -7,6 +7,7 @@ export type DownloadHandlerOptions = {
     project?: string;
     languageMap: boolean;
     skipSpaceCreate: boolean;
+    includeCharts: boolean;
 };
 export declare const downloadContent: (ids: string[], type: "charts" | "dashboards", projectId: string, customPath?: string, languageMap?: boolean) => Promise<[number, string[]]>;
 export declare const downloadHandler: (options: DownloadHandlerOptions) => Promise<void>;

package/dist/handlers/download.js

@@ -349,6 +349,20 @@ const upsertResources = async (type, projectId, changes, force, slugs, customPat
     }
     return { changes, total: filteredItems.length };
 };
+const getDashboardChartSlugs = async (dashboardSlugs, customPath) => {
+    const dashboardItems = await readCodeFiles('dashboards', customPath);
+    const filteredDashboardItems = dashboardSlugs.length > 0
+        ? dashboardItems.filter((dashboard) => dashboardSlugs.includes(dashboard.slug))
+        : dashboardItems;
+    return filteredDashboardItems.reduce((acc, dashboard) => {
+        const dashboardChartSlugs = dashboard.tiles
+            .map((tile) => 'chartSlug' in tile.properties
+            ? tile.properties.chartSlug
+            : undefined)
+            .filter((dashboardChartSlug) => !!dashboardChartSlug);
+        return [...acc, ...dashboardChartSlugs];
+    }, []);
+};
 const uploadHandler = async (options) => {
     globalState_1.default.setVerbose(options.verbose);
     await (0, apiClient_1.checkLightdashVersion)();
@@ -377,11 +391,18 @@ const uploadHandler = async (options) => {
         // 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) {
+        // Always include the charts from dashboards if includeCharts is true regardless of the charts filters
+        const chartSlugs = options.includeCharts
+            ? Array.from(new Set([
+                ...options.charts,
+                ...(await getDashboardChartSlugs(options.dashboards, options.path)),
+            ]))
+            : options.charts;
+        if (hasFilters && chartSlugs.length === 0) {
             console.info(styles.warning(`No charts filters provided, skipping`));
         }
         else {
-            const { changes: chartChanges, total } = await upsertResources('charts', projectId, changes, options.force, options.charts, options.path, options.skipSpaceCreate);
+            const { changes: chartChanges, total } = await upsertResources('charts', projectId, changes, options.force, chartSlugs, options.path, options.skipSpaceCreate);
             changes = chartChanges;
             chartTotal = total;
         }

package/dist/index.js

@@ -236,6 +236,7 @@ commander_1.program
     .option('-p, --path <path>', 'specify a custom path to upload charts and dashboards from', undefined)
     .option('--project <project uuid>', 'specify a project UUID to upload', parseProjectArgument, undefined)
     .option('--skip-space-create', 'Skip space creation if it does not exist', false)
+    .option('--include-charts', 'Include charts updates when uploading dashboards', false)
     .action(download_1.uploadHandler);
 commander_1.program
     .command('deploy')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightdash/cli",
-  "version": "0.2029.1",
+  "version": "0.2030.1",
   "license": "MIT",
   "bin": {
     "lightdash": "dist/index.js"
@@ -32,8 +32,8 @@
     "parse-node-version": "^2.0.0",
     "unique-names-generator": "^4.7.1",
     "uuid": "^11.0.3",
-    "@lightdash/common": "0.2029.1",
-    "@lightdash/warehouses": "0.2029.1"
+    "@lightdash/common": "0.2030.1",
+    "@lightdash/warehouses": "0.2030.1"
   },
   "description": "Lightdash CLI tool",
   "devDependencies": {