mirror of
https://github.com/open-metadata/OpenMetadata.git
synced 2025-10-11 08:43:31 +00:00
fix(ui): contract results sort order (#22820)
* fix(ui): contract results sort order fix rule for domain field * fix the team icon placement * fix glossary styling --------- Co-authored-by: Ashish Gupta <ashish@getcollate.io>
This commit is contained in:
parent
94ba5f1612
commit
bc8583cd56
@ -12,7 +12,7 @@
|
|||||||
*/
|
*/
|
||||||
import { Tooltip, Typography } from 'antd';
|
import { Tooltip, Typography } from 'antd';
|
||||||
import { AxiosError } from 'axios';
|
import { AxiosError } from 'axios';
|
||||||
import { isEqual, pick } from 'lodash';
|
import { isEqual, pick, sortBy } from 'lodash';
|
||||||
import { DateRangeObject } from 'Models';
|
import { DateRangeObject } from 'Models';
|
||||||
import { useEffect, useMemo, useState } from 'react';
|
import { useEffect, useMemo, useState } from 'react';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
@ -72,7 +72,7 @@ const ContractExecutionChart = ({ contract }: { contract: DataContract }) => {
|
|||||||
const results = await getAllContractResults(contract.id, {
|
const results = await getAllContractResults(contract.id, {
|
||||||
...pick(dateRangeObj, ['startTs', 'endTs']),
|
...pick(dateRangeObj, ['startTs', 'endTs']),
|
||||||
});
|
});
|
||||||
setContractExecutionResultList(results.data);
|
setContractExecutionResultList(sortBy(results.data, 'timestamp'));
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
showErrorToast(err as AxiosError);
|
showErrorToast(err as AxiosError);
|
||||||
} finally {
|
} finally {
|
||||||
|
@ -147,9 +147,6 @@
|
|||||||
.glossary-term-page-tabs {
|
.glossary-term-page-tabs {
|
||||||
.ant-tabs-tabpane {
|
.ant-tabs-tabpane {
|
||||||
height: @glossary-term-page-height;
|
height: @glossary-term-page-height;
|
||||||
}
|
|
||||||
|
|
||||||
.grid-container {
|
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
import Icon from '@ant-design/icons';
|
import Icon from '@ant-design/icons';
|
||||||
import { Space, Typography } from 'antd';
|
import { Typography } from 'antd';
|
||||||
import classNames from 'classnames';
|
import classNames from 'classnames';
|
||||||
import { isUndefined, toString } from 'lodash';
|
import { isUndefined, toString } from 'lodash';
|
||||||
import { ReactComponent as CloseOutlined } from '../../../assets/svg/close.svg';
|
import { ReactComponent as CloseOutlined } from '../../../assets/svg/close.svg';
|
||||||
@ -48,8 +48,7 @@ export const UserTag = ({
|
|||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Space
|
<div
|
||||||
align="center"
|
|
||||||
className={classNames(
|
className={classNames(
|
||||||
{
|
{
|
||||||
bordered: bordered,
|
bordered: bordered,
|
||||||
@ -58,8 +57,7 @@ export const UserTag = ({
|
|||||||
UserTagSize[size],
|
UserTagSize[size],
|
||||||
className
|
className
|
||||||
)}
|
)}
|
||||||
data-testid="user-tag"
|
data-testid="user-tag">
|
||||||
size={8}>
|
|
||||||
<ProfilePicture
|
<ProfilePicture
|
||||||
avatarType={avatarType}
|
avatarType={avatarType}
|
||||||
isTeam={isTeam}
|
isTeam={isTeam}
|
||||||
@ -75,6 +73,6 @@ export const UserTag = ({
|
|||||||
onClick={onRemove}
|
onClick={onRemove}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</Space>
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
@ -11,6 +11,9 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
.user-tag {
|
.user-tag {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
|
|
||||||
&.bordered {
|
&.bordered {
|
||||||
|
@ -21,15 +21,11 @@
|
|||||||
|
|
||||||
.select-owners {
|
.select-owners {
|
||||||
.assignee-tag {
|
.assignee-tag {
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
margin-right: 8px;
|
margin-right: 8px;
|
||||||
background: @white;
|
background: @white;
|
||||||
padding: 2px 12px;
|
padding: 2px 12px;
|
||||||
height: 28px;
|
height: 28px;
|
||||||
|
|
||||||
border-radius: 6px;
|
border-radius: 6px;
|
||||||
gap: 4px;
|
|
||||||
border: 1px solid @grey-300;
|
border: 1px solid @grey-300;
|
||||||
|
|
||||||
.ant-typography {
|
.ant-typography {
|
||||||
|
@ -98,7 +98,7 @@ export enum EntityReferenceFields {
|
|||||||
DISPLAY_NAME = 'displayName',
|
DISPLAY_NAME = 'displayName',
|
||||||
TAG = 'tags',
|
TAG = 'tags',
|
||||||
TIER = 'tier.tagFQN',
|
TIER = 'tier.tagFQN',
|
||||||
DOMAIN = 'domain',
|
DOMAIN = 'domains',
|
||||||
DATA_PRODUCT = 'dataProduct',
|
DATA_PRODUCT = 'dataProduct',
|
||||||
TABLE_TYPE = 'tableType',
|
TABLE_TYPE = 'tableType',
|
||||||
EXTENSION = 'extension',
|
EXTENSION = 'extension',
|
||||||
|
Loading…
x
Reference in New Issue
Block a user