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

Jump to bottom

Fixes striping and loading state of dataset page/tables #53

Merged
merged 1 commit into from
Feb 12, 2021
Merged

Fixes striping and loading state of dataset page/tables #53

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
77 changes: 38 additions & 39 deletions src/templates/dataset/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Link } from '@reach/router';
import Layout from '../../components/Layout';
import config from "../../assets/config";
import ResourceTemplate from "../../components/Resource";

import { Spinner } from 'reactstrap';
import {
Text,
Organization,
Expand All @@ -27,7 +27,6 @@ const Dataset = ({id, location}) => {
async function getItem() {
const { data } = await axios.get(`${process.env.REACT_APP_ROOT_URL}/metastore/schemas/dataset/items/${id}?show-reference-ids`);
setItem(data);
console.log("item: ", item);
}
if (!state || !state.dataset) {
getItem();
Expand Down Expand Up @@ -118,44 +117,44 @@ const Dataset = ({id, location}) => {

return (
<Layout title={`Dataset - ${item.title}`}>
<div className={`dc-dataset-page ${config.container}`}>
<div className="row">
<div className="col-md-3 col-sm-12">
{renderOrg}
<div className="dc-block-wrapper">
The information on this page is also available via the{" "}
<Link
to={`/dataset/${item.identifier}/api`}
state={{ dataset: {...item} }}
>
API
</Link>.
<div className={`dc-dataset-page ${config.container}`}>

<div className="row">
<div className="col-md-3 col-sm-12">
{renderOrg}
<div className="dc-block-wrapper">
The information on this page is also available via the{" "}
<Link
to={`/dataset/${item.identifier}/api`}
state={{ dataset: {...item} }}
>
API
</Link>.
</div>
</div>
<div className="col-md-9 col-sm-12">
{Object.keys(item).length
?(
<div>
<h1>{item.title}</h1>
{theme.length > 0 && <div className="dc-item-theme">{themes(theme)}</div>}
<Text value={item.description} />
{(hasWindow && item.distribution) &&
item.distribution.map(dist => {
return <ResourceTemplate key={dist.identifier} resource={dist} identifier={dist.identifier} />;
})}
<Tags tags={tag} path="/search?keyword=" label="Tags" />
<Table
configuration={labelsT3}
data={valuesT3}
tableclass="metadata"
/></div>
):( <div className="row">
<Spinner color="primary" />
</div>
)}
</div>
</div>
</div>
<div className="col-md-9 col-sm-12">
<h1>{item.title}</h1>
{theme.length > 0 && <div className="dc-item-theme">{themes(theme)}</div>}
<Text value={item.description} />
{(hasWindow && item.distribution) &&
item.distribution.map(dist => {
return <ResourceTemplate key={dist.identifier} resource={dist} identifier={dist.identifier} />;
})}
<Tags tags={tag} path="/search?keyword=" label="Tags" />
{/* <Table
configuration={labelsT2}
data={valuesT2}
title="Columns in this Dataset"
th1="Column Name"
th2="Type"
tableclass="data-dictionary"
/> */}
<Table
configuration={labelsT3}
data={valuesT3}
tableclass="metadata"
/>
</div>
</div>
</div>
</Layout>
);
Expand Down
7 changes: 2 additions & 5 deletions src/theme/styles/datatable.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ $expandSize: 7px;
&.density-3 .dc-tbody .dc-td {
padding: 5px 5px;
}
&.-striped .dc-tr:nth-child(odd) {
&.-striped .dc-tr:nth-child(odd) .dc-td {
background-color: rgba(0,0,0,.05);
}
&.-highlight .dc-tbody .dc-tr:not(.-padRow):hover {
&.-highlight .dc-tbody .dc-tr:not(.-padRow):hover .dc-td {
background-color: #FFFEEE;
}

Expand Down Expand Up @@ -75,9 +75,6 @@ $expandSize: 7px;
}

&.-header {
.tr {
box-shadow: 0 2px 15px 0px rgba(0,0,0,.15);
}
.th {
overflow: hidden;
text-align: center;
Expand Down