From 840499900ca321fce2d649909bb164404fd73ee7 Mon Sep 17 00:00:00 2001 From: woodjes Date: Tue, 27 Feb 2024 10:17:12 +0000 Subject: [PATCH 1/5] Add physical flow name to model and the physical flow overview #CTCTOWALTZ-3073 #6159 --- .../data/physical_flow/PhysicalFlowDao.java | 1 + .../model/physical_flow/PhysicalFlow.java | 1 + ...hysical-flow-and-specification-detail.html | 35 ++++++++++++------- .../physical-flows/physical-flow-view.html | 4 +-- waltz-ng/package-lock.json | 2 +- 5 files changed, 28 insertions(+), 15 deletions(-) diff --git a/waltz-data/src/main/java/org/finos/waltz/data/physical_flow/PhysicalFlowDao.java b/waltz-data/src/main/java/org/finos/waltz/data/physical_flow/PhysicalFlowDao.java index 4c26667744..d6023a005c 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/physical_flow/PhysicalFlowDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/physical_flow/PhysicalFlowDao.java @@ -80,6 +80,7 @@ public class PhysicalFlowDao { PhysicalFlowRecord record = r.into(PHYSICAL_FLOW); return ImmutablePhysicalFlow.builder() .id(record.getId()) + .name(Optional.ofNullable(record.getName()).orElse("")) .provenance(record.getProvenance()) .specificationId(record.getSpecificationId()) .basisOffset(record.getBasisOffset()) diff --git a/waltz-model/src/main/java/org/finos/waltz/model/physical_flow/PhysicalFlow.java b/waltz-model/src/main/java/org/finos/waltz/model/physical_flow/PhysicalFlow.java index c1706b3ce6..56edb3b28a 100644 --- a/waltz-model/src/main/java/org/finos/waltz/model/physical_flow/PhysicalFlow.java +++ b/waltz-model/src/main/java/org/finos/waltz/model/physical_flow/PhysicalFlow.java @@ -37,6 +37,7 @@ @JsonDeserialize(as = ImmutablePhysicalFlow.class) public abstract class PhysicalFlow implements IdProvider, + NameProvider, IsRemovedProvider, CreatedUserTimestampProvider, DescriptionProvider, diff --git a/waltz-ng/client/physical-flows/components/physical-flow-and-specification-detail/physical-flow-and-specification-detail.html b/waltz-ng/client/physical-flows/components/physical-flow-and-specification-detail/physical-flow-and-specification-detail.html index 2bf49a0938..a22011fce9 100644 --- a/waltz-ng/client/physical-flows/components/physical-flow-and-specification-detail/physical-flow-and-specification-detail.html +++ b/waltz-ng/client/physical-flows/components/physical-flow-and-specification-detail/physical-flow-and-specification-detail.html @@ -65,6 +65,15 @@
+
+
+ Name: +
+
+ +
+
+
Frequency: @@ -114,18 +123,6 @@ - -
-
- Description -
-
- - -
-
- -
@@ -161,4 +158,18 @@
+ +
+
+ Description +
+
+
+ + +
+
+
+
diff --git a/waltz-ng/client/physical-flows/physical-flow-view.html b/waltz-ng/client/physical-flows/physical-flow-view.html index fe9173bb85..843e5fd6ac 100644 --- a/waltz-ng/client/physical-flows/physical-flow-view.html +++ b/waltz-ng/client/physical-flows/physical-flow-view.html @@ -19,7 +19,7 @@
- @@ -35,7 +35,7 @@
  • physical Flow
    • -
  • +
  • diff --git a/waltz-ng/package-lock.json b/waltz-ng/package-lock.json index fdd032148a..0afbd1bb36 100644 --- a/waltz-ng/package-lock.json +++ b/waltz-ng/package-lock.json @@ -1,6 +1,6 @@ { "name": "waltz-ng", - "version": "1.58.0", + "version": "1.58.1", "lockfileVersion": 1, "requires": true, "dependencies": { From fedc7dd71618377a6b57abb5cafcfeb86fdb7e8c Mon Sep 17 00:00:00 2001 From: woodjes Date: Tue, 27 Feb 2024 10:56:12 +0000 Subject: [PATCH 2/5] Style physical flow section #CTCTOWALTZ-3004 #6908 --- waltz-ng/client/common/markdown-utils.js | 2 +- ...hysical-flow-and-specification-detail.html | 155 +++++++++--------- waltz-ng/style/_waltz.scss | 1 + 3 files changed, 79 insertions(+), 79 deletions(-) diff --git a/waltz-ng/client/common/markdown-utils.js b/waltz-ng/client/common/markdown-utils.js index ba081abbcb..d962e94039 100644 --- a/waltz-ng/client/common/markdown-utils.js +++ b/waltz-ng/client/common/markdown-utils.js @@ -23,7 +23,7 @@ showdown.extension("bootstrap-tables", () => { return [{ type: "output", regex: //g, - replace: "
    ", + replace: "
    ", }] }); diff --git a/waltz-ng/client/physical-flows/components/physical-flow-and-specification-detail/physical-flow-and-specification-detail.html b/waltz-ng/client/physical-flows/components/physical-flow-and-specification-detail/physical-flow-and-specification-detail.html index a22011fce9..3fe35a4b50 100644 --- a/waltz-ng/client/physical-flows/components/physical-flow-and-specification-detail/physical-flow-and-specification-detail.html +++ b/waltz-ng/client/physical-flows/components/physical-flow-and-specification-detail/physical-flow-and-specification-detail.html @@ -17,68 +17,30 @@ --> -
    -
    -
    - - - - - - - - - - - - - - - - - - -
    - Specification Name: - - - -
    - Specification Description: - - -
    - Format: - - -
    -
    -
    - -
    -
    +
    + + + Physical Flow + +
    -
    - Name: +
    + Name
    -
    +
    -
    - Frequency: +
    + Frequency
    -
    +
    @@ -87,26 +49,26 @@
    -
    - Basis Offset: +
    + Basis Offset
    -
    - - - +
    + + +
    -
    - Tags: +
    + Tags
    -
    +
    @@ -125,22 +87,22 @@
    -
    +
    External Identifier
    -
    - - +
    + +
    -
    - Additional External Id +
    + Additional External Ids
    -
    +
    @@ -149,27 +111,64 @@
    -
    +
    Provenance
    -
    - - +
    + +
    -
    +
    Description
    -
    +
    - +
    +
    -
    +
    + + + Physical Specification + + +
    +
    + Name +
    +
    + + +
    +
    + +
    +
    + Format +
    +
    + +
    +
    + +
    +
    + Description +
    +
    + +
    +
    +
    diff --git a/waltz-ng/style/_waltz.scss b/waltz-ng/style/_waltz.scss index 064064bd5e..1fce61f557 100644 --- a/waltz-ng/style/_waltz.scss +++ b/waltz-ng/style/_waltz.scss @@ -224,6 +224,7 @@ textarea { .waltz-display-field-label { color: #705f53; overflow: hidden; + padding-bottom: 0.2em; } .waltz-display-field-value { From 6d2a8908eae29aef10898971336360908d77392c Mon Sep 17 00:00:00 2001 From: woodjes Date: Tue, 27 Feb 2024 13:46:41 +0000 Subject: [PATCH 3/5] Add phys flow name to table in logical flow view #CTCTOWALTZ-3004 #6908 --- .../client/physical-flow/physical-flow-table-utilities.js | 3 ++- .../components/flow-table/physical-flow-table.js | 5 +++-- .../physical-flow-section/physical-flow-section.js | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/waltz-ng/client/physical-flow/physical-flow-table-utilities.js b/waltz-ng/client/physical-flow/physical-flow-table-utilities.js index ff4bf4610d..a43d09c2da 100644 --- a/waltz-ng/client/physical-flow/physical-flow-table-utilities.js +++ b/waltz-ng/client/physical-flow/physical-flow-table-utilities.js @@ -22,7 +22,8 @@ import {CORE_API} from "../common/services/core-api-utils"; export const columnDef = { - name: mkLinkGridCell("Name", "specification.name", "physicalFlow.id", "main.physical-flow.view"), + name: mkLinkGridCell("Name", "physicalFlow.name", "physicalFlow.id", "main.physical-flow.view"), + specName: mkLinkGridCell("Specification Name", "specification.name", "specification.id", "main.physical-specification.view"), extId: {field: "physicalFlow.externalId", displayName: "Ext. Id"}, format: {field: "specification.format", displayName: "Format", cellFilter: "toDisplayName:\"DataFormatKind\""}, transport: { diff --git a/waltz-ng/client/physical-flows/components/flow-table/physical-flow-table.js b/waltz-ng/client/physical-flows/components/flow-table/physical-flow-table.js index 64bfcfce6c..86ada197e2 100644 --- a/waltz-ng/client/physical-flows/components/flow-table/physical-flow-table.js +++ b/waltz-ng/client/physical-flows/components/flow-table/physical-flow-table.js @@ -40,6 +40,7 @@ function controller($q, serviceBroker) { const defaultColumnDefs = [ withWidth(columnDef.name, "20%"), + withWidth(columnDef.specName, "20%"), columnDef.extId, columnDef.format, columnDef.transport, @@ -48,13 +49,13 @@ function controller($q, serviceBroker) { columnDef.description ]; - vm.$onInit = () => { + vm.$onChanges = () => { vm.columnDefs = _.isEmpty(vm.optionalColumnDefs) ? defaultColumnDefs : vm.optionalColumnDefs; - vm.tableData = fetchData(vm.parentEntityRef, $q, serviceBroker) + fetchData(vm.parentEntityRef, $q, serviceBroker) .then(data => vm.tableData = data); vm.selectorOptions = mkSelectionOptions( diff --git a/waltz-ng/client/physical-flows/components/physical-flow-section/physical-flow-section.js b/waltz-ng/client/physical-flows/components/physical-flow-section/physical-flow-section.js index ef4b794b83..4abd15dfa9 100644 --- a/waltz-ng/client/physical-flows/components/physical-flow-section/physical-flow-section.js +++ b/waltz-ng/client/physical-flows/components/physical-flow-section/physical-flow-section.js @@ -33,6 +33,7 @@ function determineColumnDefs(entityKind) { switch (entityKind) { case "PHYSICAL_SPECIFICATION": return [ + columnDef.name, columnDef.extId, columnDef.source, columnDef.target, @@ -42,9 +43,9 @@ function determineColumnDefs(entityKind) { case "TAG": return [ columnDef.name, + columnDef.extId, columnDef.source, columnDef.target, - columnDef.extId, columnDef.frequency, columnDef.description]; default: From f5c535263c70f48aaacb341dec4f3e410759a516 Mon Sep 17 00:00:00 2001 From: woodjes Date: Tue, 27 Feb 2024 13:58:01 +0000 Subject: [PATCH 4/5] Default when no value provided on link cell to '-' for clickable link #CTCTOWALTZ-3004 #6908 --- waltz-ng/client/common/grid-utils.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/waltz-ng/client/common/grid-utils.js b/waltz-ng/client/common/grid-utils.js index a4f82ac686..8f48cdccff 100644 --- a/waltz-ng/client/common/grid-utils.js +++ b/waltz-ng/client/common/grid-utils.js @@ -130,8 +130,13 @@ export function mkLinkGridCell(columnHeading, cellTemplate: `
    + + - +
    ` }); } From 40ecd6efc7af8e5fd314c4cef5b294d74bae5196 Mon Sep 17 00:00:00 2001 From: woodjes Date: Tue, 27 Feb 2024 14:44:33 +0000 Subject: [PATCH 5/5] Default when no value provided on link cell to '-' for clickable link #CTCTOWALTZ-3004 #6908 --- .../common/components/entity-link/entity-icon-label.html | 5 ++++- waltz-ng/client/common/services/enums/entity.js | 2 +- waltz-ng/client/common/svelte/EntityLabel.svelte | 3 ++- .../source-and-target-panel/source-and-target-panel.html | 9 ++++++++- .../physical-flow/physical-flow-table-utilities.js | 4 ++-- waltz-ng/client/physical-flows/physical-flow-view.html | 2 +- 6 files changed, 18 insertions(+), 7 deletions(-) diff --git a/waltz-ng/client/common/components/entity-link/entity-icon-label.html b/waltz-ng/client/common/components/entity-link/entity-icon-label.html index 9afb91a758..a21b597cfb 100644 --- a/waltz-ng/client/common/components/entity-link/entity-icon-label.html +++ b/waltz-ng/client/common/components/entity-link/entity-icon-label.html @@ -12,11 +12,14 @@ + + + - {/if} - + {name} diff --git a/waltz-ng/client/logical-flow/components/source-and-target-panel/source-and-target-panel.html b/waltz-ng/client/logical-flow/components/source-and-target-panel/source-and-target-panel.html index 10aab8c4cb..dabc77e73e 100644 --- a/waltz-ng/client/logical-flow/components/source-and-target-panel/source-and-target-panel.html +++ b/waltz-ng/client/logical-flow/components/source-and-target-panel/source-and-target-panel.html @@ -201,6 +201,7 @@

    Name + Specification Format Transport Frequency @@ -210,7 +211,8 @@

    - + + -   uib-tooltip="Changes planned for this physical flow"> + + + + + + icon="{{ctrl.physicalFlow.kind | toIconName:'entity'}}">
    1. Home