Skip to content

Commit 9fa07b6

Browse files
committed
add headers to all dataset flow queries and mutations for all entities
1 parent 1631b5b commit 9fa07b6

File tree

12 files changed

+87
-40
lines changed

12 files changed

+87
-40
lines changed

app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/[id]/edit/charts/components/ChartsList.tsx

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,11 @@ const ChartsList: React.FC<ChartsListProps> = ({
4444
type,
4545
setChartId,
4646
}) => {
47-
const params = useParams();
47+
const params = useParams<{
48+
entityType: string;
49+
entitySlug: string;
50+
id: string;
51+
}>();
4852

4953
const {
5054
data,
@@ -56,7 +60,7 @@ const ChartsList: React.FC<ChartsListProps> = ({
5660
GraphQL(
5761
chartDetailsQuery,
5862
{
59-
// Entity Headers if present
63+
[params.entityType]: params.entitySlug,
6064
},
6165
{
6266
datasetId: params.id,
@@ -78,7 +82,7 @@ const ChartsList: React.FC<ChartsListProps> = ({
7882
GraphQL(
7983
deleteResourceChart,
8084
{
81-
// Entity Headers if present
85+
[params.entityType]: params.entitySlug,
8286
},
8387
data
8488
),

app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/[id]/edit/charts/components/ChartsVisualize.tsx

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,16 @@ const ChartsVisualize: React.FC<VisualizationProps> = ({
127127
chartId,
128128
setChartId,
129129
}) => {
130-
const params = useParams();
130+
const params = useParams<{
131+
entityType: string;
132+
entitySlug: string;
133+
id: string;
134+
}>();
131135
const { data }: { data: any } = useQuery([`charts_${params.id}`], () =>
132136
GraphQL(
133137
datasetResource,
134138
{
135-
// Entity Headers if present
139+
[params.entityType]: params.entitySlug,
136140
},
137141
{ datasetId: params.id }
138142
)
@@ -144,7 +148,7 @@ const ChartsVisualize: React.FC<VisualizationProps> = ({
144148
GraphQL(
145149
getResourceChartDetails,
146150
{
147-
// Entity Headers if present
151+
[params.entityType]: params.entitySlug,
148152
},
149153
{ chartDetailsId: chartId }
150154
),
@@ -162,7 +166,7 @@ const ChartsVisualize: React.FC<VisualizationProps> = ({
162166
GraphQL(
163167
chartDetailsQuery,
164168
{
165-
// Entity Headers if present
169+
[params.entityType]: params.entitySlug,
166170
},
167171
{
168172
datasetId: params.id,
@@ -245,7 +249,7 @@ const ChartsVisualize: React.FC<VisualizationProps> = ({
245249
GraphQL(
246250
createChart,
247251
{
248-
// Entity Headers if present
252+
[params.entityType]: params.entitySlug,
249253
},
250254
chartInput
251255
),

app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/[id]/edit/components/AccessModelForm.tsx

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,18 @@ const AccessModelForm: React.FC<AccessModelProps> = ({
102102
setList(false);
103103
}, []);
104104

105-
const params = useParams();
105+
const params = useParams<{
106+
entityType: string;
107+
entitySlug: string;
108+
id: string;
109+
}>();
106110
const { data, isLoading }: { data: any; isLoading: boolean } = useQuery(
107111
[`resourcesList_${params.id}`],
108112
() =>
109113
GraphQL(
110114
datasetResourcesQuery,
111115
{
112-
// Entity Headers if present
116+
[params.entityType]: params.entitySlug,
113117
},
114118
{ datasetId: params.id }
115119
)
@@ -125,7 +129,7 @@ const AccessModelForm: React.FC<AccessModelProps> = ({
125129
GraphQL(
126130
accessModelListQuery,
127131
{
128-
// Entity Headers if present
132+
[params.entityType]: params.entitySlug,
129133
},
130134
{ datasetId: params.id }
131135
)
@@ -140,7 +144,7 @@ const AccessModelForm: React.FC<AccessModelProps> = ({
140144
GraphQL(
141145
getAccessModelDetails,
142146
{
143-
// Entity Headers if present
147+
[params.entityType]: params.entitySlug,
144148
},
145149
{ accessModelId: accessModelId }
146150
)
@@ -312,7 +316,7 @@ const AccessModelForm: React.FC<AccessModelProps> = ({
312316
GraphQL(
313317
editaccessModel,
314318
{
315-
// Entity Headers if present
319+
[params.entityType]: params.entitySlug,
316320
},
317321
data
318322
),

app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/[id]/edit/components/AccessModelList.tsx

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,11 @@ const AccessModelList: React.FC<AccessModelListProps> = ({
4848
list,
4949
setAccessModelId,
5050
}) => {
51-
const params = useParams();
51+
const params = useParams<{
52+
entityType: string;
53+
entitySlug: string;
54+
id: string;
55+
}>();
5256

5357
const {
5458
data,
@@ -60,7 +64,7 @@ const AccessModelList: React.FC<AccessModelListProps> = ({
6064
GraphQL(
6165
accessModelQuery,
6266
{
63-
// Entity Headers if present
67+
[params.entityType]: params.entitySlug,
6468
},
6569
{
6670
datasetId: params.id,
@@ -82,7 +86,7 @@ const AccessModelList: React.FC<AccessModelListProps> = ({
8286
GraphQL(
8387
deleteAccessModel,
8488
{
85-
// Entity Headers if present
89+
[params.entityType]: params.entitySlug,
8690
},
8791
data
8892
),

app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/[id]/edit/components/EditLayout.tsx

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,11 @@ export function EditLayout({ children, params }: LayoutProps) {
6666
// );
6767

6868
const pathName = usePathname();
69-
const routerParams = useParams();
69+
const routerParams = useParams<{
70+
entityType: string;
71+
entitySlug: string;
72+
id: string;
73+
}>();
7074

7175
const [editMode, setEditMode] = useState(false);
7276

@@ -75,7 +79,7 @@ export function EditLayout({ children, params }: LayoutProps) {
7579
GraphQL(
7680
datasetQueryDoc,
7781
{
78-
// Entity Headers if present
82+
[routerParams.entityType]: routerParams.entitySlug,
7983
},
8084
{
8185
filters: {
@@ -90,7 +94,7 @@ export function EditLayout({ children, params }: LayoutProps) {
9094
GraphQL(
9195
updateDatasetTitleMutationDoc,
9296
{
93-
// Entity Headers if present
97+
[routerParams.entityType]: routerParams.entitySlug,
9498
},
9599
data
96100
),

app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/[id]/edit/components/EditMetadata.tsx

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,11 @@ const updateMetadataMutationDoc: any = graphql(`
110110

111111
export function EditMetadata({ id }: { id: string }) {
112112
const router = useRouter();
113-
const params = useParams();
113+
const params = useParams<{
114+
entityType: string;
115+
entitySlug: string;
116+
id: string;
117+
}>();
114118

115119
const queryClient = useQueryClient();
116120

@@ -125,7 +129,7 @@ export function EditMetadata({ id }: { id: string }) {
125129
GraphQL(
126130
datasetMetadataQueryDoc,
127131
{
128-
// Entity Headers if present
132+
[params.entityType]: params.entitySlug,
129133
},
130134
{ filters: { id: params.id } }
131135
),
@@ -140,7 +144,7 @@ export function EditMetadata({ id }: { id: string }) {
140144
GraphQL(
141145
categoriesListQueryDoc,
142146
{
143-
// Entity Headers if present
147+
[params.entityType]: params.entitySlug,
144148
},
145149
[]
146150
)
@@ -152,7 +156,7 @@ export function EditMetadata({ id }: { id: string }) {
152156
GraphQL(
153157
tagsListQueryDoc,
154158
{
155-
// Entity Headers if present
159+
[params.entityType]: params.entitySlug,
156160
},
157161
[]
158162
)
@@ -166,7 +170,7 @@ export function EditMetadata({ id }: { id: string }) {
166170
GraphQL(
167171
metadataQueryDoc,
168172
{
169-
// Entity Headers if present
173+
[params.entityType]: params.entitySlug,
170174
},
171175
{
172176
filters: {
@@ -182,7 +186,7 @@ export function EditMetadata({ id }: { id: string }) {
182186
GraphQL(
183187
updateMetadataMutationDoc,
184188
{
185-
// Entity Headers if present
189+
[params.entityType]: params.entitySlug,
186190
},
187191
data
188192
),

app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/[id]/edit/publish/page.tsx

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,13 +173,17 @@ const generateTableData = (name: any, data: any) => {
173173
};
174174

175175
const Page = () => {
176-
const params = useParams();
176+
const params = useParams<{
177+
entityType: string;
178+
entitySlug: string;
179+
id: string;
180+
}>();
177181

178182
const { data, isLoading, refetch } = useQuery([`summary_${params.id}`], () =>
179183
GraphQL(
180184
datasetSummaryQuery,
181185
{
182-
// Entity Headers if present
186+
[params.entityType]: params.entitySlug,
183187
},
184188
{ filters: { id: params.id } }
185189
)
@@ -235,7 +239,7 @@ const Page = () => {
235239
GraphQL(
236240
publishDatasetMutation,
237241
{
238-
// Entity Headers if present
242+
[params.entityType]: params.entitySlug,
239243
},
240244
{ datasetId: params.id }
241245
),

app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/[id]/edit/resources/components/ResourceDropzone.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ import { createResourceFilesDoc } from './query';
1212

1313
export const ResourceDropzone = ({ reload }: { reload: () => void }) => {
1414
const fileTypes = ['PDF', 'CSV', 'XLS', 'XLSX', 'TXT', 'ZIP'];
15-
const params = useParams();
15+
const params = useParams<{
16+
entityType: string;
17+
entitySlug: string;
18+
id: string;
19+
}>();
1620
const [file, setFile] = React.useState<File[]>([]);
1721

1822
const [resourceId, setResourceId] = useQueryState('id', parseAsString);
@@ -22,7 +26,7 @@ export const ResourceDropzone = ({ reload }: { reload: () => void }) => {
2226
GraphQL(
2327
createResourceFilesDoc,
2428
{
25-
// Entity Headers if present
29+
[params.entityType]: params.entitySlug,
2630
},
2731
data
2832
),

app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/[id]/edit/resources/components/ResourceListView.tsx

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,18 @@ export const ResourceListView = ({ data, refetch }: ResourceListProps) => {
3737
const [file, setFile] = React.useState<File[]>([]);
3838

3939
const router = useRouter();
40-
const params = useParams();
40+
const params = useParams<{
41+
entityType: string;
42+
entitySlug: string;
43+
id: string;
44+
}>();
4145

4246
const updateResourceMutation = useMutation(
4347
(data: { resourceId: string }) =>
4448
GraphQL(
4549
updateResourceList,
4650
{
47-
// Entity Headers if present
51+
[params.entityType]: params.entitySlug,
4852
},
4953
data
5054
),
@@ -73,7 +77,7 @@ export const ResourceListView = ({ data, refetch }: ResourceListProps) => {
7377
GraphQL(
7478
createResourceFilesDoc,
7579
{
76-
// Entity Headers if present
80+
[params.entityType]: params.entitySlug,
7781
},
7882
data
7983
),

app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/[id]/edit/resources/page-layout.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,18 @@ export interface TListItem {
1919
fileDetails: any;
2020
}
2121

22-
export function DistibutionPage({ params }: { params: { id: string } }) {
22+
export function DistibutionPage({
23+
params,
24+
}: {
25+
params: { entityType: string; entitySlug: string; id: string };
26+
}) {
2327
const { data, isLoading, refetch } = useQuery(
2428
[`fetch_resources_${params.id}`],
2529
() =>
2630
GraphQL(
2731
getReourceDoc,
2832
{
29-
// Entity Headers if present
33+
[params.entityType]: params.entitySlug,
3034
},
3135
{ filters: { id: params.id } }
3236
),

0 commit comments

Comments
 (0)