From 5cdef35217176dc4e458e10b82bb99e3881be13d Mon Sep 17 00:00:00 2001
From: Alex Cabrera <alex.cabrera@gmail.com>
Date: Wed, 25 Oct 2023 14:38:48 -0700
Subject: [PATCH 1/2] fix: fetch instance view for report slices

---
 backend/zeno_backend/server.py                |  4 ++++
 .../src/lib/components/report/Element.svelte  |  2 +-
 .../report/elements/SliceElement.svelte       |  6 ++++--
 .../models/Body_upload_dataset_schema.ts      |  2 +-
 frontend/src/lib/zenoapi/models/Project.ts    |  2 +-
 .../src/lib/zenoapi/services/ZenoService.ts   | 19 +++++++++++++++++++
 6 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/backend/zeno_backend/server.py b/backend/zeno_backend/server.py
index cfd2d461..7a936a99 100644
--- a/backend/zeno_backend/server.py
+++ b/backend/zeno_backend/server.py
@@ -590,6 +590,10 @@ def get_charts_for_projects(req: list[str]):
     def get_slices_for_projects(req: list[str]):
         return select.slices_for_projects(req)
 
+    @api_app.post("/match-instance-view/", response_model=str, tags=["zeno"])
+    def match_instance_view(req: str):
+        return select.match_instance_view(req)
+
     @api_app.post(
         "/slice-metrics/{project}",
         response_model=list[GroupMetric],
diff --git a/frontend/src/lib/components/report/Element.svelte b/frontend/src/lib/components/report/Element.svelte
index 717aea49..d5c91a7c 100644
--- a/frontend/src/lib/components/report/Element.svelte
+++ b/frontend/src/lib/components/report/Element.svelte
@@ -19,7 +19,7 @@
 	}
 </script>
 
