Skip to content
Merged
6 changes: 6 additions & 0 deletions .github/workflows/deploy-Dataspace.yml
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,10 @@ jobs:
# Explicit: run-smoke's api job falls back to the dev API when this is
# unset, which would test dev's backend while gating a prod deploy.
api_base_url: ${{ github.ref_name == 'main' && 'https://api.datakeep.civicdays.in' || 'https://dev.api.civicdataspace.in' }}
# Temporarily off the dev gate: provider-smoke create-flow tests are under
# a separate investigation (CivicDataSpace-test#103 and follow-ons). main
# already never runs provider (readonly suite), so this is a no-op there.
skip_provider: true
secrets:
# Literal, not a secret, so a missing value can't silently fall back to
# the dev site through the `&& ||` idiom.
Expand All @@ -213,6 +217,8 @@ jobs:
uses: CivicDataLab/CivicDataSpace-test/.github/workflows/run-smoke.yml@CI
with:
suite: functional
# Same temporary provider-suite exclusion as smoke-tests above.
skip_provider: true
api_base_url: https://dev.api.civicdataspace.in
secrets:
HOME_URL_DEV: ${{ secrets.HOME_URL_DEV }}
Expand Down
8 changes: 5 additions & 3 deletions app/[locale]/(user)/about-us/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ const About = () => {
});

return (
<main>
<div>
<JsonLd json={jsonLd} />
<BreadCrumbs
data={[
Expand All @@ -65,7 +65,9 @@ const About = () => {
]}
/>
<div className="container mb-5 py-5 lg:py-10">
<Text variant="heading2xl">About CivicDataSpace</Text>
<Text variant="heading2xl" as="h1">
About CivicDataSpace
</Text>
<div className=" flex flex-col gap-4 pt-4 lg:gap-6 lg:pt-6">
<Text variant="headingLg" fontWeight="regular" className=" leading-5">
CivicDataSpace is a collaborative, open-source platform that goes
Expand Down Expand Up @@ -118,7 +120,7 @@ const About = () => {
<Team />
</div> */}
</div>
</main>
</div>
);
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ const CollaborativesListingClient = () => {
});

