+ {tdsState.queryBuilderState.milestoningState
+ .isMilestonedQuery && (
+ <>
+
+ Milestoning
+
+ {milestoningState.isCurrentClassMilestoned && (
+
+ )}
+ {isAllVersionsEnabled &&
+ milestoningState.isCurrentClassSupportsVersionsInRange && (
+ <>
+
+ {isAllVersionsInRangeEnabled &&
+ startDate &&
+ endDate && (
+
+
+
+ Start Date
+
+ setStartDate(val)}
+ />
+
+
+
+ End Date
+
+ setEndDate(val)}
+ />
+
+
+ )}
+
+ )}
+ {!isAllVersionsEnabled && (
+ <>
+ {processingDate && (
+
+
+ Processing Date
+
+
+ setProcessingDate(val)
+ }
+ />
+
+ )}
+ {businessDate && (
+
+
+ Business Date
+
+
+ setBusinessDate(val)
+ }
+ />
+
+ )}
+
+ )}
+
+
+ List of compatible milestoning parameters
+
+
+
+
+ {filteredParameterStates.length === 0 && (
+ <> No available parameters
+ )}
+ {filteredParameterStates.map((pState) => (
+
+ ))}
+
+ {Boolean(filteredConstantState.length) && (
+
+ {filteredConstantState.map((constantState) => (
+
+ ))}
+
+ )}
+
+
+ Other
+
+
+ )}
+
+ {tdsState.isQueryOptionsSet && ' - '}
+
+ {tdsState.queryBuilderState.milestoningState.businessDate && (
+
+
+ Business Date
+
+
+
+ )}
+ {tdsState.queryBuilderState.milestoningState.processingDate && (
+
+
+ Processing Date
+
+
+
+ )}
+ {tdsState.queryBuilderState.milestoningState
+ .isAllVersionsEnabled &&
+ !tdsState.queryBuilderState.milestoningState
+ .isAllVersionsInRangeEnabled && (
+
+
+ All Versions
+
+
+
+ )}
+ {tdsState.queryBuilderState.milestoningState
+ .isAllVersionsInRangeEnabled &&
+ tdsState.queryBuilderState.milestoningState.startDate &&
+ tdsState.queryBuilderState.milestoningState.endDate && (
+
+
+ All Versions
+
+
+
+ )}
{tdsState.resultSetModifierState.limit && (
Max Rows
-
- {tdsState.resultSetModifierState.limit}
-
+
+ {tdsState.resultSetModifierState.limit}
+
+
)}
{tdsState.resultSetModifierState.distinct && (
@@ -1166,12 +1257,14 @@ export const QueryBuilderTDSPanel = observer(
Eliminate Duplicate Rows
-
- Yes
-
+
+ Yes
+
+
- {`${columnState.columnState.columnName} ${columnState.sortType}`}
-
+
+ {`${columnState.columnState.columnName} ${columnState.sortType}`}
+
+
),
)}
@@ -1197,12 +1292,14 @@ export const QueryBuilderTDSPanel = observer(
- {`${tdsState.resultSetModifierState.slice[0]},${tdsState.resultSetModifierState.slice[1]}`}
-
+
+ {`${tdsState.resultSetModifierState.slice[0]},${tdsState.resultSetModifierState.slice[1]}`}
+
+
)}
{tdsState.queryBuilderState.watermarkState.value && (
diff --git a/packages/legend-query-builder/src/stores/QueryBuilderValueSpecificationHelper.ts b/packages/legend-query-builder/src/stores/QueryBuilderValueSpecificationHelper.ts
index 4b02a09448d..63fe77306ac 100644
--- a/packages/legend-query-builder/src/stores/QueryBuilderValueSpecificationHelper.ts
+++ b/packages/legend-query-builder/src/stores/QueryBuilderValueSpecificationHelper.ts
@@ -63,6 +63,7 @@ import {
validateMilestoningPropertyExpressionChain,
} from './milestoning/QueryBuilderMilestoningHelper.js';
import { instanceValue_setValues } from './shared/ValueSpecificationModifierHelper.js';
+import type { QueryBuilderState } from './QueryBuilderState.js';
export const getNonCollectionValueSpecificationType = (
valueSpecification: ValueSpecification,
@@ -329,6 +330,7 @@ export const buildGenericLambdaFunctionInstanceValue = (
export const validatePropertyExpressionChain = (
propertyExpression: AbstractPropertyExpression,
graph: PureModel,
+ queryBuilderState: QueryBuilderState,
): void => {
if (
propertyExpression.func.value.genericType.value.rawType instanceof Class &&
@@ -355,6 +357,7 @@ export const validatePropertyExpressionChain = (
sourceStereotype,
targetStereotype,
propertyExpression,
+ queryBuilderState,
);
}
}
diff --git a/packages/legend-query-builder/src/stores/fetch-structure/tds/QueryBuilderTDSState.ts b/packages/legend-query-builder/src/stores/fetch-structure/tds/QueryBuilderTDSState.ts
index db5e009975f..bab75cdd1ae 100644
--- a/packages/legend-query-builder/src/stores/fetch-structure/tds/QueryBuilderTDSState.ts
+++ b/packages/legend-query-builder/src/stores/fetch-structure/tds/QueryBuilderTDSState.ts
@@ -146,6 +146,7 @@ export class QueryBuilderTDSState
TEMPORARY__showPostFetchStructurePanel: computed,
derivations: computed,
hasParserError: computed,
+ isQueryOptionsSet: computed,
addColumn: action,
moveColumn: action,
removeAllColumns: action,
@@ -356,6 +357,16 @@ export class QueryBuilderTDSState
return fetchStructureValidationIssues;
}
+ get isQueryOptionsSet(): boolean {
+ return (
+ this.resultSetModifierState.limit !== undefined ||
+ this.queryBuilderState.milestoningState.isMilestonedQuery ||
+ this.resultSetModifierState.slice !== undefined ||
+ this.resultSetModifierState.sortColumns.length > 0 ||
+ this.resultSetModifierState.distinct
+ );
+ }
+
get tdsColumns(): QueryBuilderTDSColumnState[] {
const aggregationStateCols = this.aggregationState.columns.map(
(c) => c.projectionColumnState,
diff --git a/packages/legend-query-builder/src/stores/fetch-structure/tds/projection/QueryBuilderProjectionStateBuilder.ts b/packages/legend-query-builder/src/stores/fetch-structure/tds/projection/QueryBuilderProjectionStateBuilder.ts
index bbe3997c5c9..2117b109c3e 100644
--- a/packages/legend-query-builder/src/stores/fetch-structure/tds/projection/QueryBuilderProjectionStateBuilder.ts
+++ b/packages/legend-query-builder/src/stores/fetch-structure/tds/projection/QueryBuilderProjectionStateBuilder.ts
@@ -159,6 +159,7 @@ export const processTDSProjectionColumnPropertyExpression = (
validatePropertyExpressionChain(
currentPropertyExpression,
queryBuilderState.graphManagerState.graph,
+ queryBuilderState,
);
currentPropertyExpression = guaranteeNonNullable(
currentPropertyExpression.parametersValues[0],
diff --git a/packages/legend-query-builder/src/stores/filter/QueryBuilderFilterStateBuilder.ts b/packages/legend-query-builder/src/stores/filter/QueryBuilderFilterStateBuilder.ts
index 90dcc6b7ff4..7b3fa30919a 100644
--- a/packages/legend-query-builder/src/stores/filter/QueryBuilderFilterStateBuilder.ts
+++ b/packages/legend-query-builder/src/stores/filter/QueryBuilderFilterStateBuilder.ts
@@ -309,6 +309,7 @@ const processFilterTree = (
validatePropertyExpressionChain(
currentPropertyExpression,
filterState.queryBuilderState.graphManagerState.graph,
+ filterState.queryBuilderState,
);
}
}
diff --git a/packages/legend-query-builder/src/stores/milestoning/QueryBuilderBitemporalMilestoningImplementation.ts b/packages/legend-query-builder/src/stores/milestoning/QueryBuilderBitemporalMilestoningImplementation.ts
index 859607dc040..3a33bb5500c 100644
--- a/packages/legend-query-builder/src/stores/milestoning/QueryBuilderBitemporalMilestoningImplementation.ts
+++ b/packages/legend-query-builder/src/stores/milestoning/QueryBuilderBitemporalMilestoningImplementation.ts
@@ -23,18 +23,21 @@ import {
MILESTONING_STEREOTYPE,
INTERNAL__PropagatedValue,
PrimitiveType,
+ VariableExpression,
} from '@finos/legend-graph';
import {
UnsupportedOperationError,
assertTrue,
guaranteeNonNullable,
guaranteeType,
+ isNonNullable,
} from '@finos/legend-shared';
import { getParameterValue } from '../../components/QueryBuilderSideBar.js';
import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../graph/QueryBuilderMetaModelConst.js';
import type { QueryBuilderDerivedPropertyExpressionState } from '../QueryBuilderPropertyEditorState.js';
import { createSupportedFunctionExpression } from '../shared/ValueSpecificationEditorHelper.js';
import { QueryBuilderMilestoningImplementation } from './QueryBuilderMilestoningImplementation.js';
+import type { LambdaParameterState } from '../shared/LambdaParameterState.js';
export class QueryBuilderBitemporalMilestoningImplementation extends QueryBuilderMilestoningImplementation {
getMilestoningDate(index?: number): ValueSpecification | undefined {
@@ -70,6 +73,26 @@ export class QueryBuilderBitemporalMilestoningImplementation extends QueryBuilde
this.milestoningState.queryBuilderState.setShowParametersPanel(true);
}
+ buildParameterStatesFromMilestoningParameters(): LambdaParameterState[] {
+ const businessState =
+ this.milestoningState.buildParameterStateFromMilestoningParameter(
+ this.milestoningState.businessDate &&
+ this.milestoningState.businessDate instanceof VariableExpression
+ ? this.milestoningState.businessDate.name
+ : BUSINESS_DATE_MILESTONING_PROPERTY_NAME,
+ );
+
+ const processingState =
+ this.milestoningState.buildParameterStateFromMilestoningParameter(
+ this.milestoningState.processingDate &&
+ this.milestoningState.processingDate instanceof VariableExpression
+ ? this.milestoningState.processingDate.name
+ : BUSINESS_DATE_MILESTONING_PROPERTY_NAME,
+ );
+
+ return [businessState, processingState].filter(isNonNullable);
+ }
+
processGetAllParamaters(parameterValues: ValueSpecification[]): void {
assertTrue(
parameterValues.length === 3,
diff --git a/packages/legend-query-builder/src/stores/milestoning/QueryBuilderBusinessTemporalMilestoningImplementation.ts b/packages/legend-query-builder/src/stores/milestoning/QueryBuilderBusinessTemporalMilestoningImplementation.ts
index 0206070ac1d..2d0ec326660 100644
--- a/packages/legend-query-builder/src/stores/milestoning/QueryBuilderBusinessTemporalMilestoningImplementation.ts
+++ b/packages/legend-query-builder/src/stores/milestoning/QueryBuilderBusinessTemporalMilestoningImplementation.ts
@@ -22,6 +22,7 @@ import {
MILESTONING_STEREOTYPE,
INTERNAL__PropagatedValue,
PrimitiveType,
+ VariableExpression,
} from '@finos/legend-graph';
import {
UnsupportedOperationError,
@@ -32,6 +33,7 @@ import { getParameterValue } from '../../components/QueryBuilderSideBar.js';
import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../graph/QueryBuilderMetaModelConst.js';
import { createSupportedFunctionExpression } from '../shared/ValueSpecificationEditorHelper.js';
import { QueryBuilderMilestoningImplementation } from './QueryBuilderMilestoningImplementation.js';
+import type { LambdaParameterState } from '../shared/LambdaParameterState.js';
export class QueryBuilderBusinessTemporalMilestoningImplementation extends QueryBuilderMilestoningImplementation {
getMilestoningDate(): ValueSpecification | undefined {
@@ -54,6 +56,17 @@ export class QueryBuilderBusinessTemporalMilestoningImplementation extends Query
this.milestoningState.queryBuilderState.setShowParametersPanel(true);
}
+ buildParameterStatesFromMilestoningParameters(): LambdaParameterState[] {
+ const state =
+ this.milestoningState.buildParameterStateFromMilestoningParameter(
+ this.milestoningState.businessDate &&
+ this.milestoningState.businessDate instanceof VariableExpression
+ ? this.milestoningState.businessDate.name
+ : BUSINESS_DATE_MILESTONING_PROPERTY_NAME,
+ );
+ return state ? [state] : [];
+ }
+
processGetAllParamaters(parameterValues: ValueSpecification[]): void {
assertTrue(
parameterValues.length === 2,
diff --git a/packages/legend-query-builder/src/stores/milestoning/QueryBuilderMilestoningHelper.ts b/packages/legend-query-builder/src/stores/milestoning/QueryBuilderMilestoningHelper.ts
index 0b77c3cf106..48d238cf497 100644
--- a/packages/legend-query-builder/src/stores/milestoning/QueryBuilderMilestoningHelper.ts
+++ b/packages/legend-query-builder/src/stores/milestoning/QueryBuilderMilestoningHelper.ts
@@ -294,6 +294,7 @@ export const validateMilestoningPropertyExpressionChain = (
sourceStereotype: MILESTONING_STEREOTYPE | undefined,
targetStereotype: MILESTONING_STEREOTYPE,
propertyExpression: AbstractPropertyExpression,
+ queryBuilderState: QueryBuilderState,
): void => {
if (
sourceStereotype !== MILESTONING_STEREOTYPE.BITEMPORAL &&
@@ -316,10 +317,27 @@ export const validateMilestoningPropertyExpressionChain = (
`Property of milestoning sterotype '${MILESTONING_STEREOTYPE.BITEMPORAL}' should not have more than two parameters`,
);
}
+ queryBuilderState.milestoningState.setProcessingDate(
+ propertyExpression.parametersValues[1],
+ );
+ queryBuilderState.milestoningState.setBusinessDate(
+ propertyExpression.parametersValues[2],
+ );
} else if (propertyExpression.parametersValues.length !== 2) {
throw new UnsupportedOperationError(
`Property of milestoning sterotype '${targetStereotype}' should have exactly one parameter`,
);
}
+ if (targetStereotype === MILESTONING_STEREOTYPE.BUSINESS_TEMPORAL) {
+ queryBuilderState.milestoningState.setBusinessDate(
+ propertyExpression.parametersValues[1],
+ );
+ } else if (
+ targetStereotype === MILESTONING_STEREOTYPE.PROCESSING_TEMPORAL
+ ) {
+ queryBuilderState.milestoningState.setProcessingDate(
+ propertyExpression.parametersValues[1],
+ );
+ }
}
};
diff --git a/packages/legend-query-builder/src/stores/milestoning/QueryBuilderMilestoningImplementation.ts b/packages/legend-query-builder/src/stores/milestoning/QueryBuilderMilestoningImplementation.ts
index 8344973ead4..9596999b9c7 100644
--- a/packages/legend-query-builder/src/stores/milestoning/QueryBuilderMilestoningImplementation.ts
+++ b/packages/legend-query-builder/src/stores/milestoning/QueryBuilderMilestoningImplementation.ts
@@ -22,6 +22,7 @@ import type {
} from '@finos/legend-graph';
import type { QueryBuilderDerivedPropertyExpressionState } from '../QueryBuilderPropertyEditorState.js';
import type { QueryBuilderMilestoningState } from './QueryBuilderMilestoningState.js';
+import type { LambdaParameterState } from '../shared/LambdaParameterState.js';
export abstract class QueryBuilderMilestoningImplementation {
milestoningState: QueryBuilderMilestoningState;
@@ -88,4 +89,6 @@ export abstract class QueryBuilderMilestoningImplementation {
idx?: number,
derivedPropertyExpressionState?: QueryBuilderDerivedPropertyExpressionState,
): ValueSpecification;
+
+ abstract buildParameterStatesFromMilestoningParameters(): LambdaParameterState[];
}
diff --git a/packages/legend-query-builder/src/stores/milestoning/QueryBuilderMilestoningState.ts b/packages/legend-query-builder/src/stores/milestoning/QueryBuilderMilestoningState.ts
index 40cfb9c6486..055aa9b623e 100644
--- a/packages/legend-query-builder/src/stores/milestoning/QueryBuilderMilestoningState.ts
+++ b/packages/legend-query-builder/src/stores/milestoning/QueryBuilderMilestoningState.ts
@@ -75,7 +75,7 @@ export class QueryBuilderMilestoningState implements Hashable {
startDate: observable,
endDate: observable,
showMilestoningEditor: observable,
- isMilestonedQuery: computed,
+
setProcessingDate: action,
setBusinessDate: action,
setStartDate: action,
@@ -87,6 +87,10 @@ export class QueryBuilderMilestoningState implements Hashable {
initializeAllVersionsInRangeParameters: action,
clearAllVersionsInRangeParameters: action,
clearGetAllParameters: action,
+
+ isAllVersionsEnabled: computed,
+ isAllVersionsInRangeEnabled: computed,
+ isMilestonedQuery: computed,
hashCode: computed,
});
@@ -380,9 +384,9 @@ export class QueryBuilderMilestoningState implements Hashable {
this.queryBuilderState.parametersState.parameterStates.find(
(p) => p.parameter === this.startDate,
);
- this.queryBuilderState.parametersState.removeParameter(
- guaranteeNonNullable(paramState),
- );
+ if (paramState) {
+ this.queryBuilderState.parametersState.removeParameter(paramState);
+ }
}
if (
this.endDate instanceof VariableExpression &&
@@ -394,9 +398,9 @@ export class QueryBuilderMilestoningState implements Hashable {
this.queryBuilderState.parametersState.parameterStates.find(
(p) => p.parameter === this.endDate,
);
- this.queryBuilderState.parametersState.removeParameter(
- guaranteeNonNullable(paramState),
- );
+ if (paramState) {
+ this.queryBuilderState.parametersState.removeParameter(paramState);
+ }
}
this.setStartDate(undefined);
this.setEndDate(undefined);
@@ -422,6 +426,36 @@ export class QueryBuilderMilestoningState implements Hashable {
}
}
+ buildParameterStateFromMilestoningParameter(
+ parameterName: string,
+ ): LambdaParameterState | undefined {
+ const milestoningParameter = new VariableExpression(
+ parameterName,
+ Multiplicity.ONE,
+ GenericTypeExplicitReference.create(new GenericType(PrimitiveType.DATE)),
+ );
+ const paramState =
+ this.queryBuilderState.parametersState.parameterStates.find(
+ (p) => p.variableName === parameterName,
+ );
+ if (paramState) {
+ return paramState;
+ } else if (
+ !this.queryBuilderState.constantState.constants.find(
+ (c) => c.variable.name === parameterName,
+ )
+ ) {
+ const variableState = new LambdaParameterState(
+ milestoningParameter,
+ this.queryBuilderState.observerContext,
+ this.queryBuilderState.graphManagerState.graph,
+ );
+ variableState.mockParameterValue();
+ return variableState;
+ }
+ return undefined;
+ }
+
buildMilestoningParameter(parameterName: string): ValueSpecification {
const milestoningParameter = new VariableExpression(
parameterName,
diff --git a/packages/legend-query-builder/src/stores/milestoning/QueryBuilderProcessingTemporalMilestoningImplementation.ts b/packages/legend-query-builder/src/stores/milestoning/QueryBuilderProcessingTemporalMilestoningImplementation.ts
index 13788e13be1..0dc9592e593 100644
--- a/packages/legend-query-builder/src/stores/milestoning/QueryBuilderProcessingTemporalMilestoningImplementation.ts
+++ b/packages/legend-query-builder/src/stores/milestoning/QueryBuilderProcessingTemporalMilestoningImplementation.ts
@@ -21,6 +21,7 @@ import {
type AbstractPropertyExpression,
INTERNAL__PropagatedValue,
PrimitiveType,
+ VariableExpression,
} from '@finos/legend-graph';
import {
UnsupportedOperationError,
@@ -31,6 +32,7 @@ import { getParameterValue } from '../../components/QueryBuilderSideBar.js';
import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../graph/QueryBuilderMetaModelConst.js';
import { createSupportedFunctionExpression } from '../shared/ValueSpecificationEditorHelper.js';
import { QueryBuilderMilestoningImplementation } from './QueryBuilderMilestoningImplementation.js';
+import type { LambdaParameterState } from '../shared/LambdaParameterState.js';
export class QueryBuilderProcessingTemporalMilestoningImplementation extends QueryBuilderMilestoningImplementation {
getMilestoningDate(): ValueSpecification | undefined {
@@ -53,6 +55,17 @@ export class QueryBuilderProcessingTemporalMilestoningImplementation extends Que
this.milestoningState.queryBuilderState.setShowParametersPanel(true);
}
+ buildParameterStatesFromMilestoningParameters(): LambdaParameterState[] {
+ const state =
+ this.milestoningState.buildParameterStateFromMilestoningParameter(
+ this.milestoningState.processingDate &&
+ this.milestoningState.processingDate instanceof VariableExpression
+ ? this.milestoningState.processingDate.name
+ : PROCESSING_DATE_MILESTONING_PROPERTY_NAME,
+ );
+ return state ? [state] : [];
+ }
+
processGetAllParamaters(parameterValues: ValueSpecification[]): void {
assertTrue(
parameterValues.length === 2,
diff --git a/packages/legend-query-builder/style/_query-builder-projection.scss b/packages/legend-query-builder/style/_query-builder-projection.scss
index 781ffdeb7b6..7e8842b4f35 100644
--- a/packages/legend-query-builder/style/_query-builder-projection.scss
+++ b/packages/legend-query-builder/style/_query-builder-projection.scss
@@ -48,25 +48,27 @@
@include flexVCenter;
height: 2.2rem;
- background: var(--color-blue-200);
padding: 1rem;
- border-radius: 0.2rem 0 0 0.2rem;
+ text-underline-position: under;
}
&__label__icon {
- font-size: 1.2rem;
- color: var(--color-light-grey-180);
+ font-size: 1.3rem;
+ margin-right: 0.7rem;
}
&__label__title {
- margin-left: 0.7rem;
white-space: nowrap;
- color: var(--color-light-grey-180);
- font-size: 1.2rem;
+ font-size: 1.3rem;
font-weight: 500;
}
}
+ &__divider {
+ color: var(--color-light-grey-200);
+ margin-right: 1rem;
+ }
+
&__group {
@include flexVCenter;
@@ -82,20 +84,6 @@
line-height: 1.8rem;
border-radius: 0.1rem;
font-size: 1.1rem;
- margin-left: 0.5rem;
- }
-
- &__content {
- color: var(--color-light-blue-50);
- font-weight: 500;
- font-size: 1.2rem;
- padding-left: 0.5rem;
- cursor: pointer;
- overflow: hidden;
- text-overflow: ellipsis;
- text-decoration: underline;
- text-decoration-style: dotted;
- white-space: nowrap;
}
}
}
@@ -347,7 +335,7 @@
}
&__modal {
- height: 60vh;
+ height: 80vh;
width: 50vw;
&__body {
@@ -363,6 +351,12 @@
background: unset;
}
+ &__section-name {
+ font-size: 1.8rem;
+ font-weight: 700;
+ padding: 1rem;
+ }
+
&__sort {
display: flex;
width: 100%;