From 77d2ac2be1721a80907b2a8de1d42188e98d82fe Mon Sep 17 00:00:00 2001 From: Leo Meyerovich Date: Thu, 30 Mar 2023 23:50:00 -0700 Subject: [PATCH 1/5] feat(orgs) --- CHANGELOG.md | 5 +++++ projects/client-api/src/index.js | 8 ++++++-- projects/js-upload-api/src/Client.ts | 21 ++++++++++++++++++--- projects/js-upload-api/src/Dataset.ts | 20 +++++++++++++++++++- projects/js-upload-api/src/File.ts | 8 +++++++- projects/node-api-test-cjs/src/index.js | 14 ++++++++------ projects/node-api-test/src/index.js | 14 ++++++++------ projects/node-api/README.md | 25 ++++++++++++++++++++++++- projects/node-api/src/index.ts | 7 ++++--- 9 files changed, 99 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ee99ca..6daaf2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,11 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline - **js-upload-api**: CommonJS support with output binaries at `dist/cjs` - **node-api**: CommonJS support with output binaries at `dist/cjs` +- **all**: Optional orgs login + +### Docs + +- **all**: Arrow uploads and login modes ## 4.5.0 - 2023-03-23 diff --git a/projects/client-api/src/index.js b/projects/client-api/src/index.js index 3995092..3607643 100644 --- a/projects/client-api/src/index.js +++ b/projects/client-api/src/index.js @@ -26,6 +26,7 @@ export class Client extends ClientBase { * @constructor * @param {string} username - Graphistry server username * @param {string} password - Graphistry server password + * @param {string} org - Graphistry organization (optional) * @param {string} [protocol='https'] - 'http' or 'https' for client->server upload communication * @param {string} [host='hub.graphistry.com'] - Graphistry server hostname * @param {clientProtocolHostname} clientProtocolHostname - Override URL base path shown in browsers. By default uses protocol/host combo, e.g., https://hub.graphistry.com @@ -39,13 +40,16 @@ export class Client extends ClientBase { * ``` */ constructor( - username, password, + username, password, org = undefined, protocol = 'https', host = 'hub.graphistry.com', clientProtocolHostname, version ) { console.debug('new client', { username }, { password }, { protocol }, { host }, { clientProtocolHostname }, { version }); - super(username, password, protocol, host, clientProtocolHostname, window.fetch.bind(window), version, '@graphistry/client-api'); + super( + username, password, org, + protocol, host, clientProtocolHostname, + window.fetch.bind(window), version, '@graphistry/client-api'); } } diff --git a/projects/js-upload-api/src/Client.ts b/projects/js-upload-api/src/Client.ts index bcfc0d5..ea76166 100644 --- a/projects/js-upload-api/src/Client.ts +++ b/projects/js-upload-api/src/Client.ts @@ -11,13 +11,21 @@ * *
* - * @example **Authenticate against Graphistry Hub** + * @example **Authenticate against Graphistry Hub for a personal account** * ```javascript * import { Client } from '@graphistry/node-api'; * const client = new Client('my_username', 'my_password'); * ``` * *
+ * + * @example **Authenticate against an org in Graphistry Hub** + * ```javascript + * import { Client } from '@graphistry/node-api'; + * const client = new Client('my_username', 'my_password', 'my_org'); + * ``` + * + *
* * @example **Authenticate against a private Graphistry server** * ```javascript @@ -66,6 +74,7 @@ export class Client { public readonly clientProtocolHostname: string; public readonly agent: string; public readonly version?: string; + public readonly org?: string; private _getAuthTokenPromise?: Promise; // undefined if not configured @@ -80,12 +89,13 @@ export class Client { * * @param username The username to authenticate with. * @param password The password to authenticate with. + * @param org The organization to use (optional) * @param protocol The protocol to use for the server during uploads: 'http' or 'https'. * @param host The hostname of the server during uploads: defaults to 'hub.graphistry.com' * @param clientProtocolHostname Base path to use inside the browser and when sharing public URLs: defaults to '{protocol}://{host}' */ constructor ( - username: string, password: string, + username: string, password: string, org?: string, protocol = 'https', host = 'hub.graphistry.com', clientProtocolHostname?: string, fetch?: any, // eslint-disable-line @typescript-eslint/no-explicit-any @@ -94,6 +104,7 @@ export class Client { ) { this.username = username; this._password = password; + this.org = org; this.protocol = protocol; this.host = host; this.fetch = fetch; @@ -201,7 +212,11 @@ export class Client { const response = await this.postToApi( 'api/v2/auth/token/generate', - { username: this.username, password: this._password }, + { + username: this.username, + password: this._password, + ...(this.org ? {org_name: this.org} : {}), + }, this.getBaseHeaders(), ) diff --git a/projects/js-upload-api/src/Dataset.ts b/projects/js-upload-api/src/Dataset.ts index f381ac7..653af73 100644 --- a/projects/js-upload-api/src/Dataset.ts +++ b/projects/js-upload-api/src/Dataset.ts @@ -56,6 +56,20 @@ import { Mode, ModeAction, Privacy } from './Privacy.js'; * *
* + * @example **Create a dataset using Arrow** + * ```javascript + * import { tableFromArrays, tableToIPC, Table } from 'apache-arrow'; + * import { EdgeFile } from '@graphistry/node-api'; + * + * //columnar data is fastest; column per attribute; reuse across datasets + * const edgesJSON = {'s': ['a1', 'b2'], 'd': ['b2', 'c3']}; + * const edgesTable: Table = tableFromArrays(edgesJSON); + * const edgesUint8: Uint8Array = tableToIPC(edgesArr, 'file'); + * const edgesFile = new EdgeFile(edgesUint8, 'arrow'); + * ``` + * + *
+ * * @example **Add files after the Dataset is instantiated but before it has been uploaded** * ```javascript * import { Dataset } from '@graphistry/node-api'; @@ -315,7 +329,11 @@ export class Dataset { node_files: this.nodeFiles.map((file) => file.fileID), edge_files: this.edgeFiles.map((file) => file.fileID), }; - const bindings = { ...fileBindings, ...this.bindings }; + const bindings = { + ...(client.org ? { org_name: client.org } : {}), + ...fileBindings, + ...this.bindings + }; await this.createDataset(client, bindings); return this; diff --git a/projects/js-upload-api/src/File.ts b/projects/js-upload-api/src/File.ts index e205bca..cab880c 100644 --- a/projects/js-upload-api/src/File.ts +++ b/projects/js-upload-api/src/File.ts @@ -249,7 +249,13 @@ export class File { } console.debug('Creating file'); - const fileJsonResults = await client.post('api/v2/files/', {file_type: this.fileFormat, ...this.createOpts}); + const fileJsonResults = await client.post( + 'api/v2/files/', + { + file_type: this.fileFormat, + ...(client.org ? { org_name: client.org } : {}), + ...this.createOpts + }); console.debug('File creation response:', fileJsonResults); this._fileCreateResponse = fileJsonResults; this._fileID = fileJsonResults.file_id; diff --git a/projects/node-api-test-cjs/src/index.js b/projects/node-api-test-cjs/src/index.js index d061d7b..5ba4bbc 100644 --- a/projects/node-api-test-cjs/src/index.js +++ b/projects/node-api-test-cjs/src/index.js @@ -37,6 +37,8 @@ if (!user) { throw new Error('GRAPHISTRY_USER environment variable not set'); } const password = process.env.GRAPHISTRY_PASSWORD; if (!password) { throw new Error('GRAPHISTRY_PASSWORD environment variable not set'); } +const org = process.env.GRAPHISTRY_ORG; + const protocol = process.env.GRAPHISTRY_PROTOCOL || 'https'; const host = process.env.GRAPHISTRY_HOST || 'hub.graphistry.com'; @@ -48,7 +50,7 @@ async function go() { if (false) { - const client = new Client(user, password, protocol, host); + const client = new Client(user, password, org, protocol, host); const edgesFile = new EdgeFile(edges); const nodesFile = new NodeFile(nodes); // optional @@ -67,7 +69,7 @@ if (false) { } else if (false) { - const client = new Client(user, password, protocol, host); + const client = new Client(user, password, org, protocol, host); const edgesFile = new EdgeFile(edges); const nodesFile = new NodeFile(nodes); // optional @@ -85,7 +87,7 @@ if (false) { } else if (false) { - const client = new Client(user, password, protocol, host); + const client = new Client(user, password, org, protocol, host); const edgesFile = new EdgeFile( edgesRows, @@ -186,7 +188,7 @@ if (false) { } else if (false) { - const client = new Client(user, password, protocol, host); + const client = new Client(user, password, org, protocol, host); const edgesFile = new EdgeFile(edges); const nodesFile = new NodeFile(nodes); // optional @@ -210,7 +212,7 @@ if (false) { //convert edges to apache-arrow table const edgesArr = tableFromArrays(edges); const nodesArr = tableFromArrays(nodes); - const client = new Client(user, password, protocol, host); + const client = new Client(user, password, org, protocol, host); function arrToUint8Array(arr) { const ui8 = tableToIPC(arr, 'file'); @@ -237,7 +239,7 @@ if (false) { //convert edges to apache-arrow table const edgesArr = tableFromArrays(edges); const nodesArr = tableFromArrays(nodes); - const client = new Client(user, password, protocol, host); + const client = new Client(user, password, org, protocol, host); function arrToUint8Array(arr) { const ui8 = tableToIPC(arr, 'file'); diff --git a/projects/node-api-test/src/index.js b/projects/node-api-test/src/index.js index 79c1f26..25f79dc 100644 --- a/projects/node-api-test/src/index.js +++ b/projects/node-api-test/src/index.js @@ -37,6 +37,8 @@ if (!user) { throw new Error('GRAPHISTRY_USER environment variable not set'); } const password = process.env.GRAPHISTRY_PASSWORD; if (!password) { throw new Error('GRAPHISTRY_PASSWORD environment variable not set'); } +const org = process.env.GRAPHISTRY_ORG; + const protocol = process.env.GRAPHISTRY_PROTOCOL || 'https'; const host = process.env.GRAPHISTRY_HOST || 'hub.graphistry.com'; @@ -44,7 +46,7 @@ const host = process.env.GRAPHISTRY_HOST || 'hub.graphistry.com'; if (false) { - const client = new Client(user, password, protocol, host); + const client = new Client(user, password, org, protocol, host); const edgesFile = new EdgeFile(edges); const nodesFile = new NodeFile(nodes); // optional @@ -63,7 +65,7 @@ if (false) { } else if (false) { - const client = new Client(user, password, protocol, host); + const client = new Client(user, password, org, protocol, host); const edgesFile = new EdgeFile(edges); const nodesFile = new NodeFile(nodes); // optional @@ -81,7 +83,7 @@ if (false) { } else if (false) { - const client = new Client(user, password, protocol, host); + const client = new Client(user, password, org, protocol, host); const edgesFile = new EdgeFile( edgesRows, @@ -182,7 +184,7 @@ if (false) { } else if (false) { - const client = new Client(user, password, protocol, host); + const client = new Client(user, password, org, protocol, host); const edgesFile = new EdgeFile(edges); const nodesFile = new NodeFile(nodes); // optional @@ -206,7 +208,7 @@ if (false) { //convert edges to apache-arrow table const edgesArr = tableFromArrays(edges); const nodesArr = tableFromArrays(nodes); - const client = new Client(user, password, protocol, host); + const client = new Client(user, password, org, protocol, host); function arrToUint8Array(arr) { const ui8 = tableToIPC(arr, 'file'); @@ -233,7 +235,7 @@ if (false) { //convert edges to apache-arrow table const edgesArr = tableFromArrays(edges); const nodesArr = tableFromArrays(nodes); - const client = new Client(user, password, protocol, host); + const client = new Client(user, password, org, protocol, host); function arrToUint8Array(arr) { const ui8 = tableToIPC(arr, 'file'); diff --git a/projects/node-api/README.md b/projects/node-api/README.md index 145bc1f..cbc0942 100644 --- a/projects/node-api/README.md +++ b/projects/node-api/README.md @@ -98,6 +98,15 @@ const edgesUint8: Uint8Array = tableToIPC(edgesArr); const edgesFile = new EdgeFile(edgesUint8, 'arrow'); ``` +### Ex: Using an organization + +You can log into an organization instead of a personal account + +```javascript +import { Client } from '@graphistry/node-api'; +const c = new Client('my_user', 'my_pass', 'my_org'); +``` + ### Ex: Custom token If you already have a JWT token, you can pass it in @@ -108,6 +117,20 @@ const c = new Client(); c.setToken('Bearer 123abc'); ``` +### Ex: Custom server + +You can switch which server to use for uploads and for downloads, which is useful for self-hosted servers and advanced enterprise network configurations + +```javascript +import { Client } from '@graphistry/node-api'; +const c = new Client( + 'my_user', 'my_pass', 'optional_my_org', + 'https', //upload protcol + 'hub.graphistry.com', //upload server + 'https://hub.graphistry.com' //url to use in browsers +) +``` + ### Using API Options * Set parsing options for different `File` formats and shapes @@ -119,7 +142,7 @@ c.setToken('Bearer 123abc'); ```javascript -const client = new Client(user, password, protocol, host); +const client = new Client(user, password, org, protocol, host); // Row-oriented data slower to upload but often convenient const edgesRows = [ diff --git a/projects/node-api/src/index.ts b/projects/node-api/src/index.ts index c9c326c..ca0b8ca 100644 --- a/projects/node-api/src/index.ts +++ b/projects/node-api/src/index.ts @@ -22,6 +22,7 @@ export class Client extends ClientBase { * @constructor * @param {string} username - Graphistry server username * @param {string} password - Graphistry server password + * @param {string} [org] - Organization to use (optional) * @param {string} [protocol='https'] - 'http' or 'https' for client->server upload communication * @param {string} [host='hub.graphistry.com'] - Graphistry server hostname * @param {clientProtocolHostname} clientProtocolHostname - Override URL base path shown in browsers. By default uses protocol/host combo, e.g., https://hub.graphistry.com @@ -35,15 +36,15 @@ export class Client extends ClientBase { * ``` */ constructor( - username: string, password: string, + username: string, password: string, org?: string, protocol = 'https', host = 'hub.graphistry.com', clientProtocolHostname?: string, version: string = VERSION ) { console.debug('new client', { username }, { password }, { protocol }, { host }, { clientProtocolHostname }, { version }); super( - username, password, protocol, host, - clientProtocolHostname, + username, password, org, + protocol, host, clientProtocolHostname, fetch, version, '@graphistry/node-api'); From 6513fe7d8938a14dca5c1c6d7b2c6d4ae384472c Mon Sep 17 00:00:00 2001 From: Leo Meyerovich Date: Thu, 30 Mar 2023 23:50:22 -0700 Subject: [PATCH 2/5] docs(more) --- projects/js-upload-api/src/Client.ts | 3 +++ projects/node-api/README.md | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/projects/js-upload-api/src/Client.ts b/projects/js-upload-api/src/Client.ts index ea76166..76b82d4 100644 --- a/projects/js-upload-api/src/Client.ts +++ b/projects/js-upload-api/src/Client.ts @@ -93,6 +93,9 @@ export class Client { * @param protocol The protocol to use for the server during uploads: 'http' or 'https'. * @param host The hostname of the server during uploads: defaults to 'hub.graphistry.com' * @param clientProtocolHostname Base path to use inside the browser and when sharing public URLs: defaults to '{protocol}://{host}' + * @param fetch The fetch implementation to use + * @param version The version of the client library + * @param agent The agent name to use when communicating with the server */ constructor ( username: string, password: string, org?: string, diff --git a/projects/node-api/README.md b/projects/node-api/README.md index cbc0942..55e56af 100644 --- a/projects/node-api/README.md +++ b/projects/node-api/README.md @@ -94,7 +94,7 @@ import { EdgeFile } from '@graphistry/node-api'; //columnar data is fastest; column per attribute; reuse across datasets const edgesJSON = {'s': ['a1', 'b2'], 'd': ['b2', 'c3']}; const edgesTable: Table = tableFromArrays(edgesJSON); -const edgesUint8: Uint8Array = tableToIPC(edgesArr); +const edgesUint8: Uint8Array = tableToIPC(edgesArr, 'file'); const edgesFile = new EdgeFile(edgesUint8, 'arrow'); ``` From a3fb2e26a94fbf3f03befbd1ff0957743269af69 Mon Sep 17 00:00:00 2001 From: Leo Meyerovich Date: Thu, 30 Mar 2023 23:57:18 -0700 Subject: [PATCH 3/5] v4.6.0-alpha.2 --- lerna.json | 2 +- projects/client-api-react/package-lock.json | 2 +- projects/client-api-react/package.json | 4 ++-- projects/client-api/package-lock.json | 2 +- projects/client-api/package.json | 4 ++-- projects/cra-template/package-lock.json | 2 +- projects/cra-template/package.json | 2 +- projects/cra-test-18/package-lock.json | 2 +- projects/cra-test-18/package.json | 4 ++-- projects/cra-test/package-lock.json | 2 +- projects/cra-test/package.json | 4 ++-- projects/js-upload-api/package-lock.json | 2 +- projects/js-upload-api/package.json | 2 +- projects/node-api-test-cjs/package-lock.json | 2 +- projects/node-api-test-cjs/package.json | 4 ++-- projects/node-api-test/package-lock.json | 2 +- projects/node-api-test/package.json | 4 ++-- projects/node-api/package-lock.json | 2 +- projects/node-api/package.json | 4 ++-- 19 files changed, 26 insertions(+), 26 deletions(-) diff --git a/lerna.json b/lerna.json index a9aa248..d812a30 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "4.6.0-alpha.1", + "version": "4.6.0-alpha.2", "packages": [ "projects/client-api", "projects/client-api-react", diff --git a/projects/client-api-react/package-lock.json b/projects/client-api-react/package-lock.json index 3917f6a..bcea46f 100644 --- a/projects/client-api-react/package-lock.json +++ b/projects/client-api-react/package-lock.json @@ -1,6 +1,6 @@ { "name": "@graphistry/client-api-react", - "version": "4.6.0-alpha.1", + "version": "4.6.0-alpha.2", "lockfileVersion": 3, "requires": true, "packages": { diff --git a/projects/client-api-react/package.json b/projects/client-api-react/package.json index 22c43c9..3ef93b3 100644 --- a/projects/client-api-react/package.json +++ b/projects/client-api-react/package.json @@ -1,6 +1,6 @@ { "name": "@graphistry/client-api-react", - "version": "4.6.0-alpha.1", + "version": "4.6.0-alpha.2", "repository": { "type": "git", "url": "git+https://github.com/graphistry/graphistry-js.git" @@ -69,7 +69,7 @@ "author": "Graphistry, Inc ", "license": "ISC", "dependencies": { - "@graphistry/client-api": "^4.6.0-alpha.1", + "@graphistry/client-api": "^4.6.0-alpha.2", "crypto-browserify": "3.12.0", "prop-types": ">=15.6.0", "shallowequal": "1.1.0", diff --git a/projects/client-api/package-lock.json b/projects/client-api/package-lock.json index a35dc82..89c0beb 100644 --- a/projects/client-api/package-lock.json +++ b/projects/client-api/package-lock.json @@ -1,6 +1,6 @@ { "name": "@graphistry/client-api", - "version": "4.6.0-alpha.1", + "version": "4.6.0-alpha.2", "lockfileVersion": 3, "requires": true, "packages": { diff --git a/projects/client-api/package.json b/projects/client-api/package.json index 5dd9e22..78470d2 100644 --- a/projects/client-api/package.json +++ b/projects/client-api/package.json @@ -1,6 +1,6 @@ { "name": "@graphistry/client-api", - "version": "4.6.0-alpha.1", + "version": "4.6.0-alpha.2", "description": "Client-side API for interacting with a Graphistry embedded visualization.", "jsnext:main": "dist/index.js", "config": { @@ -85,7 +85,7 @@ "@graphistry/falcor-json-graph": "^2.9.10", "@graphistry/falcor-model-rxjs": "2.11.0", "@graphistry/falcor-socket-datasource": "2.11.3", - "@graphistry/js-upload-api": "^4.6.0-alpha.1", + "@graphistry/js-upload-api": "^4.6.0-alpha.2", "shallowequal": "1.1.0" }, "peerDependencies": { diff --git a/projects/cra-template/package-lock.json b/projects/cra-template/package-lock.json index 6ee7cef..536fa64 100644 --- a/projects/cra-template/package-lock.json +++ b/projects/cra-template/package-lock.json @@ -1,6 +1,6 @@ { "name": "@graphistry/cra-template", - "version": "4.6.0-alpha.1", + "version": "4.6.0-alpha.2", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/projects/cra-template/package.json b/projects/cra-template/package.json index 461168f..55b0922 100644 --- a/projects/cra-template/package.json +++ b/projects/cra-template/package.json @@ -1,6 +1,6 @@ { "name": "@graphistry/cra-template", - "version": "4.6.0-alpha.1", + "version": "4.6.0-alpha.2", "private": true, "main": "dist/index.cjs.js", "module": "dist/index.esm.js", diff --git a/projects/cra-test-18/package-lock.json b/projects/cra-test-18/package-lock.json index f5eba8b..1158541 100644 --- a/projects/cra-test-18/package-lock.json +++ b/projects/cra-test-18/package-lock.json @@ -1,6 +1,6 @@ { "name": "test18", - "version": "4.6.0-alpha.1", + "version": "4.6.0-alpha.2", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/projects/cra-test-18/package.json b/projects/cra-test-18/package.json index 9646090..de5ec99 100644 --- a/projects/cra-test-18/package.json +++ b/projects/cra-test-18/package.json @@ -1,9 +1,9 @@ { "name": "test18", - "version": "4.6.0-alpha.1", + "version": "4.6.0-alpha.2", "private": true, "dependencies": { - "@graphistry/client-api-react": "^4.6.0-alpha.1", + "@graphistry/client-api-react": "^4.6.0-alpha.2", "@testing-library/jest-dom": "^5.16.4", "@testing-library/react": "^13.2.0", "@testing-library/user-event": "^13.5.0", diff --git a/projects/cra-test/package-lock.json b/projects/cra-test/package-lock.json index e2f11e2..e478c15 100644 --- a/projects/cra-test/package-lock.json +++ b/projects/cra-test/package-lock.json @@ -1,6 +1,6 @@ { "name": "@graphistry/client-react-app-cra-test", - "version": "4.6.0-alpha.1", + "version": "4.6.0-alpha.2", "lockfileVersion": 3, "requires": true, "packages": { diff --git a/projects/cra-test/package.json b/projects/cra-test/package.json index 48d972a..af0ca85 100644 --- a/projects/cra-test/package.json +++ b/projects/cra-test/package.json @@ -1,10 +1,10 @@ { "name": "@graphistry/client-react-app-cra-test", - "version": "4.6.0-alpha.1", + "version": "4.6.0-alpha.2", "private": true, "dependencies": { "@craco/craco": "^6.4.2", - "@graphistry/client-api-react": "^4.6.0-alpha.1", + "@graphistry/client-api-react": "^4.6.0-alpha.2", "@testing-library/jest-dom": "^5.16.4", "@testing-library/react": "^12.1.5", "@testing-library/user-event": "^14.2.0", diff --git a/projects/js-upload-api/package-lock.json b/projects/js-upload-api/package-lock.json index d82b9f5..bd96e66 100644 --- a/projects/js-upload-api/package-lock.json +++ b/projects/js-upload-api/package-lock.json @@ -1,6 +1,6 @@ { "name": "@graphistry/js-upload-api", - "version": "4.6.0-alpha.1", + "version": "4.6.0-alpha.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/projects/js-upload-api/package.json b/projects/js-upload-api/package.json index e84e5ef..4b573a3 100644 --- a/projects/js-upload-api/package.json +++ b/projects/js-upload-api/package.json @@ -1,6 +1,6 @@ { "name": "@graphistry/js-upload-api", - "version": "4.6.0-alpha.1", + "version": "4.6.0-alpha.2", "repository": { "type": "git", "url": "git+https://github.com/graphistry/graphistry-js.git" diff --git a/projects/node-api-test-cjs/package-lock.json b/projects/node-api-test-cjs/package-lock.json index 0c7fb99..785c40b 100644 --- a/projects/node-api-test-cjs/package-lock.json +++ b/projects/node-api-test-cjs/package-lock.json @@ -1,6 +1,6 @@ { "name": "@graphistry/node-api-test", - "version": "4.6.0-alpha.1", + "version": "4.6.0-alpha.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/projects/node-api-test-cjs/package.json b/projects/node-api-test-cjs/package.json index da638b6..b19e149 100644 --- a/projects/node-api-test-cjs/package.json +++ b/projects/node-api-test-cjs/package.json @@ -1,6 +1,6 @@ { "name": "@graphistry/node-api-test-cjs", - "version": "4.6.0-alpha.1", + "version": "4.6.0-alpha.2", "description": "", "main": "src/index.js", "type": "commonjs", @@ -16,7 +16,7 @@ "author": "Graphistry, Inc.", "license": "Apache-2.0", "dependencies": { - "@graphistry/node-api": "^4.6.0-alpha.1", + "@graphistry/node-api": "^4.6.0-alpha.2", "apache-arrow": "^11.0.0" } } diff --git a/projects/node-api-test/package-lock.json b/projects/node-api-test/package-lock.json index 10b9385..123a348 100644 --- a/projects/node-api-test/package-lock.json +++ b/projects/node-api-test/package-lock.json @@ -1,6 +1,6 @@ { "name": "@graphistry/node-api-test", - "version": "4.6.0-alpha.1", + "version": "4.6.0-alpha.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/projects/node-api-test/package.json b/projects/node-api-test/package.json index 57d179c..b2876a8 100644 --- a/projects/node-api-test/package.json +++ b/projects/node-api-test/package.json @@ -1,6 +1,6 @@ { "name": "@graphistry/node-api-test", - "version": "4.6.0-alpha.1", + "version": "4.6.0-alpha.2", "description": "", "main": "src/index.js", "type": "module", @@ -16,7 +16,7 @@ "author": "Graphistry, Inc.", "license": "Apache-2.0", "dependencies": { - "@graphistry/node-api": "^4.6.0-alpha.1", + "@graphistry/node-api": "^4.6.0-alpha.2", "apache-arrow": "^11.0.0" } } diff --git a/projects/node-api/package-lock.json b/projects/node-api/package-lock.json index 9afbe3c..c38d00c 100644 --- a/projects/node-api/package-lock.json +++ b/projects/node-api/package-lock.json @@ -1,6 +1,6 @@ { "name": "@graphistry/node-api", - "version": "4.6.0-alpha.1", + "version": "4.6.0-alpha.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/projects/node-api/package.json b/projects/node-api/package.json index 972681f..ce7c988 100644 --- a/projects/node-api/package.json +++ b/projects/node-api/package.json @@ -1,6 +1,6 @@ { "name": "@graphistry/node-api", - "version": "4.6.0-alpha.1", + "version": "4.6.0-alpha.2", "repository": { "type": "git", "url": "git+https://github.com/graphistry/graphistry-js.git" @@ -74,7 +74,7 @@ "typescript": "^4.6.4" }, "dependencies": { - "@graphistry/js-upload-api": "^4.6.0-alpha.1", + "@graphistry/js-upload-api": "^4.6.0-alpha.2", "node-fetch-commonjs": "^3.2.4" } } From 41ef9f9e1be5cf1db0b3bb2d2c3cf14dc348a698 Mon Sep 17 00:00:00 2001 From: Leo Meyerovich Date: Fri, 31 Mar 2023 23:14:31 -0700 Subject: [PATCH 4/5] docs(changelog): 4.6.0 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6daaf2d..a6ce72b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. -## Development +## 4.6.0 ### Added From d04cba3b83b500e8b37cc70fec81e96940dd48fd Mon Sep 17 00:00:00 2001 From: Leo Meyerovich Date: Fri, 31 Mar 2023 23:20:06 -0700 Subject: [PATCH 5/5] v4.6.0 --- lerna.json | 2 +- projects/client-api-react/package-lock.json | 2 +- projects/client-api-react/package.json | 4 ++-- projects/client-api/package-lock.json | 2 +- projects/client-api/package.json | 4 ++-- projects/cra-template/package-lock.json | 2 +- projects/cra-template/package.json | 2 +- projects/cra-test-18/package-lock.json | 2 +- projects/cra-test-18/package.json | 4 ++-- projects/cra-test/package-lock.json | 2 +- projects/cra-test/package.json | 4 ++-- projects/js-upload-api/package-lock.json | 2 +- projects/js-upload-api/package.json | 2 +- projects/node-api-test-cjs/package-lock.json | 2 +- projects/node-api-test-cjs/package.json | 4 ++-- projects/node-api-test/package-lock.json | 2 +- projects/node-api-test/package.json | 4 ++-- projects/node-api/package-lock.json | 2 +- projects/node-api/package.json | 4 ++-- 19 files changed, 26 insertions(+), 26 deletions(-) diff --git a/lerna.json b/lerna.json index d812a30..e228a07 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "4.6.0-alpha.2", + "version": "4.6.0", "packages": [ "projects/client-api", "projects/client-api-react", diff --git a/projects/client-api-react/package-lock.json b/projects/client-api-react/package-lock.json index bcea46f..2986c88 100644 --- a/projects/client-api-react/package-lock.json +++ b/projects/client-api-react/package-lock.json @@ -1,6 +1,6 @@ { "name": "@graphistry/client-api-react", - "version": "4.6.0-alpha.2", + "version": "4.6.0", "lockfileVersion": 3, "requires": true, "packages": { diff --git a/projects/client-api-react/package.json b/projects/client-api-react/package.json index 3ef93b3..0f9102c 100644 --- a/projects/client-api-react/package.json +++ b/projects/client-api-react/package.json @@ -1,6 +1,6 @@ { "name": "@graphistry/client-api-react", - "version": "4.6.0-alpha.2", + "version": "4.6.0", "repository": { "type": "git", "url": "git+https://github.com/graphistry/graphistry-js.git" @@ -69,7 +69,7 @@ "author": "Graphistry, Inc ", "license": "ISC", "dependencies": { - "@graphistry/client-api": "^4.6.0-alpha.2", + "@graphistry/client-api": "^4.6.0", "crypto-browserify": "3.12.0", "prop-types": ">=15.6.0", "shallowequal": "1.1.0", diff --git a/projects/client-api/package-lock.json b/projects/client-api/package-lock.json index 89c0beb..dc115d5 100644 --- a/projects/client-api/package-lock.json +++ b/projects/client-api/package-lock.json @@ -1,6 +1,6 @@ { "name": "@graphistry/client-api", - "version": "4.6.0-alpha.2", + "version": "4.6.0", "lockfileVersion": 3, "requires": true, "packages": { diff --git a/projects/client-api/package.json b/projects/client-api/package.json index 78470d2..9d2bd0c 100644 --- a/projects/client-api/package.json +++ b/projects/client-api/package.json @@ -1,6 +1,6 @@ { "name": "@graphistry/client-api", - "version": "4.6.0-alpha.2", + "version": "4.6.0", "description": "Client-side API for interacting with a Graphistry embedded visualization.", "jsnext:main": "dist/index.js", "config": { @@ -85,7 +85,7 @@ "@graphistry/falcor-json-graph": "^2.9.10", "@graphistry/falcor-model-rxjs": "2.11.0", "@graphistry/falcor-socket-datasource": "2.11.3", - "@graphistry/js-upload-api": "^4.6.0-alpha.2", + "@graphistry/js-upload-api": "^4.6.0", "shallowequal": "1.1.0" }, "peerDependencies": { diff --git a/projects/cra-template/package-lock.json b/projects/cra-template/package-lock.json index 536fa64..3b441db 100644 --- a/projects/cra-template/package-lock.json +++ b/projects/cra-template/package-lock.json @@ -1,6 +1,6 @@ { "name": "@graphistry/cra-template", - "version": "4.6.0-alpha.2", + "version": "4.6.0", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/projects/cra-template/package.json b/projects/cra-template/package.json index 55b0922..4c02698 100644 --- a/projects/cra-template/package.json +++ b/projects/cra-template/package.json @@ -1,6 +1,6 @@ { "name": "@graphistry/cra-template", - "version": "4.6.0-alpha.2", + "version": "4.6.0", "private": true, "main": "dist/index.cjs.js", "module": "dist/index.esm.js", diff --git a/projects/cra-test-18/package-lock.json b/projects/cra-test-18/package-lock.json index 1158541..8230166 100644 --- a/projects/cra-test-18/package-lock.json +++ b/projects/cra-test-18/package-lock.json @@ -1,6 +1,6 @@ { "name": "test18", - "version": "4.6.0-alpha.2", + "version": "4.6.0", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/projects/cra-test-18/package.json b/projects/cra-test-18/package.json index de5ec99..d4fa16e 100644 --- a/projects/cra-test-18/package.json +++ b/projects/cra-test-18/package.json @@ -1,9 +1,9 @@ { "name": "test18", - "version": "4.6.0-alpha.2", + "version": "4.6.0", "private": true, "dependencies": { - "@graphistry/client-api-react": "^4.6.0-alpha.2", + "@graphistry/client-api-react": "^4.6.0", "@testing-library/jest-dom": "^5.16.4", "@testing-library/react": "^13.2.0", "@testing-library/user-event": "^13.5.0", diff --git a/projects/cra-test/package-lock.json b/projects/cra-test/package-lock.json index e478c15..3a8d9ca 100644 --- a/projects/cra-test/package-lock.json +++ b/projects/cra-test/package-lock.json @@ -1,6 +1,6 @@ { "name": "@graphistry/client-react-app-cra-test", - "version": "4.6.0-alpha.2", + "version": "4.6.0", "lockfileVersion": 3, "requires": true, "packages": { diff --git a/projects/cra-test/package.json b/projects/cra-test/package.json index af0ca85..18b160e 100644 --- a/projects/cra-test/package.json +++ b/projects/cra-test/package.json @@ -1,10 +1,10 @@ { "name": "@graphistry/client-react-app-cra-test", - "version": "4.6.0-alpha.2", + "version": "4.6.0", "private": true, "dependencies": { "@craco/craco": "^6.4.2", - "@graphistry/client-api-react": "^4.6.0-alpha.2", + "@graphistry/client-api-react": "^4.6.0", "@testing-library/jest-dom": "^5.16.4", "@testing-library/react": "^12.1.5", "@testing-library/user-event": "^14.2.0", diff --git a/projects/js-upload-api/package-lock.json b/projects/js-upload-api/package-lock.json index bd96e66..b87dc59 100644 --- a/projects/js-upload-api/package-lock.json +++ b/projects/js-upload-api/package-lock.json @@ -1,6 +1,6 @@ { "name": "@graphistry/js-upload-api", - "version": "4.6.0-alpha.2", + "version": "4.6.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/projects/js-upload-api/package.json b/projects/js-upload-api/package.json index 4b573a3..93c4da7 100644 --- a/projects/js-upload-api/package.json +++ b/projects/js-upload-api/package.json @@ -1,6 +1,6 @@ { "name": "@graphistry/js-upload-api", - "version": "4.6.0-alpha.2", + "version": "4.6.0", "repository": { "type": "git", "url": "git+https://github.com/graphistry/graphistry-js.git" diff --git a/projects/node-api-test-cjs/package-lock.json b/projects/node-api-test-cjs/package-lock.json index 785c40b..e68c942 100644 --- a/projects/node-api-test-cjs/package-lock.json +++ b/projects/node-api-test-cjs/package-lock.json @@ -1,6 +1,6 @@ { "name": "@graphistry/node-api-test", - "version": "4.6.0-alpha.2", + "version": "4.6.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/projects/node-api-test-cjs/package.json b/projects/node-api-test-cjs/package.json index b19e149..2469fde 100644 --- a/projects/node-api-test-cjs/package.json +++ b/projects/node-api-test-cjs/package.json @@ -1,6 +1,6 @@ { "name": "@graphistry/node-api-test-cjs", - "version": "4.6.0-alpha.2", + "version": "4.6.0", "description": "", "main": "src/index.js", "type": "commonjs", @@ -16,7 +16,7 @@ "author": "Graphistry, Inc.", "license": "Apache-2.0", "dependencies": { - "@graphistry/node-api": "^4.6.0-alpha.2", + "@graphistry/node-api": "^4.6.0", "apache-arrow": "^11.0.0" } } diff --git a/projects/node-api-test/package-lock.json b/projects/node-api-test/package-lock.json index 123a348..354ca41 100644 --- a/projects/node-api-test/package-lock.json +++ b/projects/node-api-test/package-lock.json @@ -1,6 +1,6 @@ { "name": "@graphistry/node-api-test", - "version": "4.6.0-alpha.2", + "version": "4.6.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/projects/node-api-test/package.json b/projects/node-api-test/package.json index b2876a8..83e1dde 100644 --- a/projects/node-api-test/package.json +++ b/projects/node-api-test/package.json @@ -1,6 +1,6 @@ { "name": "@graphistry/node-api-test", - "version": "4.6.0-alpha.2", + "version": "4.6.0", "description": "", "main": "src/index.js", "type": "module", @@ -16,7 +16,7 @@ "author": "Graphistry, Inc.", "license": "Apache-2.0", "dependencies": { - "@graphistry/node-api": "^4.6.0-alpha.2", + "@graphistry/node-api": "^4.6.0", "apache-arrow": "^11.0.0" } } diff --git a/projects/node-api/package-lock.json b/projects/node-api/package-lock.json index c38d00c..7b0d477 100644 --- a/projects/node-api/package-lock.json +++ b/projects/node-api/package-lock.json @@ -1,6 +1,6 @@ { "name": "@graphistry/node-api", - "version": "4.6.0-alpha.2", + "version": "4.6.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/projects/node-api/package.json b/projects/node-api/package.json index ce7c988..dab1560 100644 --- a/projects/node-api/package.json +++ b/projects/node-api/package.json @@ -1,6 +1,6 @@ { "name": "@graphistry/node-api", - "version": "4.6.0-alpha.2", + "version": "4.6.0", "repository": { "type": "git", "url": "git+https://github.com/graphistry/graphistry-js.git" @@ -74,7 +74,7 @@ "typescript": "^4.6.4" }, "dependencies": { - "@graphistry/js-upload-api": "^4.6.0-alpha.2", + "@graphistry/js-upload-api": "^4.6.0", "node-fetch-commonjs": "^3.2.4" } }