proca 1.7.8 → 1.8.3

package/src/commands/widget/list.mjs

@@ -1,38 +1,46 @@
-import { Args, Flags } from "@oclif/core";
+import { Args, Flags, Help } from "@oclif/core";
 import { error, stdout, ux } from "@oclif/core/ux";
 import Command from "#src/procaCommand.mjs";
 import { FragmentSummary, FragmentSummaryOrg } from "#src/queries/widget.mjs";
 import { gql, query } from "#src/urql.mjs";
 
+export const getWidgetList = (params) => {
+  const d = new WidgetList([]);
+  return d.fetch(params);
+};
+
 export default class WidgetList extends Command {
-	static description = "list all the widgets of an org or campaign";
+  static description = "list all the widgets of an org or campaign";
+
+  static examples = ["<%= config.bin %> <%= command.id %> -o <organisation>"];
 
-	static examples = ["<%= config.bin %> <%= command.id %> -o <organisation>"];
+  //  static aliases = ["campaign:widget:get", "org:widget:get"]; let's rewrite them for better aliasing
 
-	static flags = {
-		// flag with no value (-f, --force)
-		...super.globalFlags,
-		org: Flags.string({
-			char: "o",
-			exactlyOne: ["campaign", "org"],
-			description: "widgets of the organisation (coordinator or partner)",
-			helpValue: "<organisation name>",
-			//      required: true,
-		}),
-		campaign: Flags.string({
-			char: "c",
-			description: "widgets of the campaign (coordinator or partner)",
-			helpValue: "<campaign name>",
-			//      required: true,
-		}),
-		config: Flags.boolean({
-			description: "get the config",
-			default: false,
-			allowNo: true,
-		}),
-	};
-	fetchCampaign = async (name) => {
-		const Document = gql`
+  static flags = {
+    // flag with no value (-f, --force)
+    ...super.globalFlags,
+    org: Flags.string({
+      char: "o",
+      //      exactlyOne: ["campaign", "org"], actually, we can filter on both
+      description: "widgets of the organisation (coordinator or partner)",
+      helpValue: "<organisation name>",
+      exactlyOne: ["campaign", "org"],
+      //      required: true,
+    }),
+    campaign: Flags.string({
+      char: "c",
+      description: "widgets of the campaign (coordinator or partner)",
+      helpValue: "<campaign name>",
+      //      required: true,
+    }),
+    config: Flags.boolean({
+      description: "get the config",
+      default: false,
+      allowNo: true,
+    }),
+  };
+  fetchCampaign = async (name) => {
+    const Document = gql`
 query SearchWidgets($campaign: String!, $withConfig: Boolean!) {
   campaign (name:$campaign) { ...on PrivateCampaign {
     actionPages {
@@ -47,15 +55,20 @@ query SearchWidgets($campaign: String!, $withConfig: Boolean!) {
   }
 ${FragmentSummary}
 }`;
-		const result = await query(Document, {
-			campaign: name,
-			withConfig: this.flags.config,
-		});
-		return result.campaign.actionPages;
-	};
+    const result = await query(Document, {
+      campaign: name,
+      withConfig: this.flags.config,
+    });
+    if (this.flags.org) {
+      return result.campaign.actionPages.filter(
+        (d) => d.org.name === this.flags.org,
+      );
+    }
+    return result.campaign.actionPages;
+  };
 
-	fetchOrg = async (name) => {
-		const Document = gql`
+  fetchOrg = async (name) => {
+    const Document = gql`
 query SearchWidgets($org: String!, $withConfig: Boolean!) {
   org (name:$org) {
     actionPages {
@@ -70,53 +83,53 @@ query SearchWidgets($org: String!, $withConfig: Boolean!) {
   }
 ${FragmentSummaryOrg}
 }`;
-		const result = await query(Document, {
-			org: name,
-			withConfig: this.flags.config,
-		});
-		return result.org.actionPages;
-	};
+    const result = await query(Document, {
+      org: name,
+      withConfig: this.flags.config,
+    });
+    return result.org.actionPages;
+  };
 
-	simplify = (d) => {
-		const result = {
-			id: d.id,
-			name: d.name,
-			locale: d.locale,
-			status: d.status.toLowerCase(),
-			location: d.location?.startsWith("https://widget.proca.app")
-				? undefined
-				: d.location || undefined,
-			//			live: d.live,
+  simplify = (d) => {
+    const result = {
+      id: d.id,
+      name: d.name,
+      locale: d.locale,
+      status: d.status.toLowerCase(),
+      location: d.location?.startsWith("https://widget.proca.app")
+        ? undefined
+        : d.location || undefined,
+      //			live: d.live,
 
-			//      thankYouTemplate: d.thankYouTemplate || undefined,
-			//      thankYouTemplateRef: d.thankYouTemplateRef || undefined,
-			// supporterConfirmTemplate: d.supporterConfirmTemplate || undefined,
-		};
-		if (d.extraSupporters > 0) {
-			result.extra = d.extraSupporters;
-		}
-		//		if (d.journey) result.journey = d.journey.join(" → ");
-		if (d.org) {
-			result.org = d.org.name;
-			result.org_id = d.org.id;
-		}
-		if (d.campaign) {
-			result.campaign = d.campaign.name;
-		}
-		if (this.flags.config) {
-		}
-		return result;
-	};
+      //      thankYouTemplate: d.thankYouTemplate || undefined,
+      //      thankYouTemplateRef: d.thankYouTemplateRef || undefined,
+      // supporterConfirmTemplate: d.supporterConfirmTemplate || undefined,
+    };
+    if (d.extraSupporters > 0) {
+      result.extra = d.extraSupporters;
+    }
+    //		if (d.journey) result.journey = d.journey.join(" → ");
+    if (d.org) {
+      result.org = d.org.name;
+      result.org_id = d.org.id;
+    }
+    if (d.campaign) {
+      result.campaign = d.campaign.name;
+    }
+    if (this.flags.config) {
+    }
+    return result;
+  };
 
-	table = (r) => {
-		super.table(r, null, (table) => table.sort(["id|des"]).toString());
-	};
+  table = (r) => {
+    super.table(r, null, (table) => table.sort(["id|des"]).toString());
+  };
 
-	async run() {
-		const { flags, args } = await this.parse(WidgetList);
-		let data = [];
-		if (flags.org) data = await this.fetchOrg(flags.org);
-		if (flags.campaign) data = await this.fetchCampaign(flags.campaign);
-		return this.output(data);
-	}
+  async run() {
+    const { flags } = await this.parse(WidgetList);
+    let data = [];
+    if (flags.org) data = await this.fetchOrg(flags.org);
+    if (flags.campaign) data = await this.fetchCampaign(flags.campaign);
+    return this.output(data);
+  }
 }

package/src/commands/widget/rebuild.mjs

@@ -0,0 +1,64 @@
+import { Flags } from "@oclif/core";
+import { mergeAndConcat as merge } from "merge-anything";
+import WidgetGet from "#src/commands/widget/get.mjs";
+import Command from "#src/procaCommand.mjs";
+import { gql, mutation } from "#src/urql.mjs";
+
+export default class WidgetRebuild extends Command {
+  static description = "(re)build a widget";
+
+  static examples = [
+    "<%= config.bin %> widget rebuild 42",
+    "<%= config.bin %> widget rebuild climate-action/my-org/en",
+    "SEE ALSO:",
+    "<%= config.bin %> campaign widget rebuild   Rebuild all the widgets of a campaign",
+  ];
+
+  static args = this.multiid();
+
+  static flags = {
+    // flag with no value (-f, --force)
+    ...this.flagify({ multiid: true }),
+  };
+
+  rebuild = async ({ widget, timestamp = new Date().toISOString() }) => {
+    //
+    const data = merge(widget, { config: { layout: { update: timestamp } } });
+
+    const PushWidgetDocument = gql`
+mutation updateActionPage($id: Int!, $config: Json!) {
+  updateActionPage(id: $id, input: {config:$config}) {
+    id, name, locale, config
+    ...on PrivateActionPage {
+      status
+      location
+      org {name}
+    }
+  }
+}
+    `;
+    const r = await mutation(PushWidgetDocument, {
+      id: data.id,
+      config: JSON.stringify(data.config),
+    });
+    if (r.errors) {
+      console.log(r);
+      console.log("check your config $npx proca config user");
+      throw new Error(r.errors[0].message || "can't update on the server");
+    }
+    r.updateActionPage.update = data.config.layout.update;
+    return r.updateActionPage;
+  };
+
+  table = (r) => {
+    super.table(r, null, null);
+  };
+
+  async run() {
+    const { flags } = await this.parse();
+    const wapi = new WidgetGet();
+    const widget = await wapi.fetch(flags);
+    const r = await this.rebuild({ widget });
+    return this.output(r);
+  }
+}

package/src/commands/widget/update.mjs

@@ -0,0 +1,174 @@
+import { Args, Flags } from "@oclif/core";
+import { merge } from "merge-anything";
+import WidgetGet from "#src/commands/widget/get.mjs";
+import Command from "#src/procaCommand.mjs";
+import { gql, mutation } from "#src/urql.mjs";
+
+export default class WidgetUpdate extends Command {
+  static description = "Update a widget's properties";
+
+  static examples = [
+    "<%= config.bin %> <%= command.id %> 4454 --name new_widget_name",
+    "<%= config.bin %> <%= command.id %> 4454 --locale fr",
+    "<%= config.bin %> <%= command.id %> 4454 --confirm-optin",
+    "<%= config.bin %> <%= command.id %> 4454 --confirm-optin --dry-run",
+  ];
+
+  static args = this.multiid();
+
+  static flags = {
+    // flag with no value (-f, --force)
+    ...this.flagify({ multiid: true }),
+    rename: Flags.string({
+      char: "n",
+      description: "new name for the widget",
+      helpValue: "<widget name>",
+    }),
+
+    locale: Flags.string({
+      char: "l",
+      description: "change the locale",
+      helpValue: "<locale>",
+    }),
+    color: Flags.string({
+      description: "update color (not yet implemented)",
+      helpValue: "<hex code>",
+    }),
+    "confirm-optin": Flags.boolean({
+      description:
+        "add confirmOptIn (check email snack) to consent.email component ",
+
+      default: false,
+    }),
+    "confirm-action": Flags.boolean({
+      description:
+        "add actionConfirm (check email snack) to consent.email component ",
+
+      default: false,
+    }),
+
+    "dry-run": Flags.boolean({
+      description: "Show changes without updating the widget",
+      default: false,
+    }),
+  };
+
+  fetchWidget = async (params) => {
+    const widgetGet = new WidgetGet([], this.config);
+    return widgetGet.fetch(params);
+  };
+
+  update = async (widgetId, input) => {
+    console.log("Updating widget with input:", input);
+    const Document = gql`
+      mutation UpdateActionPage($id: Int!, $input: ActionPageInput!) {
+        updateActionPage(id: $id, input: $input) {
+          id
+          name
+          locale
+          config
+          thankYouTemplate
+        }
+      }
+    `;
+
+    const payload = {
+      ...input,
+      ...(input.config && typeof input.config !== "string"
+        ? { config: JSON.stringify(input.config) }
+        : {}),
+    };
+
+    const r = await mutation(Document, {
+      id: widgetId,
+      input: payload,
+    });
+
+    return r.updateActionPage;
+  };
+
+  table = (r) => {
+    super.table(r, null, null);
+    if (this.flags.config) {
+      this.prettyJson(r.config);
+    }
+  };
+
+  async run() {
+    const { flags } = await this.parse();
+    const {
+      id,
+      rename,
+      locale,
+      color,
+      "confirm-optin": confirmOptIn,
+      "confirm-action": confirmAction,
+      "dry-run": dryRun,
+    } = flags;
+
+    // Fetch current widget
+    const widget = await this.fetchWidget({ id });
+
+    if (!widget) {
+      this.error("Widget not found");
+    }
+
+    // Validate name
+    if (rename) {
+      const nameParts = renname.split("/");
+      if (nameParts.length < 2) {
+        this.error(
+          "Widget name must follow format: campaign_name/org_name or campaign_name/locale or campaign_name/org_name/locale",
+        );
+      }
+    }
+
+    const input = {
+      name: rename ?? widget.name,
+      locale: locale ?? widget.locale,
+    };
+
+    if (color) {
+      this.error(`Color update requested: ${color} (not yet implemented)`);
+    }
+    if (confirmOptIn || confirmAction) {
+      const act = confirmOptIn ? "confirmOptIn" : "confirmAction";
+      const currentConfig =
+        typeof widget.config === "string"
+          ? JSON.parse(widget.config)
+          : (widget.config ?? {});
+
+      const nextConfig = merge(currentConfig, {
+        component: {
+          consent: {
+            email: {
+              [act]: true,
+            },
+          },
+        },
+      });
+
+      input.config = nextConfig;
+
+      this.log(`✓ Will set consent.email.${act} = true`);
+
+      if (dryRun) {
+        this.log("\n--- DRY RUN ---\n");
+        this.log("FROM:");
+        this.log(JSON.stringify(currentConfig, null, 2));
+        this.log("\nTO:");
+        this.log(JSON.stringify(nextConfig, null, 2));
+        this.log("\n(no mutation executed)");
+        return;
+      }
+    }
+
+    try {
+      const updated = await this.update(widget.id, input);
+      this.log("✓ Widget updated successfully");
+      return this.output(updated);
+    } catch (err) {
+      this.error(`Failed to update widget: ${err.message}`);
+    }
+  }
+}

package/src/config.mjs

@@ -3,47 +3,47 @@ import { join } from "node:path";
 import { config as dotenv } from "dotenv";
 
 export const getFilename = (folder, env = "default") =>
-	join(folder, `${env}.env`);
+  join(folder, `${env}.env`);
 
 export const load = (folder, env = "default") => {
-	const file = getFilename(folder, env);
-	const config = dotenv({ path: file });
+  const file = getFilename(folder, env);
+  const config = dotenv({ path: file });
 
-	return {
-		token: config.parsed.PROCA_TOKEN,
-		url: config.parsed.REACT_APP_API_URL,
-		folder: process.env.PROCA_CONFIG_FOLDER,
-	};
+  return {
+    token: config.parsed.PROCA_TOKEN,
+    url: config.parsed.REACT_APP_API_URL,
+    folder: process.env.PROCA_CONFIG_FOLDER,
+  };
 };
 
 export const get = (file, parsed = false) => {
-	try {
-		if (parsed) {
-			const config = dotenv({ path: file });
-			return config.parsed;
-		}
-		const userConfig = readFileSync(file, "utf8");
-		return userConfig;
-	} catch (e) {
-		if (e.code === "ENOENT") {
-			return undefined;
-		}
-		throw e;
-	}
+  try {
+    if (parsed) {
+      const config = dotenv({ path: file });
+      return config.parsed;
+    }
+    const userConfig = readFileSync(file, "utf8");
+    return userConfig;
+  } catch (e) {
+    if (e.code === "ENOENT") {
+      return undefined;
+    }
+    throw e;
+  }
 };
 
 export const write = (file, content) => {
-	writeFileSync(file, content);
+  writeFileSync(file, content);
 };
 
 export const format = (obj) => {
-	const content = ["# generated by proca-cli"];
-	for (const [key, value] of Object.entries(obj)) {
-		if (value) {
-			content.push(`${key}='${value.replace(/'/g, "''")}'`);
-		} else {
-			content.push(`#${key}= `);
-		}
-	}
-	return content.join("\n");
+  const content = ["# generated by proca-cli"];
+  for (const [key, value] of Object.entries(obj)) {
+    if (value) {
+      content.push(`${key}='${value.replace(/'/g, "''")}'`);
+    } else {
+      content.push(`#${key}= `);
+    }
+  }
+  return content.join("\n");
 };