From f884cfabde5aafd47427e36a526fa009b5878c22 Mon Sep 17 00:00:00 2001
From: Gift Nnko <nnkogift@gmail.com>
Date: Tue, 10 Sep 2024 18:13:08 +0300
Subject: [PATCH] fix: scorecard form

Improvement of the data groups configuration drag and drop
---
 .../DataConfiguration/DataGroupArea.tsx       |   2 +-
 .../DataGroup/components/LinkingContainer.tsx |   2 +-
 .../DataGroups/components/DataGroup/index.tsx | 201 +++++++++---------
 .../components/DataSource/index.tsx           |   3 +-
 .../components/DataSourceHolder/index.tsx     |   2 +-
 .../DataSourceSelectorModal/index.tsx         |  26 +--
 .../components/DataGroups/index.tsx           |  52 +++--
 .../components/EmptyDataGroups.tsx            |   6 +-
 .../hooks/useDataGroupLayout.ts               |  11 +-
 .../components/DataConfiguration/index.tsx    |   2 +-
 10 files changed, 164 insertions(+), 143 deletions(-)

diff --git a/packages/app/src/modules/ScorecardManagement/components/DataConfiguration/DataGroupArea.tsx b/packages/app/src/modules/ScorecardManagement/components/DataConfiguration/DataGroupArea.tsx
index 3d01ee06a..93b69b6ba 100644
--- a/packages/app/src/modules/ScorecardManagement/components/DataConfiguration/DataGroupArea.tsx
+++ b/packages/app/src/modules/ScorecardManagement/components/DataConfiguration/DataGroupArea.tsx
@@ -14,7 +14,7 @@ export default function DataGroupArea() {
 					<SearchDataItem />
 				</div>
 				<h4 className="pl-16">{i18n.t("Groups")}</h4>
-				<div style={{ maxHeight: "60vh", overflowY: "auto", flex: 1 }}>
+				<div style={{ maxHeight: "60vh", overflowY: "auto", flex: 1, justifySelf: "stretch" }}>
 					<DataGroups />
 				</div>
 			</div>
diff --git a/packages/app/src/modules/ScorecardManagement/components/DataConfiguration/components/DataGroups/components/DataGroup/components/LinkingContainer.tsx b/packages/app/src/modules/ScorecardManagement/components/DataConfiguration/components/DataGroups/components/DataGroup/components/LinkingContainer.tsx
index d7d5887e2..d87128e82 100644
--- a/packages/app/src/modules/ScorecardManagement/components/DataConfiguration/components/DataGroups/components/DataGroup/components/LinkingContainer.tsx
+++ b/packages/app/src/modules/ScorecardManagement/components/DataConfiguration/components/DataGroups/components/DataGroup/components/LinkingContainer.tsx
@@ -27,7 +27,7 @@ export function LinkingContainer({
 							content={i18n.t(
 								"Click to configure, drag to rearrange"
 							)}
-							key={`group-${groupIndex}-holder-${source}`}
+							key={`group-${groupIndex}-holder-${source.id}`}
 						>
 							<DataSourceHolder
 								dataHolder={source}
diff --git a/packages/app/src/modules/ScorecardManagement/components/DataConfiguration/components/DataGroups/components/DataGroup/index.tsx b/packages/app/src/modules/ScorecardManagement/components/DataConfiguration/components/DataGroups/components/DataGroup/index.tsx
index a0b76082c..09dc1e4a0 100644
--- a/packages/app/src/modules/ScorecardManagement/components/DataConfiguration/components/DataGroups/components/DataGroup/index.tsx
+++ b/packages/app/src/modules/ScorecardManagement/components/DataConfiguration/components/DataGroups/components/DataGroup/index.tsx
@@ -1,21 +1,20 @@
 import i18n from "@dhis2/d2-i18n";
-import { Button, colors, Tooltip } from "@dhis2/ui";
+import { Button, colors, IconDragHandle24, Tooltip } from "@dhis2/ui";
 import { IconAdd24, IconChevronDown24 } from "@dhis2/ui-icons";
 import React, { useRef, useState } from "react";
 import useDataGroupLayout from "../../../../hooks/useDataGroupLayout";
 import useDataGroupManage from "../../../../hooks/useDataGroupManage";
 import { Accordion, AccordionDetails, AccordionSummary } from "./components/Accordions";
 import GroupTitle from "./components/GroupTitle";
-import { DataGroupDraggable } from "./components/DataGroupDraggable";
 import { isEmpty } from "lodash";
 import { LinkingContainer } from "./components/LinkingContainer";
-import { DragDropContext, Droppable } from "react-beautiful-dnd";
+import { DragDropContext, Draggable, Droppable } from "react-beautiful-dnd";
+import DataSourceSelectorModal from "../DataSourceSelectorModal";
 
 export function DataGroup(
 	{ index, onRemove }: { index: number, onRemove: (index: number) => void }
 ) {
 	const {
-		onDataSourceDelete,
 		onDataSourceAdd,
 		group
 	} = useDataGroupManage({ index });
@@ -26,102 +25,114 @@ export function DataGroup(
 	const [openAdd, setOpenAdd] = useState(false);
 	const summaryRef = useRef();
 
-
 	return (
-		<DataGroupDraggable id={id}>
-			<Accordion
-				onDoubleClick={(event) => event.stopPropagation()}
-				square
-				expanded={expanded}
-				onChange={toggleExpansion}
-			>
-				<Tooltip
-					content={i18n.t(
-						"Click to {{action}}, drag to rearrange",
-						{
-							action:
-								expanded === id
-									? i18n.t("collapse")
-									: i18n.t("expand")
-						}
-					)}
-				>
-					<AccordionSummary
-						innerRef={summaryRef}
-						onClick={(event) => event.stopPropagation()}
-						expandIcon={
-							<IconChevronDown24
-								key={"scorecard-group-expand"}
-							/>
-						}
-						aria-controls={`${id}d-content`}
-						id={`${id}d--header`}
-					>
-						<GroupTitle
-							index={index}
-							onDelete={onRemove}
-						/>
-					</AccordionSummary>
-				</Tooltip>
-				<AccordionDetails>
-					<div className="column data-holders-area">
-						{isEmpty(dataHolders) ? (
-							<div
-								className="column w-100 text-center center"
-								style={{ height: 100 }}
+		<div className="w-100">
+			<Draggable draggableId={`${id}`} index={index}>
+				{
+					(provided) => {
+
+						return <Accordion
+							innerRef={provided.innerRef}
+							onDoubleClick={(event) => event.stopPropagation()}
+							square
+							expanded={expanded}
+							onChange={toggleExpansion}
+						>
+							<Tooltip
+								content={i18n.t(
+									"Click to {{action}}, drag to rearrange",
+									{
+										action:
+											expanded === id
+												? i18n.t("collapse")
+												: i18n.t("expand")
+									}
+								)}
 							>
-								<p style={{ color: colors.grey600 }}>
-									{i18n.t("Add a data source")}
-								</p>
-							</div>
-						) : (
-							<DragDropContext onDragEnd={onDragEnd}>
-								<Droppable droppableId={`${id}`}>
-									{(provided: any) => (
+								<AccordionSummary
+									{...provided.draggableProps}
+									{...provided.dragHandleProps}
+									innerRef={summaryRef}
+									onClick={(event) => event.stopPropagation()}
+									expandIcon={
+										<IconChevronDown24
+											key={"scorecard-group-expand"}
+										/>
+									}
+									aria-controls={`${id}d-content`}
+									id={`${id}d--header`}
+								>
+									<div style={{ gap: 8 }} className="row align-items-center">
+										<IconDragHandle24 />
+										<GroupTitle
+											index={index}
+											onDelete={onRemove}
+										/>
+									</div>
+								</AccordionSummary>
+							</Tooltip>
+							<AccordionDetails>
+								<div className="column data-holders-area">
+									{isEmpty(dataHolders) ? (
 										<div
-											className="w-100 "
-											{...provided.droppableProps}
-											ref={provided.innerRef}
+											className="column w-100 text-center center"
+											style={{ height: 100 }}
 										>
-											{dataHolderChunks?.map(
-												(chunk, i) => (
-													<LinkingContainer
-														groupIndex={index}
-														onDelete={remove}
-														onUnlink={onUnlink}
-														onLink={onLink}
-														chunk={chunk}
-														key={`${i}-linking-container-${group?.id}`}
-													/>
-												)
-											)}
-											{provided.placeholder}
+											<p style={{ color: colors.grey600 }}>
+												{i18n.t("Add a data source")}
+											</p>
 										</div>
+									) : (
+										<DragDropContext onDragEnd={onDragEnd}>
+											<Droppable droppableId={`${id}`}>
+												{(provided: any) => (
+													<div
+														className="w-100"
+														{...provided.droppableProps}
+														ref={provided.innerRef}
+													>
+														{dataHolderChunks?.map(
+															(chunk, i) => (
+																<LinkingContainer
+																	groupIndex={index}
+																	onDelete={remove}
+																	onUnlink={onUnlink}
+																	onLink={onLink}
+																	chunk={chunk}
+																	key={`${i}-linking-container-${group?.id}`}
+																/>
+															)
+														)}
+														{provided.placeholder}
+													</div>
+												)}
+											</Droppable>
+										</DragDropContext>
 									)}
-								</Droppable>
-							</DragDropContext>
-						)}
-						<div>
-							<Button
-								className="scorecard-indicator-add"
-								dataTest="scorecard-indicator-add"
-								onClick={() => setOpenAdd(true)}
-								icon={<IconAdd24 />}
-							>
-								{i18n.t("Add Item")}
-							</Button>
-						</div>
-					</div>
-					{/*{openAdd && (*/}
-					{/*	<DataSourceSelectorModal*/}
-					{/*		disabled={selectedDataSourcesIds}*/}
-					{/*		onSelect={onDataSourceAdd}*/}
-					{/*		onClose={() => setOpenAdd(false)}*/}
-					{/*		open={openAdd}*/}
-					{/*	/>*/}
-					{/*)}*/}
-				</AccordionDetails>
-			</Accordion>
-		</DataGroupDraggable>
+									<div>
+										<Button
+											className="scorecard-indicator-add"
+											dataTest="scorecard-indicator-add"
+											onClick={() => setOpenAdd(true)}
+											icon={<IconAdd24 />}
+										>
+											{i18n.t("Add Item")}
+										</Button>
+									</div>
+								</div>
+								{openAdd && (
+									<DataSourceSelectorModal
+										disabled={[]}
+										onSelect={onDataSourceAdd}
+										onClose={() => setOpenAdd(false)}
+										open={openAdd}
+									/>
+								)}
+							</AccordionDetails>
+						</Accordion>;
+					}
+				}
+			</Draggable>
+		</div>
 	);
 }
diff --git a/packages/app/src/modules/ScorecardManagement/components/DataConfiguration/components/DataGroups/components/DataSource/index.tsx b/packages/app/src/modules/ScorecardManagement/components/DataConfiguration/components/DataGroups/components/DataSource/index.tsx
index 5f73c835f..060c61eea 100644
--- a/packages/app/src/modules/ScorecardManagement/components/DataConfiguration/components/DataGroups/components/DataSource/index.tsx
+++ b/packages/app/src/modules/ScorecardManagement/components/DataConfiguration/components/DataGroups/components/DataSource/index.tsx
@@ -1,5 +1,5 @@
 import i18n from "@dhis2/d2-i18n";
-import { Button } from "@dhis2/ui";
+import { Button, IconDragHandle24 } from "@dhis2/ui";
 import { getDataSourceShortName } from "@scorecard/shared";
 import { Avatar } from "@material-ui/core";
 import { IconDelete16 } from "@dhis2/ui-icons";
@@ -13,6 +13,7 @@ export default function DataSource({ dataSource, index, onDelete }: { dataSource
 			<div className="container-bordered data-source p-8 w-100">
 				<div className="row space-between align-items-center">
 					<div className="row align-items-center ">
+						<IconDragHandle24 />
 						<Avatar className="data-source avatar">
 							{getDataSourceShortName(type)}
 						</Avatar>
diff --git a/packages/app/src/modules/ScorecardManagement/components/DataConfiguration/components/DataGroups/components/DataSourceHolder/index.tsx b/packages/app/src/modules/ScorecardManagement/components/DataConfiguration/components/DataGroups/components/DataSourceHolder/index.tsx
index 20c923878..7b110cb5a 100644
--- a/packages/app/src/modules/ScorecardManagement/components/DataConfiguration/components/DataGroups/components/DataSourceHolder/index.tsx
+++ b/packages/app/src/modules/ScorecardManagement/components/DataConfiguration/components/DataGroups/components/DataSourceHolder/index.tsx
@@ -29,7 +29,7 @@ export default function DataSourceHolder({
 	};
 	return (
 		<Draggable draggableId={`${id}`} index={index}>
-			{(provided: any) => (
+			{(provided) => (
 				<div
 					{...provided.draggableProps}
 					{...provided.dragHandleProps}
diff --git a/packages/app/src/modules/ScorecardManagement/components/DataConfiguration/components/DataGroups/components/DataSourceSelectorModal/index.tsx b/packages/app/src/modules/ScorecardManagement/components/DataConfiguration/components/DataGroups/components/DataSourceSelectorModal/index.tsx
index a424f27bc..8167461ff 100644
--- a/packages/app/src/modules/ScorecardManagement/components/DataConfiguration/components/DataGroups/components/DataSourceSelectorModal/index.tsx
+++ b/packages/app/src/modules/ScorecardManagement/components/DataConfiguration/components/DataGroups/components/DataSourceSelectorModal/index.tsx
@@ -1,18 +1,15 @@
 import i18n from "@dhis2/d2-i18n";
 import { Button, ButtonStrip, Modal, ModalActions, ModalContent, ModalTitle } from "@dhis2/ui";
-import { DataSourceSelector } from "@hisptz/dhis2-ui";
-import PropTypes from "prop-types";
+import { DataSourceSelector, SelectedDataItem } from "@hisptz/dhis2-ui";
 import React, { useState } from "react";
 
-//TODO: Refactor to shared
-
 export default function DataSourceSelectorModal({
-	onClose,
-	open,
-	onSelect,
-	disabled,
-}: any) {
-	const [selectedItems, setSelectedItems] = useState([]);
+													onClose,
+													open,
+													onSelect,
+													disabled
+												}: { onClose: () => void, open: boolean; onSelect: (dataItems: SelectedDataItem[]) => void, disabled: string[] }) {
+	const [selectedItems, setSelectedItems] = useState<SelectedDataItem[]>([]);
 
 	return (
 		<Modal onClose={onClose} position={"middle"} large hide={!open}>
@@ -25,7 +22,7 @@ export default function DataSourceSelectorModal({
 							"dataElement",
 							"dataSet",
 							"programIndicator",
-							"customFunction",
+							"customFunction"
 						]}
 						selected={selectedItems}
 						disabled={disabled}
@@ -51,10 +48,3 @@ export default function DataSourceSelectorModal({
 		</Modal>
 	);
 }
-
-DataSourceSelectorModal.propTypes = {
-	onClose: PropTypes.func.isRequired,
-	onSelect: PropTypes.func.isRequired,
-	disabled: PropTypes.array,
-	open: PropTypes.bool,
-};
diff --git a/packages/app/src/modules/ScorecardManagement/components/DataConfiguration/components/DataGroups/index.tsx b/packages/app/src/modules/ScorecardManagement/components/DataConfiguration/components/DataGroups/index.tsx
index 6177f3204..eb8b82486 100644
--- a/packages/app/src/modules/ScorecardManagement/components/DataConfiguration/components/DataGroups/index.tsx
+++ b/packages/app/src/modules/ScorecardManagement/components/DataConfiguration/components/DataGroups/index.tsx
@@ -1,6 +1,4 @@
 import React from "react";
-import { DndContext } from "@dnd-kit/core";
-import { DataGroupDroppable } from "./components/DataGroup/components/DataGroupDroppable";
 import { useDataItemSearchState } from "../../states/searchState";
 import { useFieldArray } from "react-hook-form";
 import { ScorecardConfig, ScorecardDataGroup } from "@hisptz/dhis2-analytics";
@@ -11,10 +9,11 @@ import i18n from "@dhis2/d2-i18n";
 import { Button } from "@dhis2/ui";
 import { IconAdd24 } from "@dhis2/ui-icons";
 import { DataGroup } from "./components/DataGroup";
+import { DragDropContext, Droppable, DropResult } from "react-beautiful-dnd";
 
 export default function DataGroups() {
 	const [filteredDataGroupIds] = useDataItemSearchState();
-	const { fields, append, remove } = useFieldArray<ScorecardConfig, "dataSelection.dataGroups">({
+	const { fields, append, remove, move } = useFieldArray<ScorecardConfig, "dataSelection.dataGroups">({
 		name: "dataSelection.dataGroups"
 	});
 
@@ -22,7 +21,7 @@ export default function DataGroups() {
 		append({
 			id: uid(),
 			dataHolders: [],
-			title: i18n.t("Default"),
+			title: `${i18n.t("Default")} ${fields.length + 1}`,
 			style: {}
 		} as ScorecardDataGroup);
 	};
@@ -31,22 +30,35 @@ export default function DataGroups() {
 		return <EmptyDataGroups onGroupAdd={onGroupAdd} />;
 	}
 
+	const onDragEnd = (result: DropResult) => {
+		const { source, destination } = result;
+		if (destination) {
+			move(source.index, destination.index);
+		}
+	};
+
 	return (
-		<DndContext>
-			<DataGroupDroppable>
-				<div style={{ gap: 24 }} className="column">
-					<div style={{ flex: 1 }} className="column">
-						{
-							fields.map((field, i) => (
-								<DataGroup onRemove={remove} key={field.id} index={i} />
-							))
-						}
-					</div>
-					<div style={{ padding: 16 }}>
-						<Button icon={<IconAdd24 />}>{i18n.t("Add group")}</Button>
-					</div>
-				</div>
-			</DataGroupDroppable>
-		</DndContext>
+		<DragDropContext onDragEnd={onDragEnd}>
+			<Droppable droppableId={"group-area"}>
+				{
+					(provided) => {
+
+						return <div {...provided.droppableProps} ref={provided.innerRef} style={{ gap: 24 }} className="column">
+							<div style={{ flex: 1 }} className="column">
+								{
+									fields.map((field, i) => (
+										<DataGroup onRemove={remove} key={field.id} index={i} />
+									))
+								}
+							</div>
+							<div style={{ padding: 16 }}>
+								<Button onClick={onGroupAdd} icon={<IconAdd24 />}>{i18n.t("Add group")}</Button>
+							</div>
+							{provided.placeholder}
+						</div>;
+					}
+				}
+			</Droppable>
+		</DragDropContext>
 	);
 }
diff --git a/packages/app/src/modules/ScorecardManagement/components/DataConfiguration/components/EmptyDataGroups.tsx b/packages/app/src/modules/ScorecardManagement/components/DataConfiguration/components/EmptyDataGroups.tsx
index 01db18f24..f392611e8 100644
--- a/packages/app/src/modules/ScorecardManagement/components/DataConfiguration/components/EmptyDataGroups.tsx
+++ b/packages/app/src/modules/ScorecardManagement/components/DataConfiguration/components/EmptyDataGroups.tsx
@@ -4,9 +4,9 @@ import { IconAdd24 } from "@dhis2/ui-icons";
 import PropTypes from "prop-types";
 import React from "react";
 
-export default function EmptyDataGroups({ onGroupAdd }: any) {
+export default function EmptyDataGroups({ onGroupAdd }: { onGroupAdd: () => void }) {
 	return (
-		<div style={{ margin: "auto" }}>
+		<div className="row center align-items-center" style={{ width: "100%", height: "100%" }}>
 			<Button
 				onClick={onGroupAdd}
 				icon={<IconAdd24 />}
@@ -20,5 +20,5 @@ export default function EmptyDataGroups({ onGroupAdd }: any) {
 }
 
 EmptyDataGroups.propTypes = {
-	onGroupAdd: PropTypes.func.isRequired,
+	onGroupAdd: PropTypes.func.isRequired
 };
diff --git a/packages/app/src/modules/ScorecardManagement/components/DataConfiguration/hooks/useDataGroupLayout.ts b/packages/app/src/modules/ScorecardManagement/components/DataConfiguration/hooks/useDataGroupLayout.ts
index 162559c6e..afe6297c3 100644
--- a/packages/app/src/modules/ScorecardManagement/components/DataConfiguration/hooks/useDataGroupLayout.ts
+++ b/packages/app/src/modules/ScorecardManagement/components/DataConfiguration/hooks/useDataGroupLayout.ts
@@ -12,7 +12,7 @@ export default function useDataGroupLayout({
 										   }: { index: number }) {
 	const { value: expanded, toggle: toggleExpansion } = useBoolean(false);
 	// @ts-ignore
-	const { fields, remove, insert } = useFieldArray<ScorecardConfig, `dataSelection.dataGroups.${number}.dataHolders`>({
+	const { fields, remove, insert, replace, swap, move } = useFieldArray<ScorecardConfig, `dataSelection.dataGroups.${number}.dataHolders`>({
 		name: `dataSelection.dataGroups.${index}.dataHolders`
 	});
 	const { getValues, setValue } = useFormContext<ScorecardConfig>();
@@ -25,7 +25,14 @@ export default function useDataGroupLayout({
 	const onDragEnd = useCallback((result: DropResult) => {
 		const { source, destination } = result ?? {};
 
-	}, []);
+		console.log({
+			result
+		});
+		if (source && destination) {
+			move(source.index, destination.index);
+		}
+
+	}, [insert, replace]);
 
 	const onLink = (index1: number, index2: number) => {
 		//We need to set the first data source of the second index to the second data source of the first and remove the second data holder
diff --git a/packages/app/src/modules/ScorecardManagement/components/DataConfiguration/index.tsx b/packages/app/src/modules/ScorecardManagement/components/DataConfiguration/index.tsx
index f76e3bde0..f72bde853 100644
--- a/packages/app/src/modules/ScorecardManagement/components/DataConfiguration/index.tsx
+++ b/packages/app/src/modules/ScorecardManagement/components/DataConfiguration/index.tsx
@@ -7,7 +7,7 @@ import { InstructionArea } from "./components/DataGroups/components/DataGroup/co
 export default function DataConfigurationScorecardForm() {
 
 	return (
-		<div className="row">
+		<div className="row h-100">
 			<div className="col-md-4 col-sm-6 p-16 groups-configuration-area">
 				<div
 					className=" container-bordered column"