Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ui): unwanted scrollbar in explore page #14097

Merged
merged 1 commit into from
Nov 24, 2023
Merged

fix(ui): unwanted scrollbar in explore page #14097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions ...ces/ui/src/components/Database/DatabaseSchema/DatabaseSchemaTable/DatabaseSchemaTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import { usePaging } from '../../../../hooks/paging/usePaging';
import { getDatabaseSchemas } from '../../../../rest/databaseAPI';
import { searchQuery } from '../../../../rest/searchAPI';
import { schemaTableColumns } from '../../../../utils/DatabaseDetails.utils';
import { getDecodedFqn } from '../../../../utils/StringsUtils';
import { showErrorToast } from '../../../../utils/ToastUtils';
import ErrorPlaceHolder from '../../../common/ErrorWithPlaceholder/ErrorPlaceHolder';
import NextPrevious from '../../../common/NextPrevious/NextPrevious';
Expand All @@ -43,6 +44,8 @@ export const DatabaseSchemaTable = () => {
const [schemas, setSchemas] = useState<DatabaseSchema[]>([]);
const [isLoading, setIsLoading] = useState(true);
const [showDeletedSchemas, setShowDeletedSchemas] = useState<boolean>(false);

const decodedDatabaseFQN = useMemo(() => getDecodedFqn(fqn), [fqn]);
const searchValue = useMemo(() => {
const param = location.search;
const searchData = QueryString.parse(
Expand All @@ -63,14 +66,14 @@ export const DatabaseSchemaTable = () => {

const fetchDatabaseSchema = useCallback(
async (params?: Partial<Paging>) => {
if (isEmpty(fqn)) {
if (isEmpty(decodedDatabaseFQN)) {
return;
}

try {
setIsLoading(true);
const { data, paging } = await getDatabaseSchemas({
databaseName: fqn,
databaseName: decodedDatabaseFQN,
limit: pageSize,
after: params?.after,
before: params?.before,
Expand All @@ -81,12 +84,12 @@ export const DatabaseSchemaTable = () => {
setSchemas(data);
handlePagingChange(paging);
} catch (error) {
showErrorToast(error);
showErrorToast(error as AxiosError);
} finally {
setIsLoading(false);
}
},
[pageSize, fqn, showDeletedSchemas]
[pageSize, decodedDatabaseFQN, showDeletedSchemas]
);

const searchSchema = async (
Expand Down
2 changes: 1 addition & 1 deletion ...ts/Explore/EntitySummaryPanel/SummaryList/SummaryListItems/SummaryListItems.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ function SummaryListItem({
<div className="summary-list-item-container">
<Row gutter={[0, 8]}>
<Col
className="d-flex items-center"
className="d-flex items-baseline"
data-testid="title-container"
span={24}>
{isColumnsData &&
Expand Down
4 changes: 1 addition & 3 deletions ...src/main/resources/ui/src/components/Explore/EntitySummaryPanel/entity-summary-panel.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@
height: calc(100vh - @summary-panel-offset);
z-index: 9;
box-shadow: none;
border: @global-border;
border-top: none;
border-left: none;
font-size: 14px;
overflow-y: scroll;
overflow-x: hidden;
Expand All @@ -48,6 +45,7 @@

.entity-title {
font-weight: 500;
word-break: break-word;
}

.summary-panel-title {
Expand Down
2 changes: 2 additions & 0 deletions openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/exploreV1.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
padding-right: 0 !important;
background-color: @white;
border: 1px solid @border-color;
border-right: none;
border-radius: 0;
padding-left: 0 !important;
border-top: 0;
Expand Down Expand Up @@ -53,6 +54,7 @@
}
}
.summary-panel-container {
overflow: hidden;
height: @explore-page-height;
.ant-drawer-header {
border-bottom: none;
Expand Down
5 changes: 3 additions & 2 deletions openmetadata-ui/src/main/resources/ui/src/pages/DatabaseDetailsPage/DatabaseDetailsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,13 +180,13 @@ const DatabaseDetails: FunctionComponent = () => {
try {
setIsLoading(true);
const { paging } = await getDatabaseSchemas({
databaseName: databaseFQN,
databaseName: decodedDatabaseFQN,
limit: 0,
});

setSchemaInstanceCount(paging.total);
} catch (error) {
showErrorToast(error);
showErrorToast(error as AxiosError);
} finally {
setIsLoading(false);
}
Expand Down Expand Up @@ -282,6 +282,7 @@ const DatabaseDetails: FunctionComponent = () => {

return res;
});
getEntityFeedCount();
} catch (error) {
showErrorToast(
error as AxiosError,
Expand Down
3 changes: 3 additions & 0 deletions openmetadata-ui/src/main/resources/ui/src/styles/position.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@
.items-end {
align-items: flex-end;
}
.items-baseline {
align-items: baseline;
}

// Display
.d-flex {
Expand Down
2 changes: 1 addition & 1 deletion openmetadata-ui/src/main/resources/ui/src/styles/variables.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
@glossary-page-height: calc(100vh - 206px);
@domain-page-height: calc(100vh - 200px);
@glossary-term-page-height: calc(100vh - 200px);
@explore-page-height: calc(100vh - 112px);
@explore-page-height: calc(100vh - 113px);
@welcome-page-height: calc(100vh - 112px);
@data-product-page-height: calc(100vh - 156px);
@glossary-page-tab-height: calc(100vh - 206px);