This is an automated email from the ASF dual-hosted git repository.
mfholz pushed a change to branch translate-dashboard
in repository https://gitbox.apache.org/repos/asf/streampipes.git
from 867b33bb56 resolve merge conflicts
add cd51237e58 Resolve merge conflicts
No new revisions were added by this update.
Summary of changes:
.asf.yaml | 10 ++-
.../management/health/AdapterHealthCheck.java | 2 +-
.../management/AdapterMasterManagement.java | 17 +++-
.../management/AdapterUpdateManagement.java | 2 +-
streampipes-data-export/pom.xml | 5 ++
.../export/dataimport/ImportGenerator.java | 11 +++
.../export/dataimport/PerformImportGenerator.java | 53 +++++++----
.../export/dataimport/PreviewImportGenerator.java | 9 +-
.../export/generator/ExportPackageGenerator.java | 5 ++
.../export/resolver/AbstractResolver.java | 21 ++---
.../export/resolver/AdapterResolver.java | 44 +++++++--
.../streampipes/export/resolver/ChartResolver.java | 12 ++-
.../export/resolver/DashboardResolver.java | 12 ++-
.../export/resolver/DataSourceResolver.java | 18 ++--
.../export/resolver/DocumentResolver.java | 34 +++----
.../streampipes/export/resolver/FileResolver.java | 12 ++-
.../resolver/GenericStorageDocumentResolver.java | 100 +++++++++++++++++++++
.../export/resolver/MeasurementResolver.java | 12 ++-
.../export/resolver/PipelineResolver.java | 33 ++++---
.../export/utils/ImportAdapterMigrationUtils.java | 55 ------------
.../model/datalake/AggregationFunction.java | 5 +-
.../model/export/AssetExportConfiguration.java | 23 +++++
.../export/StreamPipesApplicationPackage.java | 14 +++
.../rest/impl/connect/AdapterResource.java | 9 +-
.../streampipes/storage/api/CRUDStorage.java | 4 +-
.../streampipes/storage/api/IGenericStorage.java | 2 +
.../storage/couchdb/impl/GenericStorageImpl.java | 9 ++
ui/package-lock.json | 14 +--
.../src/lib/apis/adapter.service.ts | 11 ++-
.../src/lib/model/gen/streampipes-model.ts | 13 ++-
.../exception-details-dialog.component.ts | 10 ++-
.../asset-selection-panel.component.ts | 2 +-
ui/src/app/configuration/configuration.module.ts | 4 +
.../data-export-dialog.component.html | 4 +
.../generic-storage-item.component.html} | 27 +++---
.../generic-storage-item.component.ts} | 19 ++--
.../generic-storage-items.component.html | 54 +++++++++++
.../generic-storage-items.component.ts} | 32 +++++--
.../data-import-dialog.component.html | 46 ++++++++--
.../data-import-dialog.component.scss | 5 ++
.../import-dialog/data-import-dialog.component.ts | 30 ++++++-
.../existing-adapters.component.ts | 50 +++++++----
.../charts/heatmap/heatmap-renderer.service.ts | 2 +-
.../map/config/map-widget-config.component.html | 3 +-
.../map/config/map-widget-config.component.ts | 9 +-
.../components/charts/map/map-widget.component.ts | 52 +++++------
.../value-heatmap-renderer.service.ts | 7 +-
.../field-selection/field-selection.component.html | 15 ++++
ui/src/assets/img/car.png | Bin 0 -> 7166 bytes
49 files changed, 678 insertions(+), 264 deletions(-)
copy
streampipes-client/src/main/java/org/apache/streampipes/client/serializer/Serializer.java
=>
streampipes-data-export/src/main/java/org/apache/streampipes/export/resolver/DocumentResolver.java
(54%)
create mode 100644
streampipes-data-export/src/main/java/org/apache/streampipes/export/resolver/GenericStorageDocumentResolver.java
delete mode 100644
streampipes-data-export/src/main/java/org/apache/streampipes/export/utils/ImportAdapterMigrationUtils.java
copy
ui/src/app/{core-ui/static-properties/static-runtime-resolvable-tree-input/static-tree-input-selected-nodes/static-tree-input-selected-nodes.component.html
=>
configuration/export/export-dialog/generic-storage-items/generic-storage-item/generic-storage-item.component.html}
(66%)
copy
ui/src/app/configuration/{messaging-configuration/broker-config/broker-config.component.ts
=>
export/export-dialog/generic-storage-items/generic-storage-item/generic-storage-item.component.ts}
(74%)
create mode 100644
ui/src/app/configuration/export/export-dialog/generic-storage-items/generic-storage-items.component.html
copy
ui/src/app/configuration/export/export-dialog/{data-export-item/data-export-item.component.ts
=> generic-storage-items/generic-storage-items.component.ts} (56%)
create mode 100644 ui/src/assets/img/car.png