return (
<main>
<div>
<JsonLd json={jsonLd} />
<BreadCrumbs
data={[
Expand All @@ -178,6 +178,7 @@ const CollaborativesListingClient = () => {
<div className="flex flex-col gap-5 lg:w-3/5">
<Text
variant="heading2xl"
as="h1"
fontWeight="bold"
color="onBgDefault"
>
Expand Down Expand Up @@ -231,7 +232,7 @@ const CollaborativesListingClient = () => {
{/* Search and Filter Section */}
<div className="flex flex-wrap gap-6 pt-4 lg:flex-nowrap">
<SearchInput
label={''}
label="Search"
className={cn('w-full', Styles.Search)}
onSubmit={(e) => {
setSearchTerm(e);
Expand All @@ -252,8 +253,8 @@ const CollaborativesListingClient = () => {
Sort :
</Text>
<Select
label=""
labelInline
label="Sort"
labelHidden
name="sort-select"
options={[
{
Expand Down Expand Up @@ -412,7 +413,7 @@ const CollaborativesListingClient = () => {
)}
</div>
</div>
</main>
</div>
);
};

Expand Down
11 changes: 6 additions & 5 deletions app/[locale]/(user)/components/Content.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,13 @@ export const Content = () => {
];

return (
<main className="container py-10 md:px-8 lg:py-20">
<div className="container py-10 md:px-8 lg:py-20">
<div className="flex justify-around gap-8 px-4 md:px-12 lg:px-12">
<div className="flex flex-col gap-11 lg:w-[60%]">
<div className="flex flex-col gap-2">
<Text
variant="heading3xl"
as="h1"
color="onBgDefault"
className="text-textOnBGDefault1"
>
Expand All @@ -86,9 +87,9 @@ export const Content = () => {
<SearchInput
className={cn(Styles.Search)}
onSubmit={handleSearch}
label={''}
label="Search"
placeholder="Search for any data"
name={''}
name="search"
withButton
/>
</div>
Expand All @@ -102,7 +103,7 @@ export const Content = () => {
<Link
key={`${item.label}_${index}`}
href={item.link}
className="w-[177px] md:basis-[177px]"
className="w-[177px] rounded-[8px] outline-none focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[var(--border-interactive-focused)] md:basis-[177px]"
data-tour={
index === 0
? 'datasets-link'
Expand Down Expand Up @@ -157,6 +158,6 @@ export const Content = () => {
/>
</div>
</div>
</main>
</div>
);
};
2 changes: 1 addition & 1 deletion app/[locale]/(user)/components/Datasets.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ const Datasets = () => {
<div>
<Button
kind="tertiary"
className="shadow-none border-none bg-transparent px-0 text-primaryText hover:underline"
className="shadow-none border-none bg-transparent px-0 text-primaryText hover:underline outline-none focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[var(--border-interactive-focused)]"
onClick={() => {
router.push('/datasets');
}}
Expand Down
4 changes: 2 additions & 2 deletions app/[locale]/(user)/components/ListingComponent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -499,8 +499,8 @@ const ListingComponent: React.FC<ListingProps> = ({
</div>
<div className="flex items-center gap-2" data-tour="sort">
<Select
label=""
labelInline
label="Sort"
labelHidden
name="select"
onChange={handleSortChange}
options={[
Expand Down
2 changes: 1 addition & 1 deletion app/[locale]/(user)/components/Sectors.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const Sectors = () => {
<div className="mr-8 lg:mr-12">
<Button
kind="tertiary"
className="bg-transparent border-none shadow-none text-primaryText px-0 hover:underline"
className="bg-transparent border-none shadow-none text-primaryText px-0 hover:underline outline-none focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[var(--border-interactive-focused)]"
onClick={() => {
router.push('/sectors');
}}
Expand Down
2 changes: 1 addition & 1 deletion app/[locale]/(user)/components/UseCases.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ const UseCasesListingPage = () => {
<div>
<Button
kind="tertiary"
className="shadow-none border-none bg-transparent px-0 text-primaryText hover:underline"
className="shadow-none border-none bg-transparent px-0 text-primaryText hover:underline outline-none focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[var(--border-interactive-focused)]"
onClick={() => {
router.push('/usecases');
}}
Expand Down
4 changes: 4 additions & 0 deletions app/[locale]/(user)/datasets/page.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from 'react';
import { Text } from 'opub-ui';

import { generateJsonLd, generatePageMetadata } from '@/lib/utils';
import JsonLd from '@/components/JsonLd';
Expand Down Expand Up @@ -52,6 +53,9 @@ const DatasetsListing = () => {
return (
<>
<JsonLd json={jsonLd} />
<Text as="h1" visuallyHidden>
Datasets
</Text>
<ListingComponent
type="dataset"
breadcrumbData={breadcrumbData}
Expand Down
5 changes: 5 additions & 0 deletions app/[locale]/(user)/page.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,9 @@
background-color: #EBF9FC; /* same as surface-stats */
border-radius: 8px;
}
input:focus-visible,
button:focus-visible {
outline: 2px solid var(--border-interactive-focused);
outline-offset: 2px;
}
}
5 changes: 3 additions & 2 deletions app/[locale]/(user)/publishers/PublishersListingClient.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ const PublishersListingPage = () => {
return (
<>
<JsonLd json={jsonLd} />
<main>
<div>
<BreadCrumbs
data={[
{ href: '/', label: 'Home' },
Expand All @@ -96,6 +96,7 @@ const PublishersListingPage = () => {
<div className="flex flex-col gap-5 ">
<Text
variant="heading2xl"
as="h1"
fontWeight="bold"
color="onBgDefault"
>
Expand Down Expand Up @@ -179,7 +180,7 @@ const PublishersListingPage = () => {
</div>
</>
</>
</main>
</div>
</>
);
};
Expand Down
11 changes: 6 additions & 5 deletions app/[locale]/(user)/sectors/SectorsListing.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ const SectorsListing = () => {
});

return (
<main>
<div>
<JsonLd json={jsonLd} />
<BreadCrumbs
data={[
Expand All @@ -84,6 +84,7 @@ const SectorsListing = () => {
<div className="flex flex-col gap-5 ">
<Text
variant="heading2xl"
as="h1"
fontWeight="bold"
color="onBgDefault"
>
Expand Down Expand Up @@ -136,7 +137,7 @@ const SectorsListing = () => {
<div className="mt-6 flex w-full flex-col justify-center gap-6">
<div className="flex flex-wrap gap-6 lg:flex-nowrap">
<SearchInput
label={''}
label="Search"
className={cn('w-full', Styles.Search)}
onSubmit={(e) => {
setSearchText(e);
Expand All @@ -155,8 +156,8 @@ const SectorsListing = () => {
Sort :
</Text>
<Select
label=""
labelInline
label="Sort"
labelHidden
name="sort-select"
options={[
{
Expand Down Expand Up @@ -213,7 +214,7 @@ const SectorsListing = () => {
</div>
</>
</>
</main>
</div>
);
};

Expand Down
6 changes: 3 additions & 3 deletions app/[locale]/(user)/usecases/UseCasesListingClient.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ const breadcrumbData = [

const UseCasesListingClient = () => {
return (
<main>
<div>
<BreadCrumbs data={breadcrumbData} />
<div className="bg-primaryBlue">
<div className="container flex flex-col-reverse justify-center gap-8 p-10 lg:flex-row">
<div className="flex flex-col justify-center gap-6">
<Text variant="heading2xl" className="text-surfaceDefault">
<Text variant="heading2xl" as="h1" className="text-surfaceDefault">
Use Cases
</Text>
<Text
Expand Down Expand Up @@ -54,7 +54,7 @@ const UseCasesListingClient = () => {
redirectionURL={`/usecases`}
/>
</div>
</main>
</div>
);
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,10 @@ export default function CollaborativePage() {
? { [entityType]: entitySlug }
: null;

const [navigationTab, setNavigationTab] = useQueryState('tab', parseAsString);
const [navigationTab, setNavigationTab] = useQueryState(
'tab',
parseAsString.withDefault('drafts')
);

const AllCollaboratives =
useQuery(
Expand All @@ -110,12 +113,10 @@ export default function CollaborativePage() {
);

useEffect(() => {
if (navigationTab === null || navigationTab === undefined)
setNavigationTab('drafts');
if (isValidParams) {
AllCollaboratives.refetch();
}
}, [navigationTab, isValidParams, AllCollaboratives, setNavigationTab]);
}, [navigationTab, isValidParams, AllCollaboratives]);

const COLLAB_LIST_TOAST_ID = 'collaboratives-list-toast';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,10 @@ export default function DatasetPage() {
? { [entityType]: entitySlug }
: null;

const [navigationTab, setNavigationTab] = useQueryState('tab', parseAsString);
const [navigationTab, setNavigationTab] = useQueryState(
'tab',
parseAsString.withDefault('drafts')
);
const [isTypeModalOpen, setIsTypeModalOpen] = useState(false);

const AllDatasetsQuery = useQuery(
Expand All @@ -111,12 +114,10 @@ export default function DatasetPage() {
);

useEffect(() => {
if (navigationTab === null || navigationTab === undefined)
setNavigationTab('drafts');
if (isValidParams) {
AllDatasetsQuery.refetch();
}
}, [navigationTab, isValidParams, AllDatasetsQuery, setNavigationTab]);
}, [navigationTab, isValidParams, AllDatasetsQuery]);

const DeleteDatasetMutation = useMutation(
[`delete_dataset`],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,10 @@ export default function DatasetPage() {
? { [entityType]: entitySlug }
: null;

const [navigationTab, setNavigationTab] = useQueryState('tab', parseAsString);
const [navigationTab, setNavigationTab] = useQueryState(
'tab',
parseAsString.withDefault('drafts')
);

const AllUseCases = useQuery(
[`fetch_UseCases`, entityType, entitySlug, navigationTab ?? 'drafts'],
Expand All @@ -105,12 +108,10 @@ export default function DatasetPage() {
);

useEffect(() => {
if (navigationTab === null || navigationTab === undefined)
setNavigationTab('drafts');
if (isValidParams) {
AllUseCases.refetch();
}
}, [navigationTab, isValidParams, setNavigationTab, AllUseCases]);
}, [navigationTab, isValidParams, AllUseCases]);

const DeleteUseCaseMutation = useMutation(
[`delete_Usecase`],
Expand Down
Loading
Loading