Skip to content
Open
Show file tree
Hide file tree
Changes from 9 commits
Commits
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
48 changes: 48 additions & 0 deletions src/components/StoredQueryTab/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
import React from 'react';
type DatasetStoredQueryProps = {
Comment thread
tiffneybare marked this conversation as resolved.
Outdated
id: String;
rootUrl: String;
apiUrl: string;
additionalParams: {
ACA: string,
}
};


const StoredQueryViewer = ({ id }: DatasetStoredQueryProps) => {


useEffect(() => {
if (!id) return;
setLoading(true);
fetch(`/api/1/stored-query/items/${id}`)
.then((response) => {
if (!response.ok) throw new Error('Network response was not ok');
return response.json();
})
.then((json) => {
setData(json);
setLoading(false);
})
.catch((err) => {
setError(err.message);
setLoading(false);
});
}, [id]);

if (loading) return <div>Loading...</div>;
if (error) return <div>Error: {error}</div>;
if (!data) return <div>No data found.</div>;

return (
<div>
Hello
<h2>{data.storedQuery?.title}</h2>
<p>{data.storedQuery?.description}</p>
{/* Render more fields as needed */}
<pre>{JSON.stringify(data, null, 2)}</pre>
</div>
);
};

export default StoredQueryViewer;
65 changes: 65 additions & 0 deletions src/components/StoredQueryTab/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
import React, { useEffect, useState } from 'react';
import TransformedDate from '../TransformedDate';

interface StoredQuery {
title?: string;
description?: string;
uuid?: string;
identifier?: string;
modified?: string;
}

interface StoredQueryApiResponse {
storedQuery?: StoredQuery;
}

interface StoredQueryViewerProps {
id: string;
}

const StoredQueryViewer: React.FC<StoredQueryViewerProps> = ({ id }) => {
const [loading, setLoading] = useState<boolean>(false);
const [data, setData] = useState<StoredQueryApiResponse | null>(null);
const [error, setError] = useState<string | null>(null);

useEffect(() => {
if (!id) return;
setLoading(true);
fetch(`/api/1/stored-query/items/${id}`)
.then((response) => {
if (!response.ok) throw new Error('Network response was not ok');
return response.json();
})
.then((json: StoredQueryApiResponse) => {
setData(json);
setLoading(false);
})
.catch((err: Error) => {
setError(err.message);
setLoading(false);
});
}, [id]);

if (loading) return <div>Loading...</div>;
if (error) return <div>Error: {error}</div>;
if (!data) return <div>No data found.</div>;
const storedQueryUrl = `/stored-query/${data.storedQuery?.uuid}`;
return (
<li className="dc-c-list-item ds-u-padding-top--4">
<div className="dc-c-searchlist-item ds-u-border-bottom--1 ds-u-padding-bottom--3">
<div className="ds-l-row ds-u-align-items--start">
<span id={`dataset-${data.storedQuery?.identifier}-updated-date`} className="ds-l-col--12 ds-u-text-align--left ds-text-heading--sm ds-u-padding-top--0">
Updated <TransformedDate date={data.storedQuery?.modified} />
</span>
<h2 className="ds-l-col--12 ds-text-heading--2xl"><a href={storedQueryUrl} target="_blank">{data.storedQuery?.title}</a></h2>
</div>
<div className="ds-l-row">
<div className="ds-l-col--12">
<p>{data.storedQuery?.description}</p></div>
</div>
</div>
</li>
);
};

export default StoredQueryViewer;
21 changes: 20 additions & 1 deletion src/templates/Dataset/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import SearchItemIcon from '../../assets/icons/searchItem';
import DatasetOverview from '../../components/DatasetOverviewTab';
import DatasetAPI from '../../components/DatasetAPITab';
import DataDictionary from '../../components/DatasetDataDictionaryTab';
import StoredQuery from '../../components/StoredQueryTab';
import { DatasetDictionaryItemType, DatasetPageType, DatasetDictionaryType, DistributionType, ResourceType, ColumnType } from '../../types/dataset';
import TransformedDate from '../../components/TransformedDate';
import { getFormatType } from '../../utilities/format';
Expand Down Expand Up @@ -53,6 +54,7 @@ const Dataset = ({
dataDictionaryBanner = false,
disableTableControls = false,
hideDataDictionary = false,
hideStoredQuery = false,
Comment thread
tiffneybare marked this conversation as resolved.
Outdated
customDescription,
updateAriaLive,
showRowLimitNotice = false
Expand Down Expand Up @@ -142,7 +144,7 @@ const Dataset = ({
}, [distribution, window.location.hash])

const displayDataDictionaryTab = ((distribution.data && distribution.data.describedBy && distribution.data.describedByType === 'application/vnd.tableschema+json') || (datasetSitewideDictionary && datasetSitewideDictionary.length > 0)) as boolean;

return (
<>
{dataset.error ? (
Expand Down Expand Up @@ -231,6 +233,21 @@ const Dataset = ({
{!displayDataDictionaryTab && <p>There is no Data Dictionary associated with this dataset.</p>}
</TabPanel>
)}
{!hideStoredQuery && (
<TabPanel
id={'storedQuery'}
tab={
<span className="ds-u-color--primary">
<SearchItemIcon id="storedQuery" />
Stored Query
</span>
}
className={ borderlessTabs ? 'ds-u-border--0 ds-u-padding-x--0' : '' }
>

<StoredQuery id={id} />
</TabPanel>
)}
{ distribution && distribution.data && (
<TabPanel
id={'api'}
Expand All @@ -242,9 +259,11 @@ const Dataset = ({
}
className={ borderlessTabs ? 'ds-u-border--0 ds-u-padding-x--0' : '' }
>
console.log("id", id)
Comment thread
tiffneybare marked this conversation as resolved.
Outdated
<DatasetAPI id={id} rootUrl={rootUrl} apiUrl={apiPageUrl} showRowLimitNotice={showRowLimitNotice} />
</TabPanel>
)}

</Tabs>
)}
</div>
Expand Down
7 changes: 7 additions & 0 deletions src/types/dataset.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ export type DatasetPageType = {
dataDictionaryBanner: boolean,
disableTableControls: boolean,
hideDataDictionary: boolean,
hideStoredQuery: boolean,
customDescription?: Function,
updateAriaLive?: Function,
showRowLimitNotice?: boolean,
Expand Down Expand Up @@ -111,6 +112,12 @@ export type DatasetOverviewPropsType = {
metadataMapping: any, //TODO
}

export type DatasetStoredQuery = {
dataset: DatasetType,
resource: ResourceType,
distributions: DistributionType[],
}

export type DatasetDictionaryItemType = {
format: string,
name: string,
Expand Down