Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/disconnect third party data #355

Merged
merged 7 commits into from
Mar 19, 2024
Merged

Feature/disconnect third party data #355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b62c813
feat(ui): connected disconnect api to disconnect action
cephaschapa Mar 4, 2024
0830e31
chore: code cleanup
cephaschapa Mar 4, 2024
9c3d3d3
merge
cephaschapa Mar 19, 2024
bcb1a0f
fix(api): removed inventoryvalue route, used value route instead reso…
cephaschapa Mar 19, 2024
4618ff9
added subcategory id param to api method
cephaschapa Mar 19, 2024
da2f86b
removed logs
cephaschapa Mar 19, 2024
cfa2eee
fix: adds translation to de, en, es
cephaschapa Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
225 changes: 158 additions & 67 deletions app/src/app/[lng]/data/[step]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ import type {
} from "./types";

import { v4 as uuidv4 } from "uuid";
import { InventoryValueAttributes } from "@/models/InventoryValue";
import { DataSource } from "@/models/DataSource";

function getMailURI(locode?: string, sector?: string, year?: number): string {
const emails =
Expand Down Expand Up @@ -384,6 +386,7 @@ export default function AddDataSteps({
});
} finally {
setConnectingDataSourceId(null);
onSearchDataSourcesClicked();
}
};

Expand Down Expand Up @@ -490,6 +493,75 @@ export default function AddDataSteps({
);
}

const [buttonText, setButtonText] = useState<string>(t("data-connected"));
const [hoverStates, setHoverStates] = useState<{ [key: string]: boolean }>(
{},
);

const [disconnectThirdPartyData, { isLoading: isDisconnectLoading }] =
api.useDisconnectThirdPartyDataMutation();

const onDisconnectThirdPartyData = async (
source: DataSourceWithRelations,
) => {
if (isSourceConnected(source)) {
source.inventoryValues!.forEach(
async (inventoryValue: InventoryValueAttributes) => {
await disconnectThirdPartyData({
inventoryId: inventoryValue.inventoryId,
subCategoryId: inventoryValue.subCategoryId,
}).then((res: any) => {
// Todo show alert
onSearchDataSourcesClicked();
});
},
);
} else {
console.log("Something went wrong");
}
};

const onButtonHover = (source: DataSourceWithRelations) => {
setHoverStates((prev) => ({ ...prev, [source.datasourceId]: true }));
setButtonText(t("disconnect-data"));
};

const onMouseLeave = (source: DataSourceWithRelations) => {
setHoverStates((prev) => ({ ...prev, [source.datasourceId]: false }));
setButtonText(t("data-connected"));
};

const DEFAULT_CONNECTED_BUTTON_PROPS = {
variant: "solidPrimary",
text: t("data-connected"),
};

const DEFAULT_DISCONNECTED_BUTTON_PROPS = {
variant: "outline",
text: t("connect-data"),
};

const getButtonProps = (
source: DataSourceWithRelations,
isHovered: boolean,
) => {
if (isSourceConnected(source)) {
return {
variant: isHovered ? "danger" : DEFAULT_CONNECTED_BUTTON_PROPS.variant,
text: isHovered
? t("disconnect-data")
: DEFAULT_CONNECTED_BUTTON_PROPS.text,
icon: <Icon as={MdCheckCircle} />,
};
} else {
return {
variant: DEFAULT_DISCONNECTED_BUTTON_PROPS.variant,
text: DEFAULT_DISCONNECTED_BUTTON_PROPS.text,
// Add more properties as needed
};
}
};

