Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixing build #6736

Merged
merged 1 commit into from
Aug 29, 2023
Merged

Fixing build #6736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 1 addition & 16 deletions ...java/org/finos/waltz/data/aggregate_overlay_diagram/AggregateOverlayDiagramUtilities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@

package org.finos.waltz.data.aggregate_overlay_diagram;

import org.finos.waltz.data.InlineSelectFieldFactory;
import org.finos.waltz.model.EntityKind;
import org.finos.waltz.model.EntityReference;
import org.finos.waltz.model.ReleaseLifecycleStatus;
Expand Down Expand Up @@ -43,20 +42,12 @@
import static java.util.stream.Collectors.toMap;
import static java.util.stream.Collectors.toSet;
import static org.finos.waltz.common.DateTimeUtilities.toLocalDateTime;
import static org.finos.waltz.common.ListUtilities.newArrayList;
import static org.finos.waltz.common.MapUtilities.groupBy;
import static org.finos.waltz.common.SetUtilities.fromCollection;
import static org.finos.waltz.common.SetUtilities.union;
import static org.finos.waltz.data.JooqUtilities.readRef;
import static org.finos.waltz.model.EntityReference.mkRef;
import static org.finos.waltz.schema.Tables.AGGREGATE_OVERLAY_DIAGRAM;
import static org.finos.waltz.schema.Tables.AGGREGATE_OVERLAY_DIAGRAM_CELL_DATA;
import static org.finos.waltz.schema.Tables.APPLICATION;
import static org.finos.waltz.schema.Tables.DATA_TYPE_USAGE;
import static org.finos.waltz.schema.Tables.ENTITY_HIERARCHY;
import static org.finos.waltz.schema.Tables.MEASURABLE_RATING;
import static org.finos.waltz.schema.Tables.MEASURABLE_RATING_PLANNED_DECOMMISSION;
import static org.finos.waltz.schema.Tables.MEASURABLE_RATING_REPLACEMENT;
import static org.finos.waltz.schema.Tables.*;
import static org.finos.waltz.schema.tables.EntityRelationship.ENTITY_RELATIONSHIP;
import static org.jooq.lambda.tuple.Tuple.tuple;

Expand All @@ -68,12 +59,6 @@ public class AggregateOverlayDiagramUtilities {
private static final MeasurableRatingReplacement mrp = MEASURABLE_RATING_REPLACEMENT;


private static final Field<String> ENTITY_NAME_FIELD = InlineSelectFieldFactory.mkNameField(
mrpd.ENTITY_ID,
mrpd.ENTITY_KIND,
newArrayList(EntityKind.APPLICATION, EntityKind.CHANGE_INITIATIVE))
.as("entity_name");

protected static final RecordMapper<? super Record, ? extends AggregateOverlayDiagram> TO_DOMAIN_MAPPER = r -> {
AggregateOverlayDiagramRecord record = r.into(AGGREGATE_OVERLAY_DIAGRAM);
return ImmutableAggregateOverlayDiagram.builder()
Expand Down
4 changes: 1 addition & 3 deletions waltz-ng/client/measurable-rating/measurable-rating-utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@
*
*/
import _ from "lodash";
import moment from "moment";
import {CORE_API} from "../common/services/core-api-utils";
import {mkSelectionOptions} from "../common/selector-utils";
import {formats} from "../common";
import {lastViewedMeasurableCategoryKey} from "../user";


Expand Down Expand Up @@ -178,7 +176,7 @@ export function loadAllData(

/**
*
* @param ctx - {measurables: [], allocationSchemes: [], categories: [], ratingSchemesById: {}, allocations: []}
* @param ctx - {measurables: [], allocationSchemes: [], categories: [], ratingSchemesById: {}, allocations: [], ratings: []}
* @param includeEmpty
* @returns {*}
*/
Expand Down
Loading