proca 1.7.4 → 1.7.5

package/README.md

@@ -445,20 +445,22 @@ set the mail to target (mtt) params
 
 ```
 USAGE
-  $ proca campaign mtt [ID_NAME_DXID] --from <value> --to <value> [--json | --human |
-    --csv] [--env <value>] [--simplify] [-i <value> | -n <the_short_name> | -x <value>] [--template <value>] [--period
-    <value>] [--email <value>]
+  $ proca campaign mtt [ID_NAME_DXID] [--json | --human | --csv] [--env <value>]
+    [--simplify] [-i <value> | -n <the_short_name> | -x <value>] [--from <value>] [--to <value>] [--template <value>]
+    [--period <value>] [--email <value>] [--cc <value>] [--sender]
 
 FLAGS
   -i, --id=<value>
   -n, --name=<the_short_name>  name
   -x, --dxid=<value>           dxid
+      --cc=<value>             comma-separated list of CC email addresses
       --email=<value>          test email address
       --env=<value>            [default: default] allow to switch between configurations (server or users)
-      --from=<value>           (required) start date (yyyy-mm-dd)
+      --from=<value>           start date (yyyy-mm-dd)
       --period=<value>         [default: 09:09-18:18] period of the day (HH:HH-HH:HH)
+      --sender                 add sender to CC
       --template=<value>       mtt template to use
-      --to=<value>             (required) end date (yyyy-mm-dd)
+      --to=<value>             end date (yyyy-mm-dd)
 
 OUTPUT FLAGS
   --csv            Format output as csv

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "proca",
 	"description": "Access the proca api",
-	"version": "1.7.4",
+	"version": "1.7.5",
 	"author": "Xavier",
 	"bin": {
 		"proca": "proca-cli"

package/src/commands/campaign/get.mjs

@@ -83,6 +83,8 @@ export default class CampaignGet extends Command {
 			result.period = `${hhmm(d.mtt.startAt)}↔${hhmm(d.mtt.endAt)}`;
 			result["test email"] = d.mtt.testEmail;
 			result["mtt template"] = d.mtt.template;
+			result["cc contacts"] = d.mtt.ccContacts?.join(", ");
+			result["cc sender"] = d.mtt.ccSender;
 		}
 		if (this.flags.stats) {
 			result["#Supporters"] = d.stats.supporterCount;

package/src/commands/campaign/mtt.mjs

@@ -17,11 +17,11 @@ export default class CampaignMtt extends Command {
 		...this.flagify({ multiid: true }),
 		from: Flags.string({
 			description: "start date (yyyy-mm-dd)",
-			required: true,
+			required: false,
 		}),
 		to: Flags.string({
 			description: "end date (yyyy-mm-dd)",
-			required: true,
+			required: false,
 		}),
 		template: Flags.string({
 			description: "mtt template to use",
@@ -33,6 +33,13 @@ export default class CampaignMtt extends Command {
 		email: Flags.string({
 			description: "test email address",
 		}),
+		cc: Flags.string({
+			description: "comma-separated list of CC email addresses",
+		}),
+		sender: Flags.boolean({
+			description: "add sender to CC",
+			default: false,
+		}),
 	};
 
 	updateMtt = async (flags) => {
@@ -45,53 +52,67 @@ $mtt: CampaignMttInput!
   updateCampaign (id:$id, name: $name, input: { mtt: $mtt }) {
     id, name
           ...Mtt
-  }
-      ${FragmentMtt}
-}
+        }
+        ${FragmentMtt}
+      }
     `;
+
 		const testEmail = flags.email || `campaign+${flags.name}@proca.app`;
 
 		const [startPeriod, endPeriod] = flags.period.split("-");
 		const [startHour, startMinute] = startPeriod.split(":");
 		const [endHour, endMinute] = endPeriod.split(":");
 
