Apache/druid
1
0
Fork 0
mirror of https://github.com/apache/druid.git synced 2025-02-17 07:25:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Web console: fix tab duplication (#15457)

Browse Source 
* fix duplication

* includeFuture defaults to true
This commit is contained in:
Vadim Ogievetsky 2023-11-30 08:29:56 -08:00 committed by GitHub
parent 7467d2c00d
commit f8bd3b0b7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web-console/src/components/rule-editor/rule-editor.tsx
View File

@ -200,11 +200,13 @@ export const RuleEditor = React.memo(function RuleEditor(props: RuleEditorProps)
{RuleUtil.hasIncludeFuture(rule) && (
<Switch
className="include-future"
checked={rule.includeFuture || false}
checked={RuleUtil.getIncludeFuture(rule)}
label="Include future"
disabled={disabled}
onChange={() => {
onChange?.(RuleUtil.changeIncludeFuture(rule, !rule.includeFuture));
onChange?.(
RuleUtil.changeIncludeFuture(rule, !RuleUtil.getIncludeFuture(rule)),
);
}}
/>
)}

3
web-console/src/druid-models/execution/execution.ts
View File

@ -21,6 +21,7 @@ import { Column, QueryResult, SqlExpression, SqlQuery, SqlWithQuery } from '@dru
import {
deepGet,
deleteKeys,
formatDuration,
formatInteger,
nonEmptyArray,
oneOf,
@ -563,7 +564,7 @@ export class Execution {
break;
case 'SUCCESS':
label = 'Segments loaded successfully in ' + segmentStatus.duration + 'ms.';
label = `Segments loaded successfully in ${formatDuration(segmentStatus.duration)}`;
break;
default:

16
web-console/src/utils/load-rule.ts
View File

@ -57,8 +57,9 @@ export class RuleUtil {
static ruleToString(rule: Rule): string {
const params: string[] = [];
if (RuleUtil.hasPeriod(rule))
params.push(`${rule.period}${rule.includeFuture ? '+future' : ''}`);
if (RuleUtil.hasPeriod(rule)) {
params.push(`${rule.period}${RuleUtil.getIncludeFuture(rule) ? '+future' : ''}`);
}
if (RuleUtil.hasInterval(rule)) params.push(rule.interval || '?');
if (RuleUtil.canHaveTieredReplicants(rule)) params.push(`${RuleUtil.totalReplicas(rule)}x`);
@ -69,20 +70,21 @@ export class RuleUtil {
const newRule = deepSet(rule, 'type', type);
if (RuleUtil.hasPeriod(newRule)) {
if (!newRule.period) newRule.period = 'P1M';
newRule.period ??= 'P1M';
newRule.includeFuture ??= true;
} else {
delete newRule.period;
delete newRule.includeFuture;
}
if (RuleUtil.hasInterval(newRule)) {
if (!newRule.interval) newRule.interval = '2010-01-01/2020-01-01';
newRule.interval ??= '2010-01-01/2020-01-01';
} else {
delete newRule.interval;
}
if (RuleUtil.canHaveTieredReplicants(newRule)) {
if (!newRule.tieredReplicants) newRule.tieredReplicants = { _default_tier: 2 };
newRule.tieredReplicants ??= { _default_tier: 2 };
} else {
delete newRule.tieredReplicants;
}
@ -102,6 +104,10 @@ export class RuleUtil {
return RuleUtil.hasPeriod(rule) && rule.type !== 'dropBeforeByPeriod';
}
static getIncludeFuture(rule: Rule): boolean {
return rule.includeFuture ?? true;
}
static changeIncludeFuture(rule: Rule, includeFuture: boolean): Rule {
return deepSet(rule, 'includeFuture', includeFuture);
}

2
web-console/src/views/workbench-view/workbench-view.tsx
View File

@ -496,7 +496,7 @@ export class WorkbenchView extends React.PureComponent<WorkbenchViewProps, Workb
const newTabEntry: TabEntry = {
id,
tabName: tabEntry.tabName + ' (copy)',
query: tabEntry.query,
query: tabEntry.query.changeLastExecution(undefined),
};
this.handleQueriesChange(
tabEntries.slice(0, i + 1).concat(newTabEntry, tabEntries.slice(i + 1)),