@hpcc-js/graph 2.85.3 → 2.85.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hpcc-js/graph",
3
- "version": "2.85.3",
3
+ "version": "2.85.4",
4
4
  "description": "hpcc-js - Viz Graph",
5
5
  "main": "dist/index.js",
6
6
  "module": "dist/index.es6",
@@ -54,7 +54,7 @@
54
54
  "@hpcc-js/api": "^2.12.8",
55
55
  "@hpcc-js/common": "^2.71.8",
56
56
  "@hpcc-js/html": "^2.42.9",
57
- "@hpcc-js/react": "^2.53.4",
57
+ "@hpcc-js/react": "^2.53.5",
58
58
  "@hpcc-js/util": "^2.50.2"
59
59
  },
60
60
  "devDependencies": {
@@ -88,5 +88,5 @@
88
88
  "url": "https://github.com/hpcc-systems/Visualization/issues"
89
89
  },
90
90
  "homepage": "https://github.com/hpcc-systems/Visualization",
91
- "gitHead": "d74e4271a192428d584d4bd4ff5bbf65b40284fe"
91
+ "gitHead": "2704ebc35d1e391d2ac6a0e4962b66b3b8d488f8"
92
92
  }
@@ -1,3 +1,3 @@
1
1
  export const PKG_NAME = "@hpcc-js/graph";
