proca 0.6.3 → 0.6.4

package/README.md

@@ -18,7 +18,7 @@ $ npm install -g proca
 $ proca COMMAND
 running command...
 $ proca (--version)
-proca/0.6.3 linux-x64 node-v20.12.2
+proca/0.6.4 linux-x64 node-v20.12.2
 $ proca --help [COMMAND]
 USAGE
   $ proca COMMAND
@@ -59,7 +59,7 @@ USAGE
 * [`proca campaign list [TITLE]`](#proca-campaign-list-title)
 * [`proca config add [ENVIRONMENT]`](#proca-config-add-environment)
 * [`proca config get`](#proca-config-get)
-* [`proca config set [ENVIRONMENT]`](#proca-config-set-environment)
+* [`proca config set [KEY] [VALUE]`](#proca-config-set-key-value)
 * [`proca config setup [ENVIRONMENT]`](#proca-config-setup-environment)
 * [`proca config token`](#proca-config-token)
 * [`proca config user`](#proca-config-user)
@@ -171,15 +171,15 @@ EXAMPLES
 
 ```
 USAGE
-  $ proca campaign add [TITLE] [--simplify [--json | --human | --csv]] [-n <campaign
-    name>] [-o <org name>]
+  $ proca campaign add [TITLE] -n <campaign name> -o <org name> [--simplify [--json |
+    --human | --csv]]
 
 ARGUMENTS
   TITLE  title of the campaign
 
 FLAGS
-  -n, --name=<campaign name>  name of the campaign
-  -o, --org=<org name>        name of the coordinator
+  -n, --name=<campaign name>  (required) name of the campaign
+  -o, --org=<org name>        (required) name of the coordinator
 
 OUTPUT FLAGS
   --csv       Format output as csv
@@ -333,28 +333,23 @@ DESCRIPTION
   get the server config
 ```
 
-## `proca config set [ENVIRONMENT]`
+## `proca config set [KEY] [VALUE]`
 
 update the setting used to authenticate to the servers and services
 
 ```
 USAGE
-  $ proca config set [ENVIRONMENT] [--simplify [--json | --human | --csv]] [--url
-    <url>] [--cloudflare-zone <value>] [--cloudflare-token <value>] [--token <API-token>] [--n8n <n8n api>] [--supabase
-    <url>] [--supabase-anon-key <value>] [--supabase-secrey-key <value>]
+  $ proca config set [KEY] [VALUE] [--simplify [--json | --human | --csv]]
+    [--environment <value>] [--url <url>] [--token <API-token>]
 
 ARGUMENTS
-  ENVIRONMENT  [default: default] environment
+  KEY    variable name
+  VALUE  value
 
 FLAGS
-  --cloudflare-token=<value>     token for your cloudflare cdn
-  --cloudflare-zone=<value>      zone for your cloudflare cdn
-  --n8n=<n8n api>                api access on the n8n server
-  --supabase=<url>               url of the supabase
-  --supabase-anon-key=<value>    anonymous key
-  --supabase-secrey-key=<value>  secret service key
-  --token=<API-token>            user token on proca server
-  --url=<url>                    [default: https://api.proca.app/api] url of the proca server api
+  --environment=<value>  [default: default] environment
+  --token=<API-token>    user token on proca server
+  --url=<url>            [default: https://api.proca.app/api] url of the proca server api
 
 OUTPUT FLAGS
   --csv       Format output as csv
@@ -370,6 +365,8 @@ ALIASES
 
 EXAMPLES
   $ proca config set --user=xavier@example.org --token=API-12345789
+
+  $ proca config set VAR1 VALUE
 ```
 
 ## `proca config setup [ENVIRONMENT]`
@@ -544,8 +541,8 @@ view a org
 
 ```
 USAGE
-  $ proca org get [--simplify [--json | --human | --csv]] [-n <org name>] [--config]
-    [--keys] [--campaigns] [--widgets] [--users]
+  $ proca org get [ID_NAME_DXID] [--simplify [--json | --human | --csv]] [-n <org
+    name>] [--config] [--keys] [--campaigns] [--widgets] [--users]
 
 FLAGS
   -n, --name=<org name>  name of the org

package/package.json

@@ -1,14 +1,14 @@
 {
 	"name": "proca",
 	"description": "Access the proca api",
-	"version": "0.6.3",
+	"version": "0.6.4",
 	"author": "Xavier",
 	"bin": {
 		"proca": "./proca-cli"
 	},
 	"bugs": "https://github.com/fixthestatusquo/git@github.com:fixthestatusquo/proca-cli.git/issues",
 	"dependencies": {
-		"@oclif/core": "^4",
+		"@oclif/core": "^4.2.10",
 		"@oclif/plugin-help": "^6",
 		"@oclif/plugin-plugins": "^5",
 		"@urql/exchange-auth": "^2.2.0",

package/src/commands/campaign/add.mjs

@@ -1,11 +1,18 @@
 import { Args, Flags } from "@oclif/core";
 import { error, stdout, ux } from "@oclif/core/ux";
+import OrgGet from "#src/commands/org/get.mjs";
 import Command from "#src/procaCommand.mjs";
 import { gql, mutation } from "#src/urql.mjs";
 import { getTwitter } from "#src/util/twitter.mjs";
 
-export default class OrgAdd extends Command {
-	static args = { title: { description: "title of the campaign" } };
+export default class CampaignAdd extends Command {
+	static args = {
+		title: Args.string({
+			description: "title of the campaign",
+			multiple: true,
+		}),
+	};
+	//  static strict = false;
 
 	static examples = [
 		"<%= config.bin %> <%= command.id %> -n <new_campaign> the full name of the campaign",
@@ -18,47 +25,77 @@ export default class OrgAdd extends Command {
 			char: "n",
 			description: "name of the campaign",
 			helpValue: "<campaign name>",
+			required: true,
 		}),
 		org: Flags.string({
 			char: "o",
 			description: "name of the coordinator",
 			helpValue: "<org name>",
+			required: true,
 		}),
 	};
 
-	create = async (_org) => {
-		const org = { ..._org, config: JSON.stringify(_org.config) };
-		console.log(org);
+	create = async (campaign) => {
+		const org = await this.getOrg(campaign.org);
 
+		const config = {
+			locales: {
+				en: {
+					"campaign:": {
+						description: "",
+					},
+					"common:": {},
+				},
+			},
+		};
+		if (org.config.locale && org.config.locale !== "en") {
+			config.locales[org.config.locale] = {};
+		}
+		if (!config.portal) {
+			config.portal = [];
+		}
 		const AddOrgDocument = gql`
-mutation ($org: String!,$name: String!,$title: String!) {
-  addCampaign(orgName: $org, input: {$org}) {
-    config
+mutation ($org: String!
+$name: String!
+$title: String!
+$config: Json!
+) {
+  addCampaign (input: { name: $name, title: $title, config: $config }, orgName: $org) {
     name
     title
+    config
   }
 }
     `;
 		const result = await mutation(AddOrgDocument, {
-			org,
+			org: org.name,
+			name: campaign.name,
+			title: campaign.title,
+			config: JSON.stringify(config),
 		});
-		console.log(result);
-		return result.org;
+
+		console.log("result", result);
+		return result;
 	};
 
+	async getOrg(orgName) {
+		const { config } = this;
+		const orgGet = new OrgGet({}, this.config);
+		const org = await orgGet.fetch({ name: orgName });
+		return org;
+	}
+
 	async run() {
+		//const { args, flags } = await this.parse(CampaignAdd);
 		const { args, flags } = await this.parse();
-		if (!flags.name && !flags.twitter) {
-			this.error("You must provide either --name or --twitter");
-		}
-
-		const org = { name: flags.twitter || flags.name, config: {} };
 
-		if (flags.twitter) {
-			await getTwitter(org);
-		}
+		const campaign = {
+			org: flags.org,
+			name: flags.name,
+			title: args.title || flags.name,
+		};
 
-		const data = await this.create(org);
+		const data = await this.create(campaign);
 		return this.output(data);
 	}
 }

package/src/commands/config/set.mjs

@@ -9,9 +9,13 @@ export default class CampaignList extends Command {
 	static deprecateAliases = true;
 
 	static args = {
-		environment: Args.string({
-			description: "environment",
-			default: "default",
+		key: Args.string({
+			description: "variable name",
+			multiple: false,
+		}),
+		value: Args.string({
+			description: "value",
+			multiple: true,
 		}),
 	};
 
@@ -20,40 +24,25 @@ export default class CampaignList extends Command {
 
 	static examples = [
 		"<%= config.bin %> <%= command.id %> --user=xavier@example.org --token=API-12345789",
+		"<%= config.bin %> <%= command.id %> VAR1 VALUE",
 	];
 
 	static flags = {
 		// flag with no value (-f, --force)
 		...super.globalFlags,
+		environment: Flags.string({
+			description: "environment",
+			default: "default",
+		}),
 		url: Flags.string({
 			description: "url of the proca server api",
 			default: "https://api.proca.app/api",
 			helpValue: "<url>",
 		}),
-		"cloudflare-zone": Flags.string({
-			description: "zone for your cloudflare cdn",
-		}),
-		"cloudflare-token": Flags.string({
-			description: "token for your cloudflare cdn",
-		}),
 		token: Flags.string({
 			description: "user token on proca server",
 			helpValue: "<API-token>",
 		}),
-		n8n: Flags.string({
-			description: "api access on the n8n server",
-			helpValue: "<n8n api>",
-		}),
-		supabase: Flags.string({
-			description: "url of the supabase",
-			helpValue: "<url>",
-		}),
-		"supabase-anon-key": Flags.string({
-			description: "anonymous key",
-		}),
-		"supabase-secrey-key": Flags.string({
-			description: "secret service key",
-		}),
 	};
 
 	format = (obj) => {
@@ -70,40 +59,45 @@ export default class CampaignList extends Command {
 
 	generate = function () {
 		const mapping = {
+			...args,
 			REACT_APP_NAME: "proca",
 			REACT_APP_API_URL: this.flags.url,
 			PROCA_TOKEN: this.flags.token,
-			N8N_TOKEN: this.flags.n8n,
-			REACT_APP_SUPABASE_URL: this.flags.supabase,
-			REACT_APP_SUPABASE_ANON_KEY: this.flags.supabase_anon_key,
-			SUPABASE_SECRET_KEY: this.flags.supabase_secret_key,
 		};
 
 		return this.format(mapping);
 	};
 
+	regenerate = function (config, args) {
+		config[args.key] = args.value;
+		console.log(this.format(config));
+		process.exit(1);
+		return this.format(config);
+	};
 	async run() {
 		const config = this.config;
 		const { args, flags, raw } = await this.parse();
 		const rawf = raw.filter((d) => d.type === "flag").map((d) => d.flag);
+
 		const file = getFilename(this.config.configDir);
 
 		const userConfig = getConfig(file, true);
 
-		console.log("config file", file);
-		console.error(file, userConfig, rawf);
-		process.exit(1);
+		this.info("config file", file);
 
-		if (userConfig && !this.flags.force) {
-			this.error("config file exists already", {
-				code: "CONFIG_ERR",
-				_ref: "README.md#",
-				suggestions: [
-					`edit ${file}`,
-					"add --force flag\nWARNING, it will delete the existing file",
-				],
-			});
+		if (userConfig) {
+			if (args.key && args.value) {
+				write(file, this.regenerate(userConfig, args));
+			} else {
+				console.log(userConfig);
+				this.error("config file exists already", {
+					code: "CONFIG_ERR",
+					_ref: "README.md#",
+					suggestions: ["add KEY VALUE to update or add new variables"],
+				});
+			}
+		} else {
+			write(file, this.generate());
 		}
-		write(file, this.generate());
 	}
 }

package/src/commands/org/get.mjs

@@ -9,12 +9,11 @@ export default class OrgGet extends Command {
 
 	static examples = ["<%= config.bin %> <%= command.id %> <name of the ngo>"];
 
-	static args = {}; //this.multiid();
+	static args = this.multiid();
 
 	static flags = {
 		// flag with no value (-f, --force)
-		//		...this.flagify({multiid: false}),
-		...super.globalFlags,
+		...this.flagify({ multiid: false }),
 		name: Flags.string({
 			char: "n",
 			charAliases: ["o"],
@@ -58,6 +57,7 @@ export default class OrgGet extends Command {
 			name: params.name,
 			withCampaigns: params.campaigns,
 		});
+		//    result.org.config = JSON.parse (result.org.config);
 		return result.org;
 	};
 

package/src/commands/widget/add.mjs

@@ -75,17 +75,18 @@ export default class WidgetAdd extends Command {
 			return r;
 		} catch (e) {
 			const errors = e.graphQLErrors;
+			console.log(errors, flag, addWidgetDocument);
 			if (errors[0].path[1] === "name") {
 				this.error(`invalid name (already taken?): ${flag.name}`);
 				throw new Error(errors[0].message);
 			}
-			if (r.errors[0].extensions?.code === "permission_denied") {
+			if (errors[0].extensions?.code === "permission_denied") {
 				console.error("permission denied to create", name, campaign?.org.name);
-				throw new Error(r.errors[0].message);
+				throw new Error(errors[0].message);
 			}
 			const page = await fetchByName(name);
 			console.warn("duplicate of widget", page.id);
-			throw new Error(r.errors[0].message);
+			throw new Error(errors[0].message);
 		}
 	};
 

package/src/procaCommand.mjs

@@ -202,9 +202,9 @@ class ProcaCommand extends Command {
 
 	async output(data) {
 		if (this.format === "json") {
-			console.log("json", data);
 			if (this.flags.simplify)
 				return data?.map(this.simplify) || this.simplify(data);
+			const isDirectCall = process.argv.join(":").includes(this.id);
 			return data;
 		}
 		if (this.format === "csv") {