chore: fix merge conflicts

src/renderer/api/cadt/v1/staging/staging.api.ts

@@ -27,10 +27,22 @@ const stagingApi = cadtApi.injectEndpoints({
       },
       providesTags: [stagedUnitsTag],
     }),
+
+    deleteStagedItem: builder.mutation<any, { uuid: string }>({
+      query: ({ uuid }) => {
+        return {
+          url: `/v1/staging`,
+          method: 'DELETE',
+          headers: { 'Content-Type': 'application/json' },
+          body: { uuid },
+        };
+      },
+      invalidatesTags: [stagedUnitsTag, stagedProjectsTag],
+    }),
   }),
 });
 
 const invalidateStagingApiTag = stagingApi.util.invalidateTags;
 export { invalidateStagingApiTag };
 
-export const { useGetStagedProjectsQuery, useGetStagedUnitsQuery } = stagingApi;
+export const { useGetStagedProjectsQuery, useGetStagedUnitsQuery, useDeleteStagedItemMutation } = stagingApi;

src/renderer/api/index.ts

@@ -3,4 +3,5 @@ export * from './cadt/v1/units';
 export * from './cadt/v1/projects';
 export * from './cadt/v1/audit';
 export * from './cadt/v1/issuances';
-export * from './cadt/v1/governance';
+export * from './cadt/v1/governance';
+export * from './cadt/v1/staging';

src/renderer/components/blocks/forms/CoBenifetsForm.tsx