return (
<div className="pt-16 pb-16 w-[1090px] max-w-full mx-auto px-4">
<Button
Expand Down Expand Up @@ -621,82 +693,101 @@ export default function AddDataSteps({
<SimpleGrid columns={3} spacing={4}>
{dataSources
.slice(0, isDataSectionExpanded ? dataSources.length : 6)
.map(({ source, data }) => (
<Card
key={source.datasourceId}
variant="outline"
borderColor={
(isSourceConnected(source) && "interactive.tertiary") ||
undefined
}
borderWidth={2}
className="shadow-none hover:drop-shadow-xl transition-shadow"
>
{/* TODO add icon to DataSource */}
<Icon as={MdHomeWork} boxSize={9} mb={6} />
<Heading size="sm" noOfLines={2} minHeight={10}>
{source.name}
</Heading>
<Flex direction="row" my={4} wrap="wrap" gap={2}>
<Tag>
<TagLeftIcon
as={DataCheckIcon}
boxSize={5}
color="content.tertiary"
/>
<TagLabel fontSize={11}>
{t("data-quality")}:{" "}
{t("quality-" + source.dataQuality)}
</TagLabel>
</Tag>
{source.subCategory?.scope && (
.map(({ source, data }) => {
const isHovered = hoverStates[source.datasourceId];
const { variant, text, icon } = getButtonProps(
source,
isHovered,
);

return (
<Card
key={source.datasourceId}
variant="outline"
borderColor={
isSourceConnected(source) &&
source.inventoryValues?.length
? "interactive.tertiary"
: ""
}
borderWidth={2}
className="shadow-none hover:drop-shadow-xl transition-shadow"
>
{/* TODO add icon to DataSource */}
<Icon as={MdHomeWork} boxSize={9} mb={6} />
<Heading size="sm" noOfLines={2} minHeight={10}>
{source.name}
</Heading>
<Flex direction="row" my={4} wrap="wrap" gap={2}>
<Tag>
<TagLeftIcon
as={FiTarget}
boxSize={4}
as={DataCheckIcon}
boxSize={5}
color="content.tertiary"
/>
<TagLabel fontSize={11}>
{t("scope")}: {source.subCategory.scope.scopeName}
{t("data-quality")}:{" "}
{t("quality-" + source.dataQuality)}
</TagLabel>
</Tag>
)}
</Flex>
<Text color="content.tertiary" noOfLines={5} minHeight={120}>
{source.description}
</Text>
<Link
className="underline"
mt={4}
mb={6}
onClick={() => onSourceClick(source, data)}
>
{t("see-more-details")}
</Link>
{isSourceConnected(source) ? (
<Button
variant="solidPrimary"
px={6}
py={4}
leftIcon={<Icon as={MdCheckCircle} />}
{source.subCategory?.scope && (
<Tag>
<TagLeftIcon
as={FiTarget}
boxSize={4}
color="content.tertiary"
/>
<TagLabel fontSize={11}>
{t("scope")}: {source.subCategory.scope.scopeName}
</TagLabel>
</Tag>
)}
</Flex>
<Text
color="content.tertiary"
noOfLines={5}
minHeight={120}
>
{t("data-connected")}
</Button>
) : (
<Button
variant="outline"
bgColor="background.neutral"
onClick={() => onConnectClick(source)}
isLoading={
isConnectDataSourceLoading &&
source.datasourceId === connectingDataSourceId
}
{source.description}
</Text>
<Link
className="underline"
mt={4}
mb={6}
onClick={() => onSourceClick(source, data)}
>
{t("connect-data")}
</Button>
)}
</Card>
))}
{t("see-more-details")}
</Link>
{isSourceConnected(source) &&
source.inventoryValues?.length ? (
<Button
variant={variant}
px={6}
py={4}
onClick={() => onDisconnectThirdPartyData(source)}
isLoading={isDisconnectLoading}
onMouseEnter={() => onButtonHover(source)}
onMouseLeave={() => onMouseLeave(source)}
leftIcon={<Icon as={MdCheckCircle} />}
>
{text}
</Button>
) : (
<Button
variant="outline"
bgColor="background.neutral"
onClick={() => onConnectClick(source)}
isLoading={
isConnectDataSourceLoading &&
source.datasourceId === connectingDataSourceId
}
>
{t("connect-data")}
</Button>
)}
</Card>
);
})}
</SimpleGrid>
)}
{dataSources && dataSources.length > 6 && (
Expand Down
3 changes: 2 additions & 1 deletion app/src/i18n/locales/de/data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,5 +117,6 @@
"review-data-label": "Daten überprüfen und hinzufügen",
"files-uploaded": "Dateien hochgeladen",
"add-custom": "Benutzerdefiniert",
"save-missing-scope-info": "Speichern oder fehlende Informationen ausfüllen, bevor Sie fortfahren."
"save-missing-scope-info": "Speichern oder fehlende Informationen ausfüllen, bevor Sie fortfahren.",
"disconnect-data": "Datenquelle trennen"
}
3 changes: 2 additions & 1 deletion app/src/i18n/locales/en/data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,5 +168,6 @@
"city": "City",
"inside-dataset": "What's inside this dataset",
"transform-data-heading": "How do we transform this data?",
"transform-data-description": "Lorem ipsum dolor sit amet, qui minim labore adipisicing minim sint cillum sint consectetur cupidatat."
"transform-data-description": "Lorem ipsum dolor sit amet, qui minim labore adipisicing minim sint cillum sint consectetur cupidatat.",
"disconnect-data": "Disconnect Data"
}
3 changes: 2 additions & 1 deletion app/src/i18n/locales/es/data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,5 +113,6 @@
"review-data-label": "Revisar y añadir datos",
"files-uploaded": "Archivos subidos",
"add-custom": "Agregar personalizado",
"save-missing-scope-info": "Guarde o complete la información faltante antes de continuar."
"save-missing-scope-info": "Guarde o complete la información faltante antes de continuar.",
"disconnect-data": "Desconectar fuente de datos"
}
10 changes: 10 additions & 0 deletions app/src/services/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,15 @@ export const api = createApi({
transformResponse: (response: { data: EmissionsFactorResponse }) =>
response.data,
}),
disconnectThirdPartyData: builder.mutation({
query: ({ inventoryId, subCategoryId }) => ({
method: "DELETE",
url: `inventory/${inventoryId}/value/${subCategoryId}`,
}),
invalidatesTags: ["InventoryValue", "InventoryProgress"],
transformResponse: (response: { data: EmissionsFactorResponse }) =>
response.data,
}),
// User invitation to city
inviteUser: builder.mutation<
UserInviteResponse,
Expand Down Expand Up @@ -426,6 +435,7 @@ export const {
useAddUserFileMutation,
useGetUserFilesQuery,
useDeleteUserFileMutation,
useDisconnectThirdPartyDataMutation,
useInviteUserMutation,
useCheckUserMutation,
} = api;
Expand Down
Loading