= async (newData) => {
+ const year = Number(newData.year);
+
+ setData({
+ name: newData.city,
+ locode: data.locode!,
+ year,
+ });
+
+ if (!newData.city || !ocCityData?.actor_id || year < 0 || !data.locode) {
+ // TODO show user toast? These should normally be caught by validation logic
+ console.error("Missing data, can't go to next step!");
+ return;
+ }
+
+ goToNext();
+ };
+
return (
<>
@@ -539,6 +828,10 @@ export default function OnboardingSetup({
errors={errors}
setValue={setValue}
register={register}
+ watch={watch}
+ ocCityData={ocCityData}
+ setOcCityData={setOcCityData}
+ setData={setData}
t={t}
/>
)}
@@ -548,7 +841,7 @@ export default function OnboardingSetup({
t={t}
locode={data.locode}
area={ocCityData?.area!}
- population={populationData.population}
+ population={cityPopulation}
/>
)}
diff --git a/app/src/app/api/v0/auth/register/route.ts b/app/src/app/api/v0/auth/register/route.ts
index 81017aec9..627cbb03d 100644
--- a/app/src/app/api/v0/auth/register/route.ts
+++ b/app/src/app/api/v0/auth/register/route.ts
@@ -17,6 +17,16 @@ export const POST = apiHandler(async (req: Request) => {
role: Roles.User,
});
+ const inventory = await db.models.Inventory.findOne({
+ where: {
+ inventoryId: body.inventory,
+ },
+ });
+
+ const cityId = inventory?.cityId;
+
+ user.addCity(cityId);
+
return NextResponse.json({
user: {
userId: user.userId,
diff --git a/app/src/app/api/v0/user/file/[file]/download-file/route.ts b/app/src/app/api/v0/city/[city]/file/[file]/download-file/route.ts
similarity index 94%
rename from app/src/app/api/v0/user/file/[file]/download-file/route.ts
rename to app/src/app/api/v0/city/[city]/file/[file]/download-file/route.ts
index 62da7fd98..5187cfc50 100644
--- a/app/src/app/api/v0/user/file/[file]/download-file/route.ts
+++ b/app/src/app/api/v0/city/[city]/file/[file]/download-file/route.ts
@@ -5,7 +5,6 @@ import createHttpError from "http-errors";
import { NextResponse } from "next/server";
export const GET = apiHandler(async (_req, context) => {
- const userId = context.session?.user.id;
if (!context.session) {
throw new createHttpError.Unauthorized("Unauthorized");
}
@@ -13,7 +12,7 @@ export const GET = apiHandler(async (_req, context) => {
const userFile = await db.models.UserFile.findOne({
where: {
id: context.params.file,
- userId,
+ cityId: context.params.city,
},
});
diff --git a/app/src/app/api/v0/city/[city]/file/[file]/route.ts b/app/src/app/api/v0/city/[city]/file/[file]/route.ts
new file mode 100644
index 000000000..6b7a2341a
--- /dev/null
+++ b/app/src/app/api/v0/city/[city]/file/[file]/route.ts
@@ -0,0 +1,46 @@
+import { db } from "@/models";
+import { apiHandler } from "@/util/api";
+import createHttpError from "http-errors";
+import { NextResponse } from "next/server";
+
+export const GET = apiHandler(async (_req: Request, context) => {
+ const userId = context.session?.user.id;
+ if (!context.session) {
+ throw new createHttpError.Unauthorized("Unauthorized");
+ }
+
+ const userFile = await db.models.UserFile.findOne({
+ where: {
+ id: context.params.file,
+ cityId: context.params.city,
+ },
+ });
+
+ if (!userFile) {
+ throw new createHttpError.NotFound("User file not found");
+ }
+
+ return NextResponse.json({ data: userFile });
+});
+
+export const DELETE = apiHandler(async (_req: Request, context) => {
+ const userId = context.session?.user.id;
+ if (!context.session) {
+ throw new createHttpError.Unauthorized("Unauthorized");
+ }
+
+ const userFile = await db.models.UserFile.findOne({
+ where: {
+ id: context.params.file,
+ cityId: context.params.city,
+ },
+ });
+
+ if (!userFile) {
+ throw new createHttpError.NotFound("User file not found");
+ }
+
+ await userFile.destroy();
+
+ return NextResponse.json({ data: userFile, deleted: true });
+});
diff --git a/app/src/app/api/v0/user/file/route.ts b/app/src/app/api/v0/city/[city]/file/route.ts
similarity index 90%
rename from app/src/app/api/v0/user/file/route.ts
rename to app/src/app/api/v0/city/[city]/file/route.ts
index dde8fe7d1..536c09814 100644
--- a/app/src/app/api/v0/user/file/route.ts
+++ b/app/src/app/api/v0/city/[city]/file/route.ts
@@ -12,14 +12,13 @@ const MAX_FILE_SIZE = 5000000;
const ACCEPTED_FILE_FORMATS = []; // file formats types to be parsed and refined later
export const GET = apiHandler(async (_req: Request, context) => {
- const userId = context.session?.user.id;
if (!context.session) {
throw new createHttpError.Unauthorized("Unauthorized");
}
const userFiles = await db.models.UserFile.findAll({
where: {
- userId: userId,
+ cityId: context.params.city,
},
});
@@ -38,7 +37,8 @@ export const GET = apiHandler(async (_req: Request, context) => {
});
return {
id: userFile.id,
- userId: userFile.id,
+ userId: userFile.userId,
+ cityId: userFile.cityId,
fileReference: userFile.fileReference,
url: userFile.url,
sector: userFile.sector,
@@ -75,15 +75,20 @@ export const POST = apiHandler(async (req: NextRequest, context) => {
const buffer = Buffer.from(bytes);
const fileType = filename.split(".").pop();
+ const subsectors = formData.get("subsectors") as string;
+ const scopes = formData.get("scopes") as string;
const fileData = {
userId: userId,
+ cityId: context.params.city,
fileReference: formData.get("fileReference"),
url: formData.get("url"),
data: buffer,
fileType: fileType,
fileName: filename,
sector: formData.get("sector"),
+ subsectors: subsectors.split(","),
+ scopes: scopes.split(","),
status: formData.get("status"),
gpcRefNo: formData.get("gpcRefNo"),
};
@@ -103,6 +108,7 @@ export const POST = apiHandler(async (req: NextRequest, context) => {
data: {
id: userFile.id,
userId: userFile.userId,
+ cityId: userFile.cityId,
fileReference: userFile.fileReference,
url: userFile.url,
sector: userFile.sector,
diff --git a/app/src/app/api/v0/city/[city]/population/route.ts b/app/src/app/api/v0/city/[city]/population/route.ts
index 9c1a1fa2b..77b1c2cce 100644
--- a/app/src/app/api/v0/city/[city]/population/route.ts
+++ b/app/src/app/api/v0/city/[city]/population/route.ts
@@ -2,25 +2,71 @@ import UserService from "@/backend/UserService";
import { db } from "@/models";
import { apiHandler } from "@/util/api";
import { createPopulationRequest } from "@/util/validation";
+import createHttpError from "http-errors";
import { NextResponse } from "next/server";
export const POST = apiHandler(async (req, { session, params }) => {
const body = createPopulationRequest.parse(await req.json());
const city = await UserService.findUserCity(params.city, session);
- let population = await db.models.Population.findOne({
+ if (!city) {
+ throw new createHttpError.NotFound("City not found");
+ }
+
+ const { cityId } = city;
+
+ let cityPopulation = await db.models.Population.findOne({
where: {
- cityId: city.cityId,
- year: body.year,
+ cityId,
+ year: body.cityPopulationYear,
},
});
+ if (cityPopulation) {
+ cityPopulation.population = body.cityPopulation;
+ await cityPopulation.save();
+ } else {
+ cityPopulation = await db.models.Population.create({
+ cityId,
+ population: body.cityPopulation,
+ year: body.cityPopulationYear,
+ });
+ }
- if (!population) {
- population = await db.models.Population.create({
- ...body,
- cityId: city.cityId,
+ let regionPopulation = await db.models.Population.findOne({
+ where: {
+ cityId,
+ year: body.regionPopulationYear,
+ },
+ });
+ if (regionPopulation) {
+ regionPopulation.regionPopulation = body.regionPopulation;
+ await regionPopulation.save();
+ } else {
+ regionPopulation = await db.models.Population.create({
+ cityId,
+ regionPopulation: body.regionPopulation,
+ year: body.regionPopulationYear,
});
}
- return NextResponse.json({ data: population });
+ let countryPopulation = await db.models.Population.findOne({
+ where: {
+ cityId,
+ year: body.countryPopulationYear,
+ },
+ });
+ if (countryPopulation) {
+ countryPopulation.countryPopulation = body.countryPopulation;
+ await countryPopulation.save();
+ } else {
+ countryPopulation = await db.models.Population.create({
+ cityId,
+ countryPopulation: body.countryPopulation,
+ year: body.countryPopulationYear,
+ });
+ }
+
+ return NextResponse.json({
+ data: { cityPopulation, regionPopulation, countryPopulation },
+ });
});
diff --git a/app/src/app/api/v0/city/invite/[invite]/route.ts b/app/src/app/api/v0/city/invite/[invite]/route.ts
index c5ffad5b1..c7654cda1 100644
--- a/app/src/app/api/v0/city/invite/[invite]/route.ts
+++ b/app/src/app/api/v0/city/invite/[invite]/route.ts
@@ -18,6 +18,7 @@ export const GET = apiHandler(async (req, { params, session }) => {
const token = req.nextUrl.searchParams.get("token");
const email = req.nextUrl.searchParams.get("email");
+ const inventory = req.nextUrl.searchParams.get("inventoryId");
const isVerified = jwt.verify(token!, process.env.VERIFICATION_TOKEN_SECRET!);
@@ -35,9 +36,6 @@ export const GET = apiHandler(async (req, { params, session }) => {
},
});
const host = process.env.HOST ?? "http://localhost:3000";
- if (!user) {
- return NextResponse.redirect(host);
- }
const city = await db.models.City.findOne({
where: { cityId: invite.cityId },
@@ -45,5 +43,5 @@ export const GET = apiHandler(async (req, { params, session }) => {
await user?.addCity(city?.cityId);
- return NextResponse.redirect(host);
+ return NextResponse.redirect(`${host}/${inventory}`);
});
diff --git a/app/src/app/api/v0/city/invite/route.ts b/app/src/app/api/v0/city/invite/route.ts
index 80a5a8c75..f8c3fbd0f 100644
--- a/app/src/app/api/v0/city/invite/route.ts
+++ b/app/src/app/api/v0/city/invite/route.ts
@@ -49,7 +49,7 @@ export const POST = apiHandler(async (req, { params, session }) => {
subject: "City Catalyst - City Invitation",
html: render(
InviteUserTemplate({
- url: `${host}/api/v0/city/invite/${invite.id}?token=${invitationCode}&email=${body.email}`,
+ url: `${host}/api/v0/city/invite/${invite.id}?inventoryId=${body.inventoryId}&token=${invitationCode}&email=${body.email}`,
user: { email: body.email, name: body.name },
city,
invitingUser: {
diff --git a/app/src/app/api/v0/datasource/[inventoryId]/route.ts b/app/src/app/api/v0/datasource/[inventoryId]/route.ts
index 445032dbd..f5e5aeb1e 100644
--- a/app/src/app/api/v0/datasource/[inventoryId]/route.ts
+++ b/app/src/app/api/v0/datasource/[inventoryId]/route.ts
@@ -14,6 +14,15 @@ import { z } from "zod";
import { logger } from "@/services/logger";
import { Publisher } from "@/models/Publisher";
+const maxPopulationYearDifference = 5;
+const downscaledByCountryPopulation = "global_api_downscaled_by_population";
+const downscaledByRegionPopulation =
+ "global_api_downscaled_by_region_population";
+const populationScalingRetrievalMethods = [
+ downscaledByCountryPopulation,
+ downscaledByRegionPopulation,
+];
+
export const GET = apiHandler(async (_req: NextRequest, { params }) => {
const inventory = await db.models.Inventory.findOne({
where: { inventoryId: params.inventoryId },
@@ -71,26 +80,40 @@ export const GET = apiHandler(async (_req: NextRequest, { params }) => {
const applicableSources = DataSourceService.filterSources(inventory, sources);
// determine scaling factor for downscaled sources
- let populationScaleFactor = 1;
+ let countryPopulationScaleFactor = 1;
+ let regionPopulationScaleFactor = 1;
let populationIssue: string | null = null;
if (
- sources.some(
- (source) =>
- source.retrievalMethod === "global_api_downscaled_by_population",
+ sources.some((source) =>
+ populationScalingRetrievalMethods.includes(source.retrievalMethod ?? ""),
)
) {
const population = await db.models.Population.findOne({
where: {
cityId: inventory.cityId,
- year: inventory.year,
+ year: {
+ [Op.between]: [
+ inventory.year! - maxPopulationYearDifference,
+ inventory.year! + maxPopulationYearDifference,
+ ],
+ },
},
+ order: [["year", "DESC"]], // favor more recent population entries
});
- if (!population?.population || !population?.countryPopulation) {
- populationIssue =
- "City is missing population/ country population for the inventory year";
+ // TODO allow country downscaling to work if there is no region population?
+ if (
+ !population ||
+ !population.population ||
+ !population.countryPopulation ||
+ !population.regionPopulation
+ ) {
+ // City is missing population/ region population/ country population for a year close to the inventory year
+ populationIssue = "missing-population"; // translation key
} else {
- populationScaleFactor =
+ countryPopulationScaleFactor =
population.population / population.countryPopulation;
+ regionPopulationScaleFactor =
+ population.population / population.regionPopulation;
}
}
@@ -107,8 +130,11 @@ export const GET = apiHandler(async (_req: NextRequest, { params }) => {
}
let scaleFactor = 1.0;
let issue: string | null = null;
- if (source.retrievalMethod === "global_api_downscaled_by_population") {
- scaleFactor = populationScaleFactor;
+ if (source.retrievalMethod === downscaledByCountryPopulation) {
+ scaleFactor = countryPopulationScaleFactor;
+ issue = populationIssue;
+ } else if (source.retrievalMethod === downscaledByRegionPopulation) {
+ scaleFactor = regionPopulationScaleFactor;
issue = populationIssue;
}
return { source, data: { ...data, scaleFactor, issue } };
diff --git a/app/src/app/api/v0/inventory/[inventory]/route.ts b/app/src/app/api/v0/inventory/[inventory]/route.ts
index 94e58bbe3..64fa1ef29 100644
--- a/app/src/app/api/v0/inventory/[inventory]/route.ts
+++ b/app/src/app/api/v0/inventory/[inventory]/route.ts
@@ -192,7 +192,9 @@ async function inventoryXLS(inventory: Inventory): Promise {
// TODO get these as separate values from emissions factor seeder
const activityUnit = inventoryValue.activityUnits?.split("/")[0];
- const emissionsFactorUnit = inventoryValue.activityUnits?.split(" ")[0].split("/")[1];
+ const emissionsFactorUnit = inventoryValue.activityUnits
+ ?.split(" ")[0]
+ .split("/")[1];
const activityType = inventoryValue.activityUnits?.split(" ")[1];
row.getCell("G").value = activityType;
@@ -241,7 +243,7 @@ async function inventoryXLS(inventory: Inventory): Promise {
row.getCell("AD").value = inventoryValue.dataSource.dataQuality
?.slice(0, 1)
.toUpperCase();
- row.getCell("AP").value = inventoryValue.dataSource.name; // TODO add source to Data sources sheet (ID 20)
+ row.getCell("AP").value = inventoryValue.dataSource.datasetName; // TODO add source to Data sources sheet (ID 20)
row.commit();
}
diff --git a/app/src/app/api/v0/user/file/[file]/route.ts b/app/src/app/api/v0/user/file/[file]/route.ts
deleted file mode 100644
index c6d55c154..000000000
--- a/app/src/app/api/v0/user/file/[file]/route.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { db } from "@/models";
-import { apiHandler } from "@/util/api";
-import createHttpError from "http-errors";
-import { NextResponse } from "next/server";
-
-export const GET = apiHandler(
- async (
- _req: Request,
- context,
- ) => {
- const userId = context.session?.user.id;
- if (!context.session) {
- throw new createHttpError.Unauthorized("Unauthorized");
- }
-
- const userFile = await db.models.UserFile.findOne({
- where: {
- id: context.params.file,
- userId,
- },
- });
-
- if (!userFile) {
- throw new createHttpError.NotFound("User file not found");
- }
-
- return NextResponse.json({ data: userFile });
- },
-);
-
-export const DELETE = apiHandler(
- async (
- _req: Request,
- context,
- ) => {
- const userId = context.session?.user.id;
- if (!context.session) {
- throw new createHttpError.Unauthorized("Unauthorized");
- }
-
- const userFile = await db.models.UserFile.findOne({
- where: {
- id: context.params.file,
- userId,
- },
- });
-
- if (!userFile) {
- throw new createHttpError.NotFound("User file not found");
- }
-
- await userFile.destroy();
-
- return NextResponse.json({ data: userFile, deleted: true });
- },
-);
diff --git a/app/src/backend/DataSourceService.ts b/app/src/backend/DataSourceService.ts
index 0838877d0..741a4be19 100644
--- a/app/src/backend/DataSourceService.ts
+++ b/app/src/backend/DataSourceService.ts
@@ -25,7 +25,9 @@ export default class DataSourceService {
return true;
}
- const isCountry = city.country && locations?.includes(city.country);
+ // TODO store locode for country and region as separate columns in City
+ const countryLocode = city.locode?.split(" ")[0];
+ const isCountry = countryLocode && locations?.includes(countryLocode);
const isRegion = city.region && locations?.includes(city.region);
const isCity = city.locode && locations?.includes(city.locode);
@@ -108,7 +110,9 @@ export default class DataSourceService {
});
if (!subCategory) {
- throw new createHttpError.InternalServerError("Sub-category for source not found");
+ throw new createHttpError.InternalServerError(
+ "Sub-category for source not found",
+ );
}
// TODO what to do with existing InventoryValues and GasValues?
diff --git a/app/src/components/Cards/SectorCard.tsx b/app/src/components/Cards/SectorCard.tsx
index 6a3cb2237..aa610a5fa 100644
--- a/app/src/components/Cards/SectorCard.tsx
+++ b/app/src/components/Cards/SectorCard.tsx
@@ -28,10 +28,12 @@ export function SectorCard({
sectorProgress,
stepNumber,
t,
+ inventory,
}: {
sectorProgress: SectorProgress;
stepNumber: number;
t: TFunction;
+ inventory: string;
}) {
const [isAccordionOpen, setAccordionOpen] = useState(false);
const toggleAccordion = () => setAccordionOpen(!isAccordionOpen);
@@ -105,7 +107,11 @@ export function SectorCard({
-
+
+
+ {tags?.map((item: any) => (
+
+ {item}
+
+ ))}
+
);
};
diff --git a/app/src/components/InventorySelect.tsx b/app/src/components/InventorySelect.tsx
index db7e51b1e..1c639f5af 100644
--- a/app/src/components/InventorySelect.tsx
+++ b/app/src/components/InventorySelect.tsx
@@ -34,6 +34,7 @@ export const InventorySelect = ({
cityId: inventory.cityId!,
defaultInventoryId: inventory.inventoryId,
}).unwrap();
+ router.push(`/${inventory.inventoryId}`);
};
return (
diff --git a/app/src/components/Modals/add-file-data-modal.tsx b/app/src/components/Modals/add-file-data-modal.tsx
new file mode 100644
index 000000000..aef806557
--- /dev/null
+++ b/app/src/components/Modals/add-file-data-modal.tsx
@@ -0,0 +1,275 @@
+import React, { FC, useEffect, useState } from "react";
+import {
+ Box,
+ Button,
+ Checkbox,
+ Divider,
+ FormControl,
+ FormLabel,
+ Modal,
+ ModalBody,
+ ModalCloseButton,
+ ModalContent,
+ ModalFooter,
+ ModalHeader,
+ ModalOverlay,
+ Text,
+ useToast,
+} from "@chakra-ui/react";
+import DropdownSelectInput from "../dropdown-select-input";
+import { InfoIcon, InfoOutlineIcon } from "@chakra-ui/icons";
+import {
+ DataStep,
+ SubSectorWithRelations,
+} from "@/app/[lng]/[inventory]/data/[step]/types";
+import { SubmitHandler, useForm } from "react-hook-form";
+import { useDispatch } from "react-redux";
+import { TFunction } from "i18next";
+import { addFile } from "@/features/city/inventoryDataSlice";
+import { v4 as uuidv4 } from "uuid";
+import { UserInfoResponse } from "@/util/types";
+import { MdOutlineInsertDriveFile } from "react-icons/md";
+
+interface AddFileDataModalProps {
+ isOpen: boolean;
+ onClose: () => void;
+ subsectors: SubSectorWithRelations[] | null;
+ t: TFunction;
+ uploadedFile: File;
+ currentStep: DataStep;
+ userInfo: UserInfoResponse | undefined;
+}
+
+export interface FileData {
+ subsectors: string;
+ scopes: string;
+}
+
+const scopes = [
+ {
+ value: 1,
+ },
+ {
+ value: 2,
+ },
+ {
+ value: 3,
+ },
+];
+
+const AddFileDataModal: FC = ({
+ isOpen,
+ onClose,
+ subsectors,
+ t,
+ uploadedFile,
+ currentStep,
+ userInfo,
+}) => {
+ const [selectedScopes, setSelectedScopes] = useState([]);
+
+ const handleSelectedScopes = (value: number, checked: boolean) => {
+ if (checked) {
+ setSelectedScopes([...selectedScopes, value]);
+ } else {
+ setSelectedScopes(selectedScopes.filter((scope) => scope !== value));
+ }
+ };
+ const dispatch = useDispatch();
+ const {
+ register,
+ handleSubmit,
+ watch,
+ setValue,
+ getValues,
+ formState: { errors },
+ } = useForm();
+
+ function fileToBase64(file: File) {
+ return new Promise((resolve, reject) => {
+ const reader = new FileReader();
+ reader.readAsDataURL(file);
+
+ reader.onload = () => resolve(reader.result);
+ reader.onerror = (error) => reject(error);
+ });
+ }
+
+ const onSubmit: SubmitHandler = async (data) => {
+ const base64FileString = await fileToBase64(uploadedFile);
+ const filename = uploadedFile.name;
+ dispatch(
+ addFile({
+ sectorName: currentStep.title!,
+ fileData: {
+ fileId: uuidv4(),
+ fileName: filename,
+ subsectors: data.subsectors,
+ scopes: data.scopes,
+ userId: userInfo?.userId,
+ sector: currentStep.title,
+ data: base64FileString,
+ // TODO this should not be passed in but rather set on the server (only necessary for AWS S3 or external hosting)
+ url: "http://localhost",
+ size: uploadedFile.size,
+ fileType: filename.split(".").pop(),
+ },
+ }),
+ );
+ onClose();
+ };
+
+ return (
+
+
+
+
+ {t("file-context")}
+
+
+
+
+
+
+
+
+ {t("file-data-subtitle")}
+
+
+
+ {t("file-data-description")}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+};
+
+export default AddFileDataModal;
diff --git a/app/src/components/Modals/add-user-modal.tsx b/app/src/components/Modals/add-user-modal.tsx
index a498ef15e..a0c3d4681 100644
--- a/app/src/components/Modals/add-user-modal.tsx
+++ b/app/src/components/Modals/add-user-modal.tsx
@@ -1,6 +1,6 @@
"use client";
-import { ProfileInputs } from "@/app/[lng]/settings/page";
+import { ProfileInputs } from "@/app/[lng]/[inventory]/settings/page";
import type { UserAttributes } from "@/models/User";
import { api } from "@/services/api";
import {
@@ -23,6 +23,7 @@ import FormInput from "../form-input";
import FormSelectInput from "../form-select-input";
import FormSelectOrganization from "../form-select-organization";
import { TFunction } from "i18next";
+import { useParams } from "next/navigation";
interface AddUserModalProps {
isOpen: boolean;
@@ -47,12 +48,11 @@ const AddUserModal: FC = ({
const [checkUser] = api.useCheckUserMutation();
const [inviteUser, { isLoading: isInviteLoading }] =
api.useInviteUserMutation();
- const [inputValue, setInputValue] = useState("");
- const [userId, setUserId] = useState("");
+
const toast = useToast();
- const onInputChange = (e: any) => {
- setInputValue(e.target.value);
- };
+
+ const { inventory: cityParam } = useParams();
+ const inventoryId = cityParam as string;
const onSubmit: SubmitHandler<{ name: string; email: string }> = async (
data,
) => {
@@ -101,6 +101,7 @@ const AddUserModal: FC = ({
email: data.email!,
userId: res?.data?.userId,
invitingUserId: userInfo! && userInfo?.userId!,
+ inventoryId,
}).then((res: any) => {
onClose();
if (res?.error?.status == 400) {
diff --git a/app/src/components/Modals/delete-city-modal.tsx b/app/src/components/Modals/delete-city-modal.tsx
index c015d1f85..b9c57b1c7 100644
--- a/app/src/components/Modals/delete-city-modal.tsx
+++ b/app/src/components/Modals/delete-city-modal.tsx
@@ -1,6 +1,6 @@
"use client";
-import { UserDetails } from "@/app/[lng]/settings/page";
+import { UserDetails } from "@/app/[lng]/[inventory]/settings/page";
import {
Modal,
Button,
diff --git a/app/src/components/Modals/delete-file-modal.tsx b/app/src/components/Modals/delete-file-modal.tsx
index 25e9ecaf2..a5a9e6f61 100644
--- a/app/src/components/Modals/delete-file-modal.tsx
+++ b/app/src/components/Modals/delete-file-modal.tsx
@@ -37,7 +37,7 @@ const DeleteFileModal: FC = ({
const [deleteUserFile] = api.useDeleteUserFileMutation();
const onDeleteFile = async () => {
try {
- await deleteUserFile({ fileId: fileData?.id });
+ await deleteUserFile({ fileId: fileData?.id, cityId: fileData?.cityId });
} catch (error) {
console.error(error);
} finally {
diff --git a/app/src/components/Modals/delete-inventory-modal.tsx b/app/src/components/Modals/delete-inventory-modal.tsx
index fd00af31d..996b2a61d 100644
--- a/app/src/components/Modals/delete-inventory-modal.tsx
+++ b/app/src/components/Modals/delete-inventory-modal.tsx
@@ -1,6 +1,6 @@
"use client";
-import { UserDetails } from "@/app/[lng]/settings/page";
+import { UserDetails } from "@/app/[lng]/[inventory]/settings/page";
import {
Modal,
Button,
diff --git a/app/src/components/Tabs/my-files-tab.tsx b/app/src/components/Tabs/my-files-tab.tsx
index ce594bb04..9ff17c8dc 100644
--- a/app/src/components/Tabs/my-files-tab.tsx
+++ b/app/src/components/Tabs/my-files-tab.tsx
@@ -35,16 +35,17 @@ import {
} from "@chakra-ui/react";
import React, { FC, useEffect, useMemo, useState } from "react";
-import { ChevronRightIcon, SearchIcon } from "@chakra-ui/icons";
+import { CheckIcon, ChevronRightIcon, SearchIcon } from "@chakra-ui/icons";
import {
MdMoreVert,
+ MdOutlineCheck,
MdOutlineFileDownload,
MdOutlineFolder,
} from "react-icons/md";
import { FiTrash2 } from "react-icons/fi";
import { FaFileCsv } from "react-icons/fa";
-import { CityData } from "@/app/[lng]/settings/page";
+import { CityData } from "@/app/[lng]/[inventory]/settings/page";
import { Session } from "next-auth";
import DeleteFileModal from "@/components/Modals/delete-file-modal";
@@ -54,6 +55,7 @@ import { UserAttributes } from "@/models/User";
import { UserFileAttributes } from "@/models/UserFile";
import Link from "next/link";
+import { PiCheckFatLight } from "react-icons/pi";
interface MyFilesTabProps {
session: Session | null;
@@ -416,8 +418,8 @@ const MyFilesTab: FC = ({
>
= ({
}}
>
@@ -495,6 +497,33 @@ const MyFilesTab: FC = ({
{t("delete-file")}
+
+
+
+ {t("mark-as-completed")}
+
+
diff --git a/app/src/components/Tabs/my-profile-tab.tsx b/app/src/components/Tabs/my-profile-tab.tsx
index 00cea56b8..5c6203476 100644
--- a/app/src/components/Tabs/my-profile-tab.tsx
+++ b/app/src/components/Tabs/my-profile-tab.tsx
@@ -1,6 +1,6 @@
"use client";
-import { ProfileInputs } from "@/app/[lng]/settings/page";
+import { ProfileInputs } from "@/app/[lng]/[inventory]/settings/page";
import AddUserModal from "@/components/Modals/add-user-modal";
import DeleteUserModal from "@/components/Modals/delete-user-modal";
import UpdateUserModal from "@/components/Modals/update-user-modal";
@@ -190,9 +190,8 @@ const MyProfileTab: FC = ({
}, [role, searchTerm, cityUsers]);
useEffect(() => {
- const selectedUsersByRole = filteredUsers.filter(
- (users) =>
- users?.role?.toLocaleLowerCase().includes(role.toLocaleLowerCase()),
+ const selectedUsersByRole = filteredUsers.filter((users) =>
+ users?.role?.toLocaleLowerCase().includes(role.toLocaleLowerCase()),
);
if (role !== "all") {
setFilteredUsersByRole(selectedUsersByRole);
diff --git a/app/src/components/dropdown-select-input.tsx b/app/src/components/dropdown-select-input.tsx
new file mode 100644
index 000000000..3af7b564a
--- /dev/null
+++ b/app/src/components/dropdown-select-input.tsx
@@ -0,0 +1,180 @@
+import React, { useEffect, useState } from "react";
+import {
+ Box,
+ Tag,
+ TagLabel,
+ TagCloseButton,
+ Checkbox,
+ List,
+ ListItem,
+ Text,
+ Input,
+ FormLabel,
+} from "@chakra-ui/react";
+import { MdArrowDropDown, MdArrowDropUp } from "react-icons/md";
+import { SubSectorWithRelations } from "@/app/[lng]/[inventory]/data/[step]/types";
+import {
+ UseFormRegister,
+ UseFormSetValue,
+ UseFormWatch,
+ useForm,
+} from "react-hook-form";
+import { FileData } from "./Modals/add-file-data-modal";
+import { TFunction } from "i18next";
+
+interface DropdownSelectProps {
+ subsectors: SubSectorWithRelations[] | null;
+ setValue: UseFormSetValue;
+ t: TFunction;
+ watch: UseFormWatch;
+ register: UseFormRegister;
+}
+
+const DropdownSelectInput: React.FC = ({
+ subsectors,
+ setValue,
+ t,
+ watch,
+ register,
+}) => {
+ const [selectedItems, setSelectedItems] = useState([]);
+
+ const handleCheckboxChange = (
+ event: React.ChangeEvent,
+ value: string,
+ ) => {
+ if (event.target.checked) {
+ setSelectedItems([...selectedItems, value]);
+ } else {
+ setSelectedItems(selectedItems.filter((item) => item !== value));
+ }
+ };
+
+ useEffect(() => {
+ const subsectorValues = selectedItems.slice().join(",");
+ setValue("subsectors", subsectorValues);
+ }, [setValue, selectedItems]);
+
+ const handleRemoveItem = (item: string) => {
+ setSelectedItems(
+ selectedItems.filter((selectedItem) => selectedItem !== item),
+ );
+ };
+
+ const [showDropdown, setShowDropdown] = useState(false);
+ const handleShowdropDown = () => {
+ setShowDropdown((prev) => !prev);
+ };
+
+ return (
+
+ 2 ? "12px" : "0px"}
+ >
+
+ {selectedItems.length ? (
+ ""
+ ) : (
+
+ {t("select-placeholder")}
+
+ )}
+ {selectedItems.map((item) => (
+
+ {item}
+ handleRemoveItem(item)}
+ color="content.alternative"
+ />
+
+ ))}
+
+
+
+ {!showDropdown ? (
+
+ ) : (
+
+ )}
+
+
+ {showDropdown && (
+
+
+ {subsectors?.map((subsector) => (
+
+
+ handleCheckboxChange(e, subsector.subsectorName!)
+ }
+ />
+
+ {subsector.subsectorName}
+
+
+ ))}
+
+
+ )}
+
+ );
+};
+
+export default DropdownSelectInput;
diff --git a/app/src/components/file-input.tsx b/app/src/components/file-input.tsx
index c2ebf06ac..d59d6f596 100644
--- a/app/src/components/file-input.tsx
+++ b/app/src/components/file-input.tsx
@@ -1,14 +1,25 @@
import { Box, FormLabel, Heading, Input, Text, VStack } from "@chakra-ui/react";
import { TFunction } from "i18next";
-import React, { useState, DragEvent, ChangeEvent } from "react";
+import React, {
+ useState,
+ DragEvent,
+ ChangeEvent,
+ Dispatch,
+ SetStateAction,
+} from "react";
import { FiUpload } from "react-icons/fi";
interface FileUploadProps {
onFileSelect: (file: File) => void; // Define a type for the onFileSelect prop
t: TFunction;
+ setUploadedFile: Dispatch>;
}
-const FileInput: React.FC = ({ onFileSelect, t }) => {
+const FileInput: React.FC = ({
+ onFileSelect,
+ t,
+ setUploadedFile,
+}) => {
const [dragging, setDragging] = useState(false);
const handleDragOver = (e: DragEvent) => {
@@ -27,12 +38,14 @@ const FileInput: React.FC = ({ onFileSelect, t }) => {
setDragging(false);
if (e.dataTransfer.files && e.dataTransfer.files[0]) {
onFileSelect(e.dataTransfer.files[0]);
+ setUploadedFile(e.dataTransfer.files[0]);
}
};
const handleChange = (e: ChangeEvent) => {
if (e.target.files && e.target.files[0]) {
onFileSelect(e.target.files[0]);
+ setUploadedFile(e.target.files[0]);
}
};
diff --git a/app/src/components/icons.tsx b/app/src/components/icons.tsx
index 65e47235b..e38cdf8c8 100644
--- a/app/src/components/icons.tsx
+++ b/app/src/components/icons.tsx
@@ -223,7 +223,7 @@ export const ScaleIcon = (props: any) => {
xmlns="http://www.w3.org/2000/svg"
{...props}
>
-
+
{
Cookies.set("i18next", language);
const cookieLanguage = Cookies.get("i18next");
@@ -47,16 +54,18 @@ export function NavigationBar({
// change language in URL without reloading page
const newPath = location.pathname.replace(/^\/[A-Za-z]+/, `/${language}`);
- history.replaceState("", "", newPath);
+ history.replaceState(null, "", newPath);
};
const { data: session, status } = useSession();
-
+ const { data: userInfo, isLoading: isUserInfoLoading } =
+ api.useGetUserInfoQuery();
+ const currentInventoryId = userInfo?.defaultInventoryId;
return (
-
+
-
+
{t("title")}
@@ -176,7 +185,7 @@ export function NavigationBar({
height="128px"
zIndex={2000}
>
-
+