-		const startAt = new Date(flags.from);
-		startAt.setHours(startHour, startMinute, 0, 0);
+		const mtt = {
+			testEmail,
+		};
+
+		if (flags.template) mtt.messageTemplate = flags.template;
+		if (flags.email) mtt.testEmail = testEmail;
+		if (flags.cc) mtt.ccContacts = flags.cc.split(",").map((e) => e.trim());
+		if (flags.sender) mtt.ccSender = flags.sender;
 
-		const endAt = new Date(flags.to);
-		endAt.setHours(endHour, endMinute, 0, 0);
+		if (flags.from) {
+			const startAt = new Date(flags.from);
+			startAt.setHours(startHour, startMinute, 0, 0);
+			mtt.startAt = startAt.toISOString();
+		}
+
+		if (flags.to) {
+			const endAt = new Date(flags.to);
+			endAt.setHours(endHour, endMinute, 0, 0);
+			mtt.endAt = endAt.toISOString();
+		}
 
 		const result = await mutation(Query, {
-			//			org: props.org,
 			id: flags.id,
 			name: flags.name,
-			mtt: {
-				startAt: startAt.toISOString(),
-				endAt: endAt.toISOString(),
-				messageTemplate: flags.template,
-				testEmail: testEmail,
-			},
+			mtt,
 		});
-
 		return result.updateCampaign;
 	};
 
 	simplify = (d) => {
-		const result = {
-			id: d.id,
-			Name: d.name,
-		};
+		const result = { id: d.id, Name: d.name };
 		const hhmm = (date) =>
 			new Date(date).toLocaleTimeString(undefined, {
 				hour: "2-digit",
 				minute: "2-digit",
 				hour12: false,
 			});
-		result.from = d.mtt.startAt.substring(0, 10);
-		result.to = d.mtt.endAt.substring(0, 10);
-		result.period = `${hhmm(d.mtt.startAt)}↔${hhmm(d.mtt.endAt)}`;
+		if (d.mtt.startAt && d.mtt.endAt) {
+			result.from = d.mtt.startAt.substring(0, 10);
+			result.to = d.mtt.endAt.substring(0, 10);
+			result.period = `${hhmm(d.mtt.startAt)}↔${hhmm(d.mtt.endAt)}`;
+		}
 		result["test email"] = d.mtt.testEmail;
-		result["mtt template"] = d.mtt.template;
+		result["mtt template"] = d.mtt.messageTemplate;
+		if (d.mtt.ccContacts?.length)
+			result["cc contacts"] = d.mtt.ccContacts.join(", ");
+		if (typeof d.mtt.ccSender !== "undefined") {
+			result["cc sender"] = d.mtt.ccSender ? "yes" : "no";
+		}
+
 		return result;
 	};
 
@@ -101,7 +122,6 @@ $mtt: CampaignMttInput!
 
 	async run() {
 		const { args, flags } = await this.parse();
-
 		const result = await this.updateMtt(flags);
 		this.output(result);
 	}

package/src/commands/widget/add.mjs

@@ -60,6 +60,9 @@ export default class WidgetAdd extends Command {
 				const campapi = new CampaignGet();
 				campaign = await campapi.fetch({ name: flag.campaign });
 				flag.org = campaign.org.name;
+				if (!flag.name) {
+					flag.name = `${campaign.name}/${flag.lang}`;
+				}
 			} catch (e) {
 				console.log("error", e);
 				throw e;
@@ -70,6 +73,9 @@ export default class WidgetAdd extends Command {
 			throw new Error(`campaign not found: ${flag.campaign}`);
 		}
 
+		if (!flag.name) {
+			flag.name = `${flag.campaign}/${flag.org}/${flag.lang}`;
+		}
 		try {
 			const r = await mutation(addWidgetDocument, flag);
 			return { id: r.addActionPage.id };

package/src/queries/campaign.mjs

@@ -9,6 +9,8 @@ export const FragmentMtt = gql`
           endAt
           messageTemplate
           testEmail
+          ccContacts
+          ccSender
         }
       }
     `;