2
- export const PKG_VERSION = "2.85.3";
3
- export const BUILD_VERSION = "2.104.18";
2
+ export const PKG_VERSION = "2.85.4";
3
+ export const BUILD_VERSION = "2.104.19";
@@ -5,8 +5,8 @@ import { Edge } from "../Edge";
5
5
  export function genData2() {
6
6
  return {
7
7
  vertices: [
8
- ["a", "myriel@gmail.com", "fa-at", false, false, false, "fa-plus"],
9
- [1, "Napoleon", "fa-user-o", true, true, true, "fa-plus"],
8
+ ["a", "myriel@gmail.com", "fa-at", false, false, false, "fa-plus", "https://th.bing.com/th/id/OIP.3FhSHq5xMXMDZ7gYBZ1nzQHaHa?w=210&h=210&c=7&r=0&o=5&pid=1.7"],
9
+ [1, "Napoleon", "fa-user-o", true, true, true, "fa-plus", "https://th.bing.com/th/id/OIP.3FhSHq5xMXMDZ7gYBZ1nzQHaHa?w=210&h=210&c=7&r=0&o=5&pid=1.7"],
10
10
  [2, "Mlle.Baptistine", "fa-user-o"],
11
11
  [3, "Mme.Magloire", "fa-user-o"],
12
12
  [4, "CountessdeLo", "fa-user-o"],
@@ -1 +1 @@
1
- export { Test4 as Test } from "./test4";
1
+ export { Test2 as Test } from "./test2";
@@ -43,8 +43,9 @@ export class Test2 extends DataGraph {
43
43
  imageCharFill: "white"
44
44
  }])
45
45
 
46
- .vertexColumns(["id", "label", "fachar", "centroid", "ann1", "ann2", "expandedFAChar"])
46
+ .vertexColumns(["id", "label", "fachar", "centroid", "ann1", "ann2", "expandedFAChar", "imageUrl"])
47
47
  .vertexCentroidColumn("centroid")
48
+ .vertexImageUrlColumn("imageUrl")
48
49
  .vertexFACharColumn("fachar")
49
50
  .vertexIDColumn("id")
50
51
  .vertexLabelColumn("label")
@@ -58,6 +58,10 @@ export class DataGraph extends Graph2 {
58
58
  vertexLabelColumn: publish<this, string>;
59
59
  @publish("", "set", "Vertex centroid column (boolean)", function (this: DataGraph) { return this.vertexColumns(); }, { optional: true })
60
60
  vertexCentroidColumn: publish<this, string>;
61
+ @publish("", "string", "Vertex default image url")
62
+ vertexImageUrl: publish<this, string>;
63
+ @publish("", "set", "Vertex image url column", function (this: DataGraph) { return this.vertexColumns(); }, { optional: true })
64
+ vertexImageUrlColumn: publish<this, string>;
61
65
  @publish("?", "string", "Vertex default FAChar")
62
66
  vertexFAChar: publish<this, string>;
63
67
  @publish("", "set", "Vertex FAChar column", function (this: DataGraph) { return this.vertexColumns(); }, { optional: true })
@@ -170,6 +174,7 @@ export class DataGraph extends Graph2 {
170
174
  const idIdx = this.indexOf(columns, this.vertexIDColumn(), "id");
171
175
  const labelIdx = this.indexOf(columns, this.vertexLabelColumn(), "label");
172
176
  const centroidIdx = this.indexOf(columns, this.vertexCentroidColumn(), "centroid");
177
+ const imageUrlIdx = this.indexOf(columns, this.vertexImageUrlColumn(), "faChar");
173
178
  const faCharIdx = this.indexOf(columns, this.vertexFACharColumn(), "faChar");
174
179
  const vertexTooltipIdx = this.indexOf(columns, this.vertexTooltipColumn(), "tooltip");
175
180
  const annotationIdxs = annotationColumns.map(ac => this.indexOf(columns, ac.columnID(), ""));
@@ -184,6 +189,7 @@ export class DataGraph extends Graph2 {
184
189
  origData: toJsonObj(v, columns),
185
190
  centroid: !!v[centroidIdx],
186
191
  icon: {
192
+ imageUrl: "" + (v[imageUrlIdx] || this.vertexImageUrl()),
187
193
  imageChar: "" + (v[faCharIdx] || this.vertexFAChar())
188
194
  },
189
195
  annotationIDs,
@@ -1,4 +1,4 @@
1
1
  export declare const PKG_NAME = "@hpcc-js/graph";
2
- export declare const PKG_VERSION = "2.85.3";
3
- export declare const BUILD_VERSION = "2.104.18";
2
+ export declare const PKG_VERSION = "2.85.4";
3
+ export declare const BUILD_VERSION = "2.104.19";
4
4
  //# sourceMappingURL=__package__.d.ts.map
@@ -1,2 +1,2 @@
1
- export { Test4 as Test } from "./test4";
1
+ export { Test2 as Test } from "./test2";
2
2
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"test2.d.ts","sourceRoot":"","sources":["../../src/__tests__/test2.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAGhD,qBAAa,KAAM,SAAQ,SAAS;;CA0EnC"}
1
+ {"version":3,"file":"test2.d.ts","sourceRoot":"","sources":["../../src/__tests__/test2.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAGhD,qBAAa,KAAM,SAAQ,SAAS;;CA2EnC"}
@@ -22,6 +22,8 @@ export declare class DataGraph extends Graph2 {
22
22
  vertexIDColumn: publish<this, string>;
23
23
  vertexLabelColumn: publish<this, string>;
24
24
  vertexCentroidColumn: publish<this, string>;
25
+ vertexImageUrl: publish<this, string>;
26
+ vertexImageUrlColumn: publish<this, string>;
25
27
  vertexFAChar: publish<this, string>;
26
28
  vertexFACharColumn: publish<this, string>;
27
29
  vertexTooltipColumn: publish<this, string>;
@@ -1 +1 @@
1
- {"version":3,"file":"dataGraph.d.ts","sourceRoot":"","sources":["../../src/graph2/dataGraph.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAA4B,YAAY,EAAE,SAAS,EAAiB,MAAM,gBAAgB,CAAC;AAElG,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAIjC,oBAAY,QAAQ,GAAG,YAAY,CAAC;AAEpC,wBAAgB,SAAS,CAAC,CAAC,EAAE,GAAG,KAAA,EAAE,OAAO,KAAA,GAAG,CAAC,CAI5C;AAED,qBAAa,gBAAiB,SAAQ,WAAW;IAG7C,QAAQ,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAEhC,YAAY,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAEpC,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC;IAC5B,KAAK,IAAI,SAAS;IAClB,KAAK,CAAC,CAAC,EAAE,SAAS,GAAG,IAAI;IAOzB,KAAK,IAAI,OAAO;CAGnB;AAGD,qBAAa,SAAU,SAAQ,MAAM;IAGjC,eAAe,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IAEzC,SAAS,EAAE,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAElE,gBAAgB,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAExC,mBAAmB,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAG3C,aAAa,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IAEvC,QAAQ,EAAE,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAEjE,oBAAoB,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAE5C,cAAc,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAEtC,iBAAiB,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAEzC,oBAAoB,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAE5C,YAAY,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAEpC,kBAAkB,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAE1C,mBAAmB,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAE3C,uBAAuB,EAAE,OAAO,CAAC,IAAI,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAE3D,2BAA2B,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAGnD,WAAW,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IAErC,KAAK,EAAE,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAE9D,YAAY,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAEpC,eAAe,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAEvC,gBAAgB,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAExC,gBAAgB,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAExC,gBAAgB,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAExC,eAAe,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAGvC,gBAAgB,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IAE1C,SAAS,EAAE,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAElE,uBAAuB,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAE/C,sBAAsB,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;;IAa9C,KAAK;IAoBL,OAAO,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,GAAE,MAAW,GAAG,MAAM;IAKnF,OAAO,CAAC,cAAc,CAAgC;IACtD,OAAO,CAAC,gBAAgB,CAAuB;IAC/C,OAAO,CAAC,mBAAmB,CAAwC;IACnE,cAAc;IA0Bd,OAAO,CAAC,aAAa,CAA2B;IAChD,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,kBAAkB,CAAmC;IAC7D,aAAa;IA6Cb,SAAS,CAAC,UAAU,EAAE,SAAS,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAM;IAC1D,SAAS,CAAC,YAAY,EAAE,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAM;IACnD,OAAO,CAAC,eAAe,CAA8C;IACrE,UAAU;IAyCV,OAAO,CAAC,cAAc,CAAyD;IAC/E,OAAO,CAAC,gBAAgB,CAAgD;IACxE,OAAO,CAAC,mBAAmB,CAAiE;IAC5F,cAAc;IAuBd,MAAM,CAAC,OAAO,KAAA,EAAE,OAAO,KAAA;IASvB,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI;CAQ/C"}
1
+ {"version":3,"file":"dataGraph.d.ts","sourceRoot":"","sources":["../../src/graph2/dataGraph.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
1
  export declare const PKG_NAME = "@hpcc-js/graph";
2
- export declare const PKG_VERSION = "2.85.3";
3
- export declare const BUILD_VERSION = "2.104.18";
2
+ export declare const PKG_VERSION = "2.85.4";
3
+ export declare const BUILD_VERSION = "2.104.19";
4
4
  //# sourceMappingURL=__package__.d.ts.map
@@ -1,2 +1,2 @@
1
- export { Test4 as Test } from "./test4";
1
+ export { Test2 as Test } from "./test2";
2
2
  //# sourceMappingURL=index.d.ts.map
@@ -22,6 +22,8 @@ export declare class DataGraph extends Graph2 {
22
22
  vertexIDColumn: publish<this, string>;
23
23
  vertexLabelColumn: publish<this, string>;
24
24
  vertexCentroidColumn: publish<this, string>;
25
+ vertexImageUrl: publish<this, string>;
26
+ vertexImageUrlColumn: publish<this, string>;
25
27
  vertexFAChar: publish<this, string>;
26
28
  vertexFACharColumn: publish<this, string>;
27
29
  vertexTooltipColumn: publish<this, string>;