-
Notifications
You must be signed in to change notification settings - Fork 129
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Pull request #365: CTCTOWALTZ-3094 make fcr visible in data type editor
Merge in WALTZ/waltz from WALTZ/waltz-jws:CTCTOWALTZ-3094-make-fcr-visible-in-data-type-editor to db-feature/waltz-7053-visualise-inbound-ratings-datatype-selector * commit '84891c7aa8257c93503ac3a4162dd3b59a96a387': Return rating classifications for source and target Return rating classifications for source and target Return rating classifications for source and target Enhance data type selector panel for flows Return rating classifications for source and target
- Loading branch information
Showing
19 changed files
with
534 additions
and
207 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
51 changes: 51 additions & 0 deletions
51
.../src/main/java/org/finos/waltz/model/datatype/DataTypeDecoratorRatingCharacteristics.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| /* | ||
| * Waltz - Enterprise Architecture | ||
| * Copyright (C) 2016, 2017, 2018, 2019 Waltz open source project | ||
| * See README.md for more information | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific | ||
| * | ||
| */ | ||
|
|
||
| package org.finos.waltz.model.datatype; | ||
|
|
||
| import com.fasterxml.jackson.databind.annotation.JsonDeserialize; | ||
| import com.fasterxml.jackson.databind.annotation.JsonSerialize; | ||
| import org.finos.waltz.model.EntityReference; | ||
| import org.finos.waltz.model.Nullable; | ||
| import org.finos.waltz.model.rating.AuthoritativenessRatingValue; | ||
| import org.immutables.value.Value; | ||
|
|
||
| /** | ||
| * Data Type decorator usage stats | ||
| */ | ||
| @Value.Immutable | ||
| @JsonSerialize(as = ImmutableDataTypeDecoratorRatingCharacteristics.class) | ||
| @JsonDeserialize(as = ImmutableDataTypeDecoratorRatingCharacteristics.class) | ||
| public abstract class DataTypeDecoratorRatingCharacteristics { | ||
|
|
||
| public abstract EntityReference source(); | ||
| public abstract EntityReference target(); | ||
|
|
||
| public abstract long dataTypeId(); | ||
|
|
||
| @Value.Default | ||
| public AuthoritativenessRatingValue sourceOutboundRating(){ | ||
| return AuthoritativenessRatingValue.NO_OPINION; | ||
| } | ||
|
|
||
| @Value.Default | ||
| public AuthoritativenessRatingValue targetInboundRating(){ | ||
| return AuthoritativenessRatingValue.NO_OPINION; | ||
| }; | ||
|
|
||
| } |
36 changes: 36 additions & 0 deletions
36
...in/java/org/finos/waltz/model/datatype/DataTypeDecoratorRatingCharacteristicsRequest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| /* | ||
| * Waltz - Enterprise Architecture | ||
| * Copyright (C) 2016, 2017, 2018, 2019 Waltz open source project | ||
| * See README.md for more information | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific | ||
| * | ||
| */ | ||
|
|
||
| package org.finos.waltz.model.datatype; | ||
|
|
||
| import com.fasterxml.jackson.databind.annotation.JsonDeserialize; | ||
| import com.fasterxml.jackson.databind.annotation.JsonSerialize; | ||
| import org.finos.waltz.model.EntityReference; | ||
| import org.immutables.value.Value; | ||
|
|
||
| /** | ||
| * Data Type decorator usage stats | ||
| */ | ||
| @Value.Immutable | ||
| @JsonSerialize(as = ImmutableDataTypeDecoratorRatingCharacteristicsRequest.class) | ||
| @JsonDeserialize(as = ImmutableDataTypeDecoratorRatingCharacteristicsRequest.class) | ||
| public abstract class DataTypeDecoratorRatingCharacteristicsRequest { | ||
| public abstract EntityReference source(); | ||
| public abstract EntityReference target(); | ||
|
|
||
| } |
92 changes: 92 additions & 0 deletions
92
waltz-ng/client/common/svelte/DataTypeNodeTooltipContent.svelte
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| <script> | ||
| import Icon from "./Icon.svelte"; | ||
| import RatingIndicatorCell from "../../ratings/components/rating-indicator-cell/RatingIndicatorCell.svelte"; | ||
| import _ from "lodash"; | ||
| export let name; | ||
| export let description; | ||
| export let concrete; | ||
| export let ratingCharacteristics; | ||
| export let usageCharacteristics; | ||
| export let isEditMode = false; | ||
| </script> | ||
|
|
||
|
|
||
| <div class="row"> | ||
| <div class="col-sm-12"> | ||
| <h4>{name}</h4> | ||
| </div> | ||
| </div> | ||
| <div class="row"> | ||
| <div class="col-sm-12"> | ||
| {description} | ||
| </div> | ||
| </div> | ||
| {#if !_.isEmpty(ratingCharacteristics)} | ||
| <hr> | ||
| {/if} | ||
| {#if ratingCharacteristics} | ||
| <div class="row"> | ||
| <div class="col-sm-4">Source Outbound Rating:</div> | ||
| <div class="col-sm-8"> | ||
| <RatingIndicatorCell {...ratingCharacteristics.sourceOutboundClassification} showName={true}/> | ||
| </div> | ||
| </div> | ||
| <div class="row"> | ||
| <div class="col-sm-12 help-block small"> | ||
| This describes the rating of the data flow looking at outbound flow classification rules from the upstream entity. | ||
| </div> | ||
| </div> | ||
| <div class="row"> | ||
| <div class="col-sm-4">Target Inbound Rating:</div> | ||
| <div class="col-sm-8"> | ||
| <RatingIndicatorCell {...ratingCharacteristics.targetInboundClassification} showName={true}/> | ||
| </div> | ||
| </div> | ||
| <div class="row"> | ||
| <div class="col-sm-12 help-block small"> | ||
| This describes the rating of the data flow looking at inbound flow classification rules for the downstream target entity. | ||
| </div> | ||
| </div> | ||
| {/if} | ||
| {#if !_.isEmpty(usageCharacteristics)} | ||
| <hr> | ||
| {/if} | ||
| {#if !concrete && !_.isEmpty(usageCharacteristics)} | ||
| <div class="row"> | ||
| <div class="col-sm-12"> | ||
| <span class="waltz-error-icon"> | ||
| <Icon name="exclamation-triangle" | ||
| style="vertical-align: middle" | ||
| size="xl"/> | ||
| </span> | ||
| This data type is non-concrete so should not be mapped to | ||
| </div> | ||
| </div> | ||
| {/if} | ||
| {#if isEditMode && !_.isEmpty(usageCharacteristics?.warningMessageForEditors)} | ||
| <div class="row"> | ||
| <div class="col-sm-12"> | ||
| <span class="waltz-warning-icon"> | ||
| <Icon name="exclamation-triangle" | ||
| style="vertical-align: middle" | ||
| size="xl"/> | ||
| </span> | ||
| {usageCharacteristics.warningMessageForEditors} | ||
| </div> | ||
| </div> | ||
| {/if} | ||
| {#if !isEditMode && !_.isEmpty(usageCharacteristics?.warningMessageForViewers)} | ||
| <div class="row"> | ||
| <div class="col-sm-12"> | ||
| <span class="waltz-warning-icon"> | ||
| <Icon name="exclamation-triangle" | ||
| style="vertical-align: middle" | ||
| size="xl"/> | ||
| </span> | ||
| {usageCharacteristics.warningMessageForViewers} | ||
| </div> | ||
| </div> | ||
| {/if} |
Oops, something went wrong.