@@ -55,6 +55,7 @@ const CoBenefitsForm = forwardRef<CoBenefitsFormRef, CoBenefitsFormProps>(
                     name={`${name}[${index}].cobenefit`}
                     label="Co-Benefit"
                     type="picklist"
+                    freeform={true}
                     options={picklistOptions?.coBenefits}
                     readonly={readonly}
                     initialValue={coBenefit.cobenefit}

src/renderer/components/blocks/forms/IssuancesForm.tsx

@@ -93,6 +93,7 @@ const IssuancesForm = forwardRef<IssuancesFormRef, IssuancesFormProps>(
                       name={`${name}[${index}].verificationBody`}
                       label="Verification Body"
                       type="picklist"
+                      freeform={true}
                       options={picklistOptions?.verificationBody}
                       readonly={readonly}
                       initialValue={issuance.verificationBody || ''}

src/renderer/components/blocks/forms/ProjectForm.tsx

@@ -147,13 +147,16 @@ const ProjectForm: React.FC<ProjectFormProps> = forwardRef<ProjectFormRef, Proje
                   <Field
                     name="sector"
                     label="Sector"
-                    type="text"
+                    type="picklist"
+                    freeform={true}
+                    options={picklistOptions?.projectSector}
                     readonly={readonly}
                     initialValue={data?.sector || ''}
                   />
                   <Field
                     name="projectType"
                     label="Project Type"
+                    freeform={true}
                     type="picklist"
                     options={picklistOptions?.projectType}
                     readonly={readonly}
@@ -196,14 +199,18 @@ const ProjectForm: React.FC<ProjectFormProps> = forwardRef<ProjectFormRef, Proje
                   <Field
                     name="currentRegistry"
                     label="Current Registry"
-                    type="text"
+                    type="picklist"
+                    freeform={true}
+                    options={picklistOptions?.registries}
                     readonly={readonly}
                     initialValue={data?.currentRegistry || ''}
                   />
                   <Field
                     name="registryOfOrigin"
                     label="Registry Of Origin"
-                    type="text"
+                    type="picklist"
+                    freeform={true}
+                    options={picklistOptions?.registries}
                     readonly={readonly}
                     initialValue={data?.registryOfOrigin || ''}
                   />
@@ -230,6 +237,7 @@ const ProjectForm: React.FC<ProjectFormProps> = forwardRef<ProjectFormRef, Proje
                     name="methodology"
                     label="Methodology"
                     type="picklist"
+                    freeform={true}
                     options={picklistOptions?.methodology}
                     readonly={readonly}
                     initialValue={data?.methodology || ''}

src/renderer/components/blocks/modals/ConfirmDeleteModal.tsx → src/renderer/components/blocks/modals/ConfirmDeleteCommittedItemModal.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { Button, Modal } from '@/components';
 import { FormattedMessage } from 'react-intl';
 import { useDeleteProjectMutation, useDeleteUnitMutation } from '@/api';
-import { invalidateStagingApiTag } from '@/api/cadt/v1/staging/staging.api';
+import { invalidateStagingApiTag } from '@/api/cadt/v1/staging/';
 import { stagedProjectsTag, stagedUnitsTag } from '@/api/cadt/v1';
 import { useDispatch } from 'react-redux';
 
@@ -12,7 +12,7 @@ interface ConfirmDeleteModalProps {
   onClose: () => void;
 }
 
-const ConfirmDeleteModal: React.FC<ConfirmDeleteModalProps> = ({
+const ConfirmDeleteCommittedItemModal: React.FC<ConfirmDeleteModalProps> = ({
   type,
   warehouseId,
   onClose,
@@ -41,9 +41,14 @@ const ConfirmDeleteModal: React.FC<ConfirmDeleteModalProps> = ({
         <FormattedMessage id="confirm-delete" />
       </Modal.Header>
       <Modal.Body>
-        <p>
-          <FormattedMessage id="this-action-cannot-be-undone" />
-        </p>
+        <div className="space-y-2">
+          <p>
+            <FormattedMessage id="deleting-this-item-will-add-a-corresponding-delete-entry-to-the-staging-table" />.
+          </p>
+          <p>
+            <FormattedMessage id="no-items-will-be-deleted-until-staged-changes-are-committed" />.
+          </p>
+        </div>
       </Modal.Body>
       <Modal.Footer>
         <Button color="gray" onClick={handleClickClose} disabled={projectDeletionLoading || unitDeletionLoading}>
@@ -61,4 +66,4 @@ const ConfirmDeleteModal: React.FC<ConfirmDeleteModalProps> = ({
   );
 };
 
-export { ConfirmDeleteModal };
+export { ConfirmDeleteCommittedItemModal };

src/renderer/components/blocks/modals/ConfirmDeleteStagedItemModal.tsx

@@ -0,0 +1,47 @@
+import React from 'react';
+import { Button, Modal } from '@/components';
+import { FormattedMessage } from 'react-intl';
+import { useDeleteStagedItemMutation } from '@/api/cadt/v1/staging';
+
+interface ConfirmDeleteModalProps {
+  uuid: string;
+  onClose: () => void;
+}
+
+const ConfirmDeleteStagedItemModal: React.FC<ConfirmDeleteModalProps> = ({
+  uuid,
+  onClose,
+}: ConfirmDeleteModalProps) => {
+  const [triggerDeleteStagedItem, { isLoading: stagedItemDeletionLoading }] = useDeleteStagedItemMutation();
+  const handleConfirm = async () => {
+    await triggerDeleteStagedItem({ uuid });
+    onClose();
+  };
+
+  const handleClickClose = async () => {
+    onClose();
+  };
+
+  return (
+    <Modal show={true} onClose={onClose}>
+      <Modal.Header>
+        <FormattedMessage id="confirm-delete" />
+      </Modal.Header>
+      <Modal.Body>
+        <p>
+          <FormattedMessage id="deleting-a-staged-item-is-a-permanent-action" />.
+        </p>
+      </Modal.Body>
+      <Modal.Footer>
+        <Button color="gray" onClick={handleClickClose} disabled={stagedItemDeletionLoading}>
+          <FormattedMessage id="cancel" />
+        </Button>
+        <Button onClick={handleConfirm} isProcessing={stagedItemDeletionLoading} disabled={stagedItemDeletionLoading}>
+          <FormattedMessage id="delete" />
+        </Button>
+      </Modal.Footer>
+    </Modal>
+  );
+};
+
+export { ConfirmDeleteStagedItemModal };

src/renderer/components/blocks/modals/StagingDiffModal.tsx

@@ -1,7 +1,7 @@
 import React, { useMemo } from 'react';
 import { DiffViewer, Modal } from '@/components';
 import { FormattedMessage } from 'react-intl';
-import { useGetStagedProjectsQuery } from '@/api/cadt/v1/staging/staging.api';
+import { useGetStagedProjectsQuery } from '@/api/cadt/v1/staging';
 
 interface ProjectModalProps {
   stagingUuid: string;

src/renderer/components/blocks/modals/index.ts

@@ -5,6 +5,7 @@ export * from './UnitModal';
 export * from './StagingDiffModal';
 export * from './UpsertProjectModal';
 export * from './UpsertUnitModal';
+export * from './ConfirmDeleteCommittedItemModal';
+export * from './ConfirmDeleteStagedItemModal';
 export * from './StagedProjectSuccessModal';
-export * from './ConfirmDeleteModal';
 export * from './StagedUnitSuccessModal';

src/renderer/components/blocks/tables/ProjectsListTable.tsx

@@ -1,7 +1,7 @@
 import React, { useMemo } from 'react';
 import { FormattedMessage } from 'react-intl';
 import { DebouncedFunc } from 'lodash';
-import { DataTable, PageCounter, Pagination, ProjectAndUnitActions, Tooltip } from '@/components';
+import { Column, DataTable, PageCounter, Pagination, ProjectAndUnitActions, Tooltip } from '@/components';
 import { Project } from '@/schemas/Project.schema';
 import { Badge } from 'flowbite-react';
 
@@ -31,16 +31,17 @@ const ProjectsListTable: React.FC<TableProps> = ({
   totalCount,
 }) => {
   const columns = useMemo(() => {
-    const editColumn: any = [
+    const editColumn: Column[] = [
       {
         title: '',
         key: 'actionColumn',
         ignoreChildEvents: true,
+        ignoreOrderChange: true,
         render: (row: Project) => <ProjectAndUnitActions type="project" warehouseId={row?.warehouseProjectId || ''} />,
       },
     ];
 
-    const staticColumns: any = [
+    const staticColumns: Column[] = [
       {
         title: <FormattedMessage id={'current-registry'} />,
         key: 'currentRegistry',

src/renderer/components/blocks/tables/StagingTable.tsx

@@ -2,18 +2,26 @@ import React, { useMemo } from 'react';
 import { FormattedMessage } from 'react-intl';
 import { Badge, DataTable } from '@/components';
 import dayjs from 'dayjs';
+import { StagedItemActions } from '@/components/blocks/widgets/StagedItemActions';
 
 interface TableProps {
   data: any[];
+  type: 'staged' | 'pending' | 'failed';
   isLoading: boolean;
   setOrder: (sort: string) => void;
   onRowClick: (row: any) => void;
   order: string;
 }
 
-const StagingTable: React.FC<TableProps> = ({ data, isLoading, onRowClick, setOrder, order }) => {
+const StagingTable: React.FC<TableProps> = ({ data, type, isLoading, onRowClick, setOrder, order }: TableProps) => {
   const columns = useMemo(
     () => [
+      {
+        title: '',
+        key: 'actionColumn',
+        ignoreChildEvents: true,
+        render: (row: any) => <StagedItemActions type={type} stagedItem={row} />,
+      },
       {
         title: <FormattedMessage id={'table'} />,
         key: 'table',

src/renderer/components/blocks/tables/UnitsListTable.tsx

@@ -1,7 +1,7 @@
 import React, { useMemo } from 'react';
 import { FormattedMessage } from 'react-intl';
 import { DebouncedFunc } from 'lodash';
-import { DataTable, PageCounter, Pagination, ProjectAndUnitActions } from '@/components';
+import { Column, DataTable, PageCounter, Pagination, ProjectAndUnitActions } from '@/components';
 import { Unit } from '@/schemas/Unit.schema';
 
 interface TableProps {
@@ -30,16 +30,17 @@ const UnitsListTable: React.FC<TableProps> = ({
   totalCount,
 }) => {
   const columns = useMemo(() => {
-    const editColumn: any = [
+    const editColumn: Column[] = [
       {
         title: '',
         key: 'actionColumn',
         ignoreChildEvents: true,
+        ignoreOrderChange: true,
         render: (row: Unit) => <ProjectAndUnitActions type="unit" warehouseId={row.warehouseUnitId} />,
       },
     ];
 
-    const staticColumns: any = [
+    const staticColumns: Column[] = [
       {
         title: <FormattedMessage id={'unit-owner'} />,
         key: 'unitOwner',

src/renderer/components/blocks/tabs/StagingTableTab.tsx

@@ -4,11 +4,12 @@ import React from 'react';
 import { useColumnOrderHandler, useQueryParamState, useWildCardUrlHash } from '@/hooks';
 
 interface PageTabProps {
+  type: 'staged' | 'pending' | 'failed';
   stagingData: any[];
   showLoading: boolean;
 }
 
-const StagingTableTab: React.FC<PageTabProps> = ({ stagingData, showLoading }: PageTabProps) => {
+const StagingTableTab: React.FC<PageTabProps> = ({ stagingData, showLoading, type }: PageTabProps) => {
   const [order, setOrder] = useQueryParamState('order', undefined);
   const handleSetOrder = useColumnOrderHandler(order, setOrder);
   const [stagingDiffFragment, stagingDiffModalActive, setStagingDiffModalActive] = useWildCardUrlHash('staging');
@@ -28,6 +29,7 @@ const StagingTableTab: React.FC<PageTabProps> = ({ stagingData, showLoading }: P
       ) : (
         <StagingTable
           data={stagingData}
+          type={type}
           isLoading={showLoading}
           setOrder={handleSetOrder}
           order={order}

src/renderer/components/blocks/widgets/ProjectAndUnitActions.tsx

@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import { HiDotsVertical } from 'react-icons/hi';
-import { Button, ConfirmDeleteModal, Tooltip, UpsertProjectModal, UpsertUnitModal } from '@/components';
+import { Button, ConfirmDeleteCommittedItemModal, Tooltip } from '@/components';
 import { useWildCardUrlHash } from '@/hooks';
 import { FormattedMessage } from 'react-intl';
 
@@ -13,8 +13,8 @@ const ProjectAndUnitActions: React.FC<ProjectAndUnitActionsProps> = ({
   type,
   warehouseId,
 }: ProjectAndUnitActionsProps) => {
-  const [, editProjectModalActive, setEditProjectModalActive] = useWildCardUrlHash('edit-project');
-  const [, editUnitModalActive, setEditUnitModalActive] = useWildCardUrlHash('edit-unit');
+  const [, , setEditProjectModalActive] = useWildCardUrlHash('edit-project');
+  const [, , setEditUnitModalActive] = useWildCardUrlHash('edit-unit');
   const [showDeleteModal, setShowDeleteModal] = useState<boolean>(false);
 
   const handleClickDelete = () => {
@@ -37,21 +37,23 @@ const ProjectAndUnitActions: React.FC<ProjectAndUnitActionsProps> = ({
         placement="right"
         content={
           <Button.Group>
-            <Button onClick={handleClickEdit}>
+            <Button onClick={handleClickEdit} outline>
               <FormattedMessage id="edit" />
             </Button>
-            <Button color="gray" onClick={handleClickDelete}>
+            <Button onClick={handleClickDelete} outline>
               <FormattedMessage id="delete" />
             </Button>
           </Button.Group>
         }
       >
         <HiDotsVertical size="25" />
       </Tooltip>
-      {editProjectModalActive && <UpsertProjectModal onClose={() => setEditProjectModalActive(false)} />}
-      {editUnitModalActive && <UpsertUnitModal onClose={() => setEditUnitModalActive(false)} />}
       {showDeleteModal && (
-        <ConfirmDeleteModal type={type} warehouseId={warehouseId} onClose={() => setShowDeleteModal(false)} />
+        <ConfirmDeleteCommittedItemModal
+          type={type}
+          warehouseId={warehouseId}
+          onClose={() => setShowDeleteModal(false)}
+        />
       )}
     </>
   );