diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cf5fb43..e7b5327 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,6 +2,10 @@ name: build on: [push, workflow_dispatch] +permissions: + contents: write + id-token: write + jobs: build: uses: datavisyn/github-workflows/.github/workflows/build-node.yml@main diff --git a/package.json b/package.json index d8bea6b..390ba7f 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "tourdino", "description": "Calculate and visualize similarity measures.", "homepage": "https://phovea.caleydo.org", - "version": "7.0.1", + "version": "8.0.0", "author": { "name": "The Caleydo Team", "email": "contact@caleydo.org", @@ -65,15 +65,21 @@ "d3.parsets": "git+ssh://git@github.com/jasondavies/d3-parsets#v1.2.4", "jstat": "^1.9.4", "lodash": "~4.17.20", - "tdp_core": "^16.1.0", + "tdp_core": "^20.1.0", "vega": "~5.20.0", "vega-embed": "6.19.1", "vega-functions": "5.12.0", "vega-lite": "5.1.1", "vega-parser": "6.1.3", - "visyn_scripts": "^1.0.1", + "visyn_scripts": "^4.1.0", "xxhashjs": "^0.2.2" }, + "resolutions": { + "@types/react": "~18.2.0", + "@types/react-dom": "~18.2.0", + "react": "~18.2.0", + "react-dom": "~18.2.0" + }, "visyn": { "entries": { "app": "./index.js" diff --git a/src/phovea.ts b/src/phovea.ts index c4a8a81..147c954 100644 --- a/src/phovea.ts +++ b/src/phovea.ts @@ -3,7 +3,8 @@ * Copyright (c) The Caleydo Team. All rights reserved. * Licensed under the new BSD license, available at http://caleydo.org/license **************************************************************************** */ -import { IRegistry } from 'tdp_core'; + +import { IRegistry } from 'visyn_core/plugin'; import { EP_TDP_CORE_LINEUP_PANEL_TAB, IPanelTabExtensionDesc } from 'tdp_core'; export default function (registry: IRegistry) { diff --git a/src/phovea_registry.ts b/src/phovea_registry.ts index d3cb5a1..d21227a 100644 --- a/src/phovea_registry.ts +++ b/src/phovea_registry.ts @@ -4,7 +4,7 @@ * Licensed under the new BSD license, available at http://caleydo.org/license **************************************************************************** */ -import { PluginRegistry } from 'tdp_core'; +import { PluginRegistry } from 'visyn_core/plugin'; import reg from './phovea'; /** diff --git a/src/tasks/ATouringTask.ts b/src/tasks/ATouringTask.ts index 3dadd94..6ebb6f4 100644 --- a/src/tasks/ATouringTask.ts +++ b/src/tasks/ATouringTask.ts @@ -2,7 +2,8 @@ import * as $ from 'jquery'; import * as d3v3 from 'd3v3'; import 'select2'; import { LocalDataProvider, IColumnDesc, CategoricalColumn, ICategoricalColumnDesc, Column } from 'lineupjs'; -import { IServerColumn, UniqueIdManager } from 'tdp_core'; +import { IServerColumn } from 'visyn_core/base'; +import { UniqueIdManager } from 'tdp_core'; import { IMeasureResult, ISimilarityMeasure, ISetParameters } from '../base/interfaces'; import { SCOPE } from '../base/constants'; import { RankingAdapter } from './RankingAdapter'; diff --git a/src/tasks/ColumnComparisonTask.ts b/src/tasks/ColumnComparisonTask.ts index be08df0..1d881f1 100644 --- a/src/tasks/ColumnComparisonTask.ts +++ b/src/tasks/ColumnComparisonTask.ts @@ -1,7 +1,7 @@ import * as XXH from 'xxhashjs'; import { cloneDeep } from 'lodash'; import { IColumnDesc } from 'lineupjs'; -import { IServerColumn } from 'tdp_core'; +import { IServerColumn } from 'visyn_core/base'; import colCmpHtml from '../templates/ColumnComparison.html'; // webpack imports html to variable import colCmpIcon from '../assets/colCmp.png'; diff --git a/src/tasks/RankingAdapter.ts b/src/tasks/RankingAdapter.ts index 265a790..8a2f431 100644 --- a/src/tasks/RankingAdapter.ts +++ b/src/tasks/RankingAdapter.ts @@ -1,5 +1,6 @@ import { LocalDataProvider, IColumnDesc, ICategory, Column, Ranking, IDataRow, IOrderedGroup } from 'lineupjs'; -import { IServerColumn, IAccessorFunc } from 'tdp_core'; +import { IAccessorFunc } from 'tdp_core'; +import { IServerColumn } from 'visyn_core/base'; import { BaseUtils } from '../base/BaseUtils'; diff --git a/src/tasks/RowComparisonTask.ts b/src/tasks/RowComparisonTask.ts index e2295e6..6eb4d68 100644 --- a/src/tasks/RowComparisonTask.ts +++ b/src/tasks/RowComparisonTask.ts @@ -2,7 +2,7 @@ import * as $ from 'jquery'; import * as d3v3 from 'd3v3'; import * as XXH from 'xxhashjs'; import { IColumnDesc, ICategoricalColumnDesc, ICategory } from 'lineupjs'; -import { IServerColumn } from 'tdp_core'; +import { IServerColumn } from 'visyn_core/base'; import rowCmpHtml from '../templates/RowComparison.html'; // webpack imports html to variable import rowCmpIcon from '../assets/rowCmp.png'; diff --git a/src/tasks/TaskUtils.ts b/src/tasks/TaskUtils.ts index c18f4f9..7819b84 100644 --- a/src/tasks/TaskUtils.ts +++ b/src/tasks/TaskUtils.ts @@ -1,6 +1,7 @@ import * as d3v3 from 'd3v3'; import { IColumnDesc } from 'lineupjs'; -import { IServerColumn, UniqueIdManager } from 'tdp_core'; +import { IServerColumn } from 'visyn_core/base'; +import { UniqueIdManager } from 'tdp_core'; import { RankingAdapter } from './RankingAdapter'; export class TaskUtils { @@ -28,7 +29,8 @@ export class TaskUtils { }); return cp.map((n: any) => TaskUtils.deepCopy(n)) as any; } - if (typeof target === 'object' && target !== {}) { + // not an empty object + if (typeof target === 'object' && Object.keys(target).length > 0) { const cp = { ...(target as { [key: string]: any }) } as { [key: string]: any }; Object.keys(cp).forEach((k) => { cp[k] = TaskUtils.deepCopy(cp[k]);