Skip to content

Commit eab503c

Browse files
bhavabhuthibhavabhuthi
authored
Merge pull request #82 from CivicDataLab/81-fix-bugs-and-update-ui
Fix Bugs and update UI
2 parents c6cce9a + fad7339 commit eab503c

8 files changed

Lines changed: 105 additions & 47 deletions

File tree

‎app/[locale]/(user)/datasets/[datasetIdentifier]/components/AccessModels/index.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,9 @@ const AccessModels = () => {
170170
{item?.modelResources?.length > 0 && (
171171
<div className="flex">
172172
<Accordion type="single" collapsible className="w-full">
173-
<AccordionItem value="item-1">
174-
<AccordionTrigger className="flex w-full flex-wrap items-center gap-2 ">
175-
<div className=" text-baseBlueSolid8 hover:no-underline ">
173+
<AccordionItem value="item-1" className=" border-none">
174+
<AccordionTrigger className="flex w-full flex-wrap items-center gap-2 hover:no-underline">
175+
<div className=" text-baseBlueSolid8 ">
176176
See Resources
177177
</div>
178178
</AccordionTrigger>

‎app/[locale]/(user)/datasets/[datasetIdentifier]/components/Resources/index.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,9 +200,9 @@ const Resources = () => {
200200
{item?.accessModels?.length > 0 && (
201201
<div className="flex">
202202
<Accordion type="single" collapsible className="w-full">
203-
<AccordionItem value="item-1">
204-
<AccordionTrigger className="flex w-full flex-wrap items-center gap-2 ">
205-
<div className=" text-baseBlueSolid8 hover:no-underline ">
203+
<AccordionItem value="item-1" className=" border-none">
204+
<AccordionTrigger className="flex w-full flex-wrap items-center gap-2 hover:no-underline ">
205+
<div className=" text-baseBlueSolid8 ">
206206
See Access Type
207207
</div>
208208
</AccordionTrigger>

‎app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/AccessModelForm.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ const AccessModelForm: React.FC<AccessModelProps> = ({ setQueryList }) => {
129129

130130
return (
131131
<div className="rounded-2 border-2 border-solid border-baseGraySlateSolid6 px-6 py-8">
132-
<div className="mb-6 flex flex-wrap justify-between gap-6">
132+
<div className="mb-6 flex flex-wrap items-center justify-between gap-6">
133133
<div className="flex w-2/3 flex-wrap items-center gap-2">
134134
<Text>Access Type Name:</Text>
135135
<Select
@@ -141,6 +141,7 @@ const AccessModelForm: React.FC<AccessModelProps> = ({ setQueryList }) => {
141141
/>
142142
</div>
143143
<Button
144+
className=" h-fit w-fit"
144145
onClick={(e) =>
145146
setAccessModelData({
146147
dataset: params.id,

‎app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/AccessModelList.tsx‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,12 @@ const AccessModelList: React.FC<AccessModelListProps> = ({
9595
</Button>
9696
</div>
9797

98-
<Table
99-
columns={generateColumnData()}
100-
rows={generateTableData(data?.accessModelResources)}
101-
/>
98+
{data.accessModelResources.length > 0 && (
99+
<Table
100+
columns={generateColumnData()}
101+
rows={generateTableData(data?.accessModelResources)}
102+
/>
103+
)}
102104
</>
103105
)}
104106
</div>

‎app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/ResourceSelector.tsx‎

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ const ResourceSelector: React.FC<ResourceSelectorProps> = ({
9292
<div className=" mb-4">
9393
<Text>{selectedResource.name}</Text>
9494
</div>
95-
<div className="flex flex-wrap justify-between gap-6 px-8">
96-
<div className="flex w-full flex-col gap-4 xl:w-3/5">
95+
<div className="flex flex-wrap justify-start gap-6 px-8">
96+
<div className="flex w-full flex-col gap-4 2xl:w-3/5">
9797
<div className="relative mr-4 flex items-center">
9898
<div className="w-full">
9999
<Combobox
@@ -118,24 +118,28 @@ const ResourceSelector: React.FC<ResourceSelectorProps> = ({
118118
</div>
119119
</div>
120120
</div>
121-
<hr className=" m-0" />
122-
<div className="flex w-fit flex-col items-center justify-center gap-1">
123-
<div className="flex w-full items-center justify-between gap-2 ">
124-
<Text>Select Rows of the Resource</Text>
125-
<Checkbox
126-
name={'Select All Rows'}
127-
defaultChecked={false}
128-
onChange={(e) => console.log(e)}
121+
<div className="flex gap-6">
122+
<hr className=" m-0" />
123+
<div className="flex w-fit flex-col items-center justify-center gap-1">
124+
<div className="flex w-full items-center justify-between gap-2 ">
125+
<Text>Select Rows of the Resource</Text>
126+
<Checkbox
127+
name={'Select All Rows'}
128+
defaultChecked={false}
129+
onChange={(e) => console.log(e)}
130+
>
131+
Select All
132+
</Checkbox>
133+
</div>
134+
<div
135+
className={cn('flex flex-wrap gap-6', styles.accessModelEdit)}
129136
>
130-
Select All
131-
</Checkbox>
132-
</div>
133-
<div className={cn('flex flex-wrap gap-6', styles.accessModelEdit)}>
134-
<TextField type="number" label="From Row Number" name="name" />
135-
<TextField type="number" label="From Row Number" name="name" />
137+
<TextField type="number" label="From Row Number" name="name" />
138+
<TextField type="number" label="From Row Number" name="name" />
139+
</div>
136140
</div>
141+
<hr className=" m-0" />
137142
</div>
138-
<hr className=" m-0" />
139143
<Button
140144
className="my-auto h-fit w-fit items-center"
141145
kind="tertiary"

‎app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/publish/page.tsx‎

Lines changed: 64 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import {
1111
AccordionTrigger,
1212
Button,
1313
Dialog,
14+
Icon,
1415
Spinner,
1516
Table,
1617
Tag,
@@ -20,6 +21,7 @@ import {
2021

2122
import { GraphQL } from '@/lib/api';
2223
import { formatDate, toTitleCase } from '@/lib/utils';
24+
import { Icons } from '@/components/icons';
2325

2426
const datasetSummaryQuery = graphql(`
2527
query datasetsSummary($filters: DatasetFilter) {
@@ -187,14 +189,25 @@ const Page = () => {
187189
{
188190
name: 'Resource',
189191
data: data?.datasets[0]?.resources,
192+
error:
193+
data && data?.datasets[0]?.resources.length === 0
194+
? 'No Resources found. Please add to continue.'
195+
: '',
196+
errorType: 'critical',
190197
},
191198
{
192199
name: 'Access Type',
193200
data: data?.datasets[0]?.accessModels,
201+
error:
202+
data && data?.datasets[0]?.resources.length === 0
203+
? 'No Access Type found. Please add to continue.'
204+
: '',
205+
errorType: 'critical',
194206
},
195207
{
196208
name: 'Metadata',
197209
data: data?.datasets[0]?.metadata,
210+
error: '',
198211
},
199212
];
200213

@@ -222,6 +235,8 @@ const Page = () => {
222235
}
223236
);
224237

238+
console.log(Summary);
239+
225240
return (
226241
<>
227242
<div className=" w-full py-6">
@@ -243,10 +258,25 @@ const Page = () => {
243258
<>
244259
{Summary.map((item, index) => (
245260
<Accordion type="single" collapsible key={index}>
246-
<AccordionItem value={`item-${index}`}>
247-
<AccordionTrigger className="flex w-full flex-wrap items-center gap-2 rounded-1 bg-baseBlueSolid3 p-4 ">
248-
<div>
249-
<Text className=" font-semi-bold">See {item.name}</Text>
261+
<AccordionItem
262+
value={`item-${index}`}
263+
className=" border-none"
264+
>
265+
<AccordionTrigger className="flex w-full flex-wrap items-center gap-2 rounded-1 bg-baseBlueSolid3 p-4 hover:no-underline ">
266+
<div className="flex flex-wrap items-center justify-start gap-2">
267+
<Text className=" w-32 text-justify font-semi-bold">
268+
{item.name}
269+
</Text>
270+
{item.error !== '' && (
271+
<div className="flex items-center gap-2">
272+
<Icon
273+
source={Icons.alert}
274+
color="critical"
275+
size={24}
276+
/>
277+
<Text variant="bodyMd">{item.error}</Text>
278+
</div>
279+
)}
250280
</div>
251281
</AccordionTrigger>
252282
<AccordionContent
@@ -258,23 +288,38 @@ const Page = () => {
258288
>
259289
<div className=" py-4">
260290
{item.name !== 'Metadata' ? (
261-
<Table
262-
columns={generateColumnData(item.name)}
263-
rows={generateTableData(item.name, item.data)}
264-
hideFooter
265-
/>
291+
item.data &&
292+
item?.data.length > 0 && (
293+
<Table
294+
columns={generateColumnData(item.name)}
295+
rows={generateTableData(item.name, item.data)}
296+
hideFooter
297+
/>
298+
)
266299
) : (
267300
<div className="flex flex-col gap-4 px-8 py-4">
268-
{PrimaryMetadata.map((item, index) => (
269-
<div className="flex flex-wrap gap-2" key={index}>
270-
<Text className=" basis-1/6" variant="bodyMd">
271-
{item.label}:
272-
</Text>
273-
<Text variant="bodyMd" className=" basis-4/5">
274-
{item.value}
275-
</Text>
276-
</div>
277-
))}
301+
{PrimaryMetadata.map(
302+
(item, index) =>
303+
item.value && (
304+
<div
305+
className="flex flex-wrap gap-2"
306+
key={index}
307+
>
308+
<Text
309+
className=" basis-1/6"
310+
variant="bodyMd"
311+
>
312+
{item.label}:
313+
</Text>
314+
<Text
315+
variant="bodyMd"
316+
className=" basis-4/5"
317+
>
318+
{item.value}
319+
</Text>
320+
</div>
321+
)
322+
)}
278323

279324
{item?.data?.map((item: any, index: any) => (
280325
<div className="flex flex-wrap gap-2" key={index}>

‎app/[locale]/dashboard/organization/[organizationId]/layout.tsx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ export default function OrgDashboardLayout({ children }: DashboardLayoutProps) {
4343
href: '/dashboard/user/datasets',
4444
label: 'User Dashboard',
4545
},
46+
{
47+
href: '',
48+
label: `${params.organizationId}`,
49+
},
4650
]}
4751
/>
4852
<div

‎components/icons.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import {
2+
IconAlertCircleFilled,
23
IconArrowLeft,
34
IconArrowRight,
45
IconBarrierBlock,
@@ -76,4 +77,5 @@ export const Icons: {
7677
linkedin: IconBrandLinkedin,
7778
github: IconBrandGithubFilled,
7879
download: IconDownload,
80+
alert: IconAlertCircleFilled,
7981
};

0 commit comments

Comments
 (0)