Fix: fixed dataset page (#623)

* Fix: fixed dataset page

* fixed icon issue
This commit is contained in:
Shailesh Parmar 2021-09-30 22:49:20 +05:30 committed by GitHub
parent ebfbd39cc2
commit bb1da94cc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 42 deletions

View File

@ -70,7 +70,7 @@ const SchemaTab: FunctionComponent<Props> = ({
if (matchedColumn) {
return {
name: matchedColumn.name,
dataType: matchedColumn.columnDataType,
dataType: matchedColumn.dataType,
};
} else {
return {

View File

@ -29,8 +29,8 @@ import { Link } from 'react-router-dom';
import { getDatasetDetailsPath } from '../../constants/constants';
import {
Column,
ColumnDataType,
ColumnJoins,
DataType,
JoinedWith,
Table,
} from '../../generated/entity/data/table';
@ -87,26 +87,26 @@ const SchemaTable: FunctionComponent<Props> = ({
const rowRef = useRef<HTMLTableRowElement>(null);
const getDataTypeString = (dataType: string): string => {
switch (upperCase(dataType)) {
case ColumnDataType.String:
case ColumnDataType.Char:
case ColumnDataType.Text:
case ColumnDataType.Varchar:
case ColumnDataType.Mediumtext:
case ColumnDataType.Mediumblob:
case ColumnDataType.Blob:
case DataType.String:
case DataType.Char:
case DataType.Text:
case DataType.Varchar:
case DataType.Mediumtext:
case DataType.Mediumblob:
case DataType.Blob:
return 'varchar';
case ColumnDataType.Timestamp:
case ColumnDataType.Time:
case DataType.Timestamp:
case DataType.Time:
return 'timestamp';
case ColumnDataType.Int:
case ColumnDataType.Float:
case ColumnDataType.Smallint:
case ColumnDataType.Bigint:
case ColumnDataType.Numeric:
case ColumnDataType.Tinyint:
case DataType.Int:
case DataType.Float:
case DataType.Smallint:
case DataType.Bigint:
case DataType.Numeric:
case DataType.Tinyint:
return 'numeric';
case ColumnDataType.Boolean:
case ColumnDataType.Enum:
case DataType.Boolean:
case DataType.Enum:
return 'boolean';
default:
return dataType;
@ -216,9 +216,7 @@ const SchemaTable: FunctionComponent<Props> = ({
return (
lowerCase(column.name).includes(searchText) ||
lowerCase(column.description).includes(searchText) ||
lowerCase(getDataTypeString(column.columnDataType)).includes(
searchText
)
lowerCase(getDataTypeString(column.dataType)).includes(searchText)
);
});
setSearchedColumns(searchCols);
@ -271,14 +269,14 @@ const SchemaTable: FunctionComponent<Props> = ({
key={index}
ref={columnName === column.name ? rowRef : null}>
<td className="tw-relative tableBody-cell">
{getConstraintIcon(column.columnConstraint)}
{getConstraintIcon(column.constraint)}
<span>{column.name}</span>
</td>
<td className="tableBody-cell">
<span>
{column.columnDataType
? lowerCase(getDataTypeString(column.columnDataType))
{column.dataType
? lowerCase(getDataTypeString(column.dataType))
: ''}
</span>
</td>

View File

@ -1,17 +0,0 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
/**
* 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.
*/