proca 2.0.1 → 2.1.1

package/README.md

@@ -107,11 +107,12 @@ you should also use the local proca-api in your [widget generator](https://githu
 * [`proca user whoami`](#proca-user-whoami)
 * [`proca widget add`](#proca-widget-add)
 * [`proca widget delete`](#proca-widget-delete)
-* [`proca widget external update`](#proca-widget-external-update)
 * [`proca widget get`](#proca-widget-get)
 * [`proca widget list`](#proca-widget-list)
 * [`proca widget rebuild`](#proca-widget-rebuild)
 * [`proca widget update`](#proca-widget-update)
+* [`proca widget update external`](#proca-widget-update-external)
+* [`proca widget update name`](#proca-widget-update-name)
 
 ## `proca action add`
 
@@ -1860,35 +1861,6 @@ DESCRIPTION
   Delete a widget
 ```
 
-## `proca widget external update`
-
-Update the global counter to add the actions collected elsewhere
-
-```
-USAGE
-  $ proca widget external update [ID_NAME_DXID] -t <value> [--json | --csv | --markdown] [--env
-    <value>] [--simplify] [-i <value> | -n <the_short_name> | -x <value>]
-
-FLAGS
-  -i, --id=<value>
-  -n, --name=<the_short_name>  name
-  -t, --total=<value>          (required) new total to include
-  -x, --dxid=<value>           dxid
-      --env=<value>            [default: default] allow to switch between configurations (server or users)
-
-OUTPUT FLAGS
-  --csv            Format output as csv
-  --json           Format output as json
-  --markdown       Format output as markdown table
-  --[no-]simplify  flatten and filter to output only the most important attributes, mostly relevant for json
-
-DESCRIPTION
-  Update the global counter to add the actions collected elsewhere
-
-EXAMPLES
-  see also proca contact count
-```
-
 ## `proca widget get`
 
 view a widget
@@ -1984,14 +1956,13 @@ Update a widget's properties
 ```
 USAGE
   $ proca widget update [ID_NAME_DXID] [--json | --csv | --markdown] [--env <value>]
-    [--simplify] [-i <value> | -n <the_short_name> | -x <value>] [-n <widget name>] [-l <locale>] [--color <hex code>]
-    [--confirm-optin] [--confirm-action] [--dry-run]
+    [--simplify] [-i <value> | -n <the_short_name> | -x <value>] [-l <locale>] [--color <hex code>] [--confirm-optin]
+    [--confirm-action] [--dry-run]
 
 FLAGS
   -i, --id=<value>
   -l, --locale=<locale>        change the locale
   -n, --name=<the_short_name>  name
-  -n, --rename=<widget name>   new name for the widget
   -x, --dxid=<value>           dxid
       --color=<hex code>       update color (not yet implemented)
       --confirm-action         add actionConfirm (check email snack) to consent.email component
@@ -2009,12 +1980,68 @@ DESCRIPTION
   Update a widget's properties
 
 EXAMPLES
-  $ proca widget update 4454 --name new_widget_name
+  $ proca widget update -name campaign/widget --locale fr
 
-  $ proca widget update 4454 --locale fr
+  $ proca widget update 42 --confirm-optin
+
+  $ proca widget update --dxid=pnc -confirm-optin --dry-run
+```
 
-  $ proca widget update 4454 --confirm-optin
+## `proca widget update external`
 
-  $ proca widget update 4454 --confirm-optin --dry-run
+Update the global counter to add the actions collected elsewhere
+
+```
+USAGE
+  $ proca widget update external [ID_NAME_DXID] -t <value> [--json | --csv | --markdown] [--env
+    <value>] [--simplify] [-i <value> | -n <the_short_name> | -x <value>]
+
+FLAGS
+  -i, --id=<value>
+  -n, --name=<the_short_name>  name
+  -t, --total=<value>          (required) new total to include
+  -x, --dxid=<value>           dxid
+      --env=<value>            [default: default] allow to switch between configurations (server or users)
+
+OUTPUT FLAGS
+  --csv            Format output as csv
+  --json           Format output as json
+  --markdown       Format output as markdown table
+  --[no-]simplify  flatten and filter to output only the most important attributes, mostly relevant for json
+
+DESCRIPTION
+  Update the global counter to add the actions collected elsewhere
+
+EXAMPLES
+  see also proca contact count
+```
+
+## `proca widget update name`
+
+Update the name of a widget
+
+```
+USAGE
+  $ proca widget update name [ID_NAME_DXID] [--json | --csv | --markdown] [--env <value>]
+    [--simplify] [-i <value> | -n <the_short_name> | -x <value>] [--rename <widget name>]
+
+FLAGS
+  -i, --id=<value>
+  -n, --name=<the_short_name>  name
+  -x, --dxid=<value>           dxid
+      --env=<value>            [default: default] allow to switch between configurations (server or users)
+      --rename=<widget name>   new name for the widget
+
+OUTPUT FLAGS
+  --csv            Format output as csv
+  --json           Format output as json
+  --markdown       Format output as markdown table
+  --[no-]simplify  flatten and filter to output only the most important attributes, mostly relevant for json
+
+DESCRIPTION
+  Update the name of a widget
+
+EXAMPLES
+  see also proca widget update name --name=campaign/old_name --rename=campaign/new_name
 ```
 <!-- commandsstop -->

package/package.json

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

package/src/commands/campaign/widget/archive.mjs

@@ -2,7 +2,7 @@ import { Flags } from "@oclif/core";
 import prompts from "prompts";
 import CampaignGet from "#src/commands/campaign/get.mjs";
 import WidgetList from "#src/commands/widget/list.mjs";
-import WidgetUpdate from "#src/commands/widget/update.mjs";
+import WidgetUpdate from "#src/commands/widget/update/index.mjs";
 import Command from "#src/procaCommand.mjs";
 
 export default class CampaignWidgetArchive extends Command {

package/src/commands/widget/get.mjs

@@ -10,7 +10,6 @@ export const getWidget = (params) => {
 
 export default class WidgetGet extends Command {
   static description = "view a widget";
-
   static args = this.multiid();
 
   static flags = {

package/src/commands/widget/{external/update.mjs → update/external.mjs}

@@ -2,6 +2,11 @@ import { Flags } from "@oclif/core";
 import Command from "#src/procaCommand.mjs";
 import { gql, mutation } from "#src/urql.mjs";
 
+export const updateCounter = (id, counter) => {
+  const d = new CounterUpdate([]);
+  return d.updateCounter(id, counter);
+};
+
 export default class CounterUpdate extends Command {
   static description =
     "Update the global counter to add the actions collected elsewhere";

package/src/commands/widget/{update.mjs → update/index.mjs}

@@ -1,26 +1,24 @@
 import { Args, Flags } from "@oclif/core";
 import { merge } from "merge-anything";
-import WidgetGet from "#src/commands/widget/get.mjs";
+import { getWidget } 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",
+    "<%= config.bin %> <%= command.id %> -name campaign/widget --locale fr",
+    "<%= config.bin %> <%= command.id %> 42 --confirm-optin",
+    "<%= config.bin %> <%= command.id %> --dxid=pnc -confirm-optin --dry-run",
   ];
 
   static args = this.multiid();
 
+  // @ivana, let's make separate update xxx than inherit, check external
   static flags = {
-    // flag with no value (-f, --force)
     ...this.flagify({ multiid: true }),
     rename: Flags.string({
-      char: "n",
+      hidden: true, // use proca widget update name instead
       description: "new name for the widget",
       helpValue: "<widget name>",
     }),
@@ -53,13 +51,7 @@ export default class WidgetUpdate extends Command {
     }),
   };
 
-  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) {
@@ -98,6 +90,7 @@ export default class WidgetUpdate extends Command {
     const { flags } = await this.parse();
     const {
       id,
+      name,
       rename,
       locale,
       color,
@@ -107,7 +100,7 @@ export default class WidgetUpdate extends Command {
     } = flags;
 
     // Fetch current widget
-    const widget = await this.fetchWidget({ id });
+    const widget = await getWidget({ id, name });
 
     if (!widget) {
       this.error("Widget not found");
@@ -115,7 +108,7 @@ export default class WidgetUpdate extends Command {
 
     // Validate name
     if (rename) {
-      const nameParts = renname.split("/");
+      const nameParts = rename.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",
@@ -124,8 +117,8 @@ export default class WidgetUpdate extends Command {
     }
 
     const input = {
-      name: rename ?? widget.name,
-      locale: locale ?? widget.locale,
+      name: rename ?? rename,
+      locale: locale ?? locale,
     };
 
     if (color) {

package/src/commands/widget/update/name.mjs

@@ -0,0 +1,28 @@
+import { Flags } from "@oclif/core";
+import { getWidget } from "#src/commands/widget/get.mjs";
+import UpdateCommand from "#src/commands/widget/update/index.mjs";
+
+export default class CounterUpdate extends UpdateCommand {
+  static description = "Update the name of a widget";
+
+  static examples = [
+    "see also <%= config.bin %> widget update name --name=campaign/old_name --rename=campaign/new_name",
+  ];
+  static args = this.multiid();
+
+  static flags = {
+    ...this.flagify({ multiid: true }),
+    rename: Flags.string({
+      description: "new name for the widget",
+      helpValue: "<widget name>",
+    }),
+  };
+
+  async run() {
+    const { flags } = await this.parse();
+    const widget = await getWidget(flags);
+
+    const updated = await this.update(widget.id, { name: flags.rename });
+    return this.output(updated, { single: true });
+  }
+}

package/src/procaCommand.mjs

@@ -100,10 +100,11 @@ class ProcaCommand extends Command {
     ].filter(Boolean).length;
 
     if (identified === 0) {
-      this.error("One of --name, --id, or --dxid is required");
+      super.error("One of --name, --id, or --dxid is required", {
+        code: 1,
+      });
     }
 
-    await super.parse(); // check that either the first arg or the name/id/dxid are set
     return parsed;
   }
 
@@ -115,7 +116,7 @@ class ProcaCommand extends Command {
   };
   async init() {
     await super.init();
-    const { argv, flags } = await this.parse();
+    const { flags } = await this.parse();
     this.flags = flags;
     if (flags.json) this.format = "json";
     if (flags.csv) this.format = "csv";
@@ -128,14 +129,29 @@ class ProcaCommand extends Command {
     createClient(this.procaConfig);
   }
 
-  async _catch(err) {
-    // Check if the error was caused by a missing flag or wrong argument format
-    console.log("aaa", err);
-    try {
-      this.error(err.toString());
-    } catch (e) {
-      console.log(e);
+  async catch(err) {
+    const entity = this.id.split(":")[0];
+    if (err.graphQLErrors && err.graphQLErrors.length > 0) {
+      err.graphQLErrors.forEach((graphqlErr) => {
+        if (graphqlErr.extensions) {
+          const code = graphqlErr.extensions.code;
+          if (code === "not_found") {
+            this.error(`${entity} not found`, { exit: 1 });
+          }
+        }
+      });
     }
+
+    if (err.networkError) {
+      this.info("Looks like there’s a problem with your internet connection");
+      this.error(err.networkError.cause, { exit: err.code || 1 });
+    }
+    if (err instanceof SyntaxError) {
+      this.error(`Syntax error: ${err.message}`, { code: 1 });
+    }
+
+    // Default error handling
+    this.error(err.message, { exit: err.code || 1 });
   }
 
   flatten = (obj, prefix = "", result = {}) => {
@@ -192,7 +208,7 @@ class ProcaCommand extends Command {
   }
 
   error(msg, options = {}) {
-    const colouredMessage = ux.colorize(this.config.theme.error, msg);
+    const colouredMessage = `❌ ${ux.colorize(this.config.theme.error, msg)}`;
     super.error(colouredMessage, options);
   }
 

package/src/urql.mjs

@@ -43,7 +43,6 @@ export const createClient = (config) => {
 export const query = async (query, payload) => {
   const result = await client.query(query, payload).toPromise();
   if (result.error) {
-    //console.log(result.error);
     throw result.error;
   }
   return result.data;
@@ -52,6 +51,7 @@ export const query = async (query, payload) => {
 export const mutation = async (mutation, payload) => {
   const result = await client.mutation(mutation, payload).toPromise();
   if (result.error) {
+    console.log("error", result.error);
     throw result.error;
   }
   return result.data;