-{#if element.data !== null && element.data !== undefined}
+{#if element.data !== null && element.data !== undefined && chartOptions.length > 0}
 	<div class="flex items-center my-2 ml-2" bind:clientWidth={width}>
 		{#if element.type === ReportElementType.TEXT}
 			<TextElement {element} />
diff --git a/frontend/src/lib/components/report/elements/SliceElement.svelte b/frontend/src/lib/components/report/elements/SliceElement.svelte
index e7e7779c..9dd5111f 100644
--- a/frontend/src/lib/components/report/elements/SliceElement.svelte
+++ b/frontend/src/lib/components/report/elements/SliceElement.svelte
@@ -21,10 +21,12 @@
 	let sliceElementOptions: SliceElementOptions | undefined;
 	let table: Record<string, string | number | boolean>[] | undefined = [];
 	let page = 0;
+	let view = '';
 
 	$: updateSliceElementSpec(element.data as string);
 
-	$: if (sliceElementSpec) {
+	$: if (sliceElementSpec && sliceElementOptions) {
+		zenoClient.matchInstanceView(sliceElementOptions.project.view ?? '').then((r) => (view = r));
 		zenoClient
 			.getSliceTable({
 				sliceId: sliceElementSpec.sliceId,
@@ -101,7 +103,7 @@
 					{#each table as inst (inst[sliceElementOptions.idColumn])}
 						<div class="m-auto mt-0">
 							<InstanceView
-								view={sliceElementOptions.project.view}
+								{view}
 								dataColumn={sliceElementOptions.dataColumn}
 								modelColumn={sliceElementOptions.modelColumn}
 								labelColumn={sliceElementOptions.labelColumn}
diff --git a/frontend/src/lib/zenoapi/models/Body_upload_dataset_schema.ts b/frontend/src/lib/zenoapi/models/Body_upload_dataset_schema.ts
index bba9d825..ad667f85 100644
--- a/frontend/src/lib/zenoapi/models/Body_upload_dataset_schema.ts
+++ b/frontend/src/lib/zenoapi/models/Body_upload_dataset_schema.ts
@@ -6,7 +6,7 @@
 export type Body_upload_dataset_schema = {
 	project_uuid: any;
 	id_column: any;
-	data_column: any;
+	data_column?: any;
 	label_column?: any;
 	file: Blob;
 };
diff --git a/frontend/src/lib/zenoapi/models/Project.ts b/frontend/src/lib/zenoapi/models/Project.ts
index daa811e9..f2996942 100644
--- a/frontend/src/lib/zenoapi/models/Project.ts
+++ b/frontend/src/lib/zenoapi/models/Project.ts
@@ -25,7 +25,7 @@ export type Project = {
 	description?: string;
 	metrics?: Array<Metric>;
 	ownerName: string;
-	view: string;
+	view?: string;
 	editor: boolean;
 	samplesPerPage?: number;
 	public?: boolean;
diff --git a/frontend/src/lib/zenoapi/services/ZenoService.ts b/frontend/src/lib/zenoapi/services/ZenoService.ts
index eebc57bf..b3f5849f 100644
--- a/frontend/src/lib/zenoapi/services/ZenoService.ts
+++ b/frontend/src/lib/zenoapi/services/ZenoService.ts
@@ -850,6 +850,25 @@ export class ZenoService {
 		});
 	}
 
+	/**
+	 * Match Instance View
+	 * @param req
+	 * @returns string Successful Response
+	 * @throws ApiError
+	 */
+	public matchInstanceView(req: string): CancelablePromise<string> {
+		return this.httpRequest.request({
+			method: 'POST',
+			url: '/match-instance-view/',
+			query: {
+				req: req
+			},
+			errors: {
+				422: `Validation Error`
+			}
+		});
+	}
+
 	/**
 	 * Get Metrics For Slices
 	 * @param project

From 029bc23598dcbd907515f2ccf3f22cd272ab273b Mon Sep 17 00:00:00 2001
From: Alex Cabrera <alex.cabrera@gmail.com>
Date: Wed, 25 Oct 2023 14:44:32 -0700
Subject: [PATCH 2/2] fix

---
 frontend/src/lib/components/instances/ComparisonView.svelte | 4 ++--
 frontend/src/lib/components/instances/ListView.svelte       | 2 +-
 frontend/src/lib/components/instances/TableView.svelte      | 2 +-
 frontend/src/lib/components/project/Project.svelte          | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend/src/lib/components/instances/ComparisonView.svelte b/frontend/src/lib/components/instances/ComparisonView.svelte
index c02d42af..9c32fc21 100644
--- a/frontend/src/lib/components/instances/ComparisonView.svelte
+++ b/frontend/src/lib/components/instances/ComparisonView.svelte
@@ -268,7 +268,7 @@
 								</p>
 								<div class="instance">
 									<InstanceView
-										view={$project.view}
+										view={$project.view ?? ''}
 										{dataColumn}
 										{labelColumn}
 										modelColumn={modelAColumn?.id}
@@ -283,7 +283,7 @@
 								</p>
 								<div class="instance">
 									<InstanceView
-										view={$project.view}
+										view={$project.view ?? ''}
 										{dataColumn}
 										{labelColumn}
 										modelColumn={modelBColumn?.id}
diff --git a/frontend/src/lib/components/instances/ListView.svelte b/frontend/src/lib/components/instances/ListView.svelte
index 47b0c748..dcc02d9e 100644
--- a/frontend/src/lib/components/instances/ListView.svelte
+++ b/frontend/src/lib/components/instances/ListView.svelte
@@ -103,7 +103,7 @@
 			{#each table as inst (inst[idColumn])}
 				<div class="mr-2 mt-2">
 					<InstanceView
-						view={$project.view}
+						view={$project.view ?? ''}
 						{dataColumn}
 						{labelColumn}
 						modelColumn={modelColumn?.id}
diff --git a/frontend/src/lib/components/instances/TableView.svelte b/frontend/src/lib/components/instances/TableView.svelte
index e290399d..dc68215f 100644
--- a/frontend/src/lib/components/instances/TableView.svelte
+++ b/frontend/src/lib/components/instances/TableView.svelte
@@ -180,7 +180,7 @@
 									{:else}
 										<div class="instance">
 											<InstanceView
-												view={$project.view}
+												view={$project.view ?? ''}
 												{dataColumn}
 												{labelColumn}
 												modelColumn={modelColumn?.id}
diff --git a/frontend/src/lib/components/project/Project.svelte b/frontend/src/lib/components/project/Project.svelte
index 4d74b621..3c875866 100644
--- a/frontend/src/lib/components/project/Project.svelte
+++ b/frontend/src/lib/components/project/Project.svelte
@@ -27,8 +27,8 @@
 	let showConfirmDelete = false;
 
 	function getProjectIcon() {
-		if (project.view.includes('image')) return mdiImage;
-		if (project.view.includes('chat') || project.view.includes('text')) return mdiText;
+		if (project.view?.includes('image')) return mdiImage;
+		if (project.view?.includes('chat') || project.view?.includes('text')) return mdiText;
 		else return mdiTag;
 	}
 </script>