fix: sql lab ctrl t behaved differently from clicking (#19420)

* initial approach

To have consistent behaviour when creating a new tab with ctrl+t

* consistent behaviour when creating tabs

* fixed bug and added tests

* updates to pass checks
This commit is contained in:
Luis Casillas
2022-04-15 13:28:40 -05:00
committed by GitHub
parent b8e595413f
commit 56381f4ee8
4 changed files with 102 additions and 18 deletions

View File

@@ -0,0 +1,46 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you 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 language governing permissions and limitations
* under the License.
*/
import { newQueryTabName } from './newQueryTabName';
const emptyEditor = {
title: '',
schema: '',
autorun: false,
sql: '',
remoteId: null,
};
describe('newQueryTabName', () => {
it("should return default title if queryEditor's length is 0", () => {
const defaultTitle = 'default title';
const title = newQueryTabName([], defaultTitle);
expect(title).toEqual(defaultTitle);
});
it('should return next available number if there are unsaved editors', () => {
const untitledQueryText = 'Untitled Query';
const unsavedEditors = [
{ ...emptyEditor, title: `${untitledQueryText} 1` },
{ ...emptyEditor, title: `${untitledQueryText} 2` },
];
const nextTitle = newQueryTabName(unsavedEditors);
expect(nextTitle).toEqual(`${untitledQueryText} 3`);
});
});

View File

@@ -0,0 +1,49 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you 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 language governing permissions and limitations
* under the License.
*/
import { t } from '@superset-ui/core';
import { QueryEditor } from '../types';
const untitledQueryRegex = /^Untitled Query (\d+)$/; // Literal notation isn't recompiled
const untitledQuery = 'Untitled Query ';
export const newQueryTabName = (
queryEditors: QueryEditor[],
initialTitle = `${untitledQuery}1`,
): string => {
const resultTitle = t(initialTitle);
if (queryEditors.length > 0) {
const mappedUntitled = queryEditors.filter(qe =>
qe.title.match(untitledQueryRegex),
);
const untitledQueryNumbers = mappedUntitled.map(
qe => +qe.title.replace(untitledQuery, ''),
);
if (untitledQueryNumbers.length > 0) {
// When there are query tabs open, and at least one is called "Untitled Query #"
// Where # is a valid number
const largestNumber: number = Math.max(...untitledQueryNumbers);
return t(`${untitledQuery}%s`, largestNumber + 1);
}
return resultTitle;
}
return resultTitle;
};