refactor: update dm and as clients anf fix UnitDetail breaking deprecation

OliverDudgeon · OliverDudgeon · commit 9d95cd1ffb4c · 2024-08-02T08:41:21.000+01:00
diff --git a/package.json b/package.json
@@ -52,8 +52,8 @@
     "@rjsf/utils": "5.18.3",
     "@rjsf/validator-ajv8": "5.18.3",
     "@sentry/nextjs": "7.114.0",
-    "@squonk/account-server-client": "2.2.0",
-    "@squonk/data-manager-client": "2.0.11",
+    "@squonk/account-server-client": "2.4.0-rc.10",
+    "@squonk/data-manager-client": "2.1.3-rc.5",
     "@squonk/mui-theme": "3.0.2",
     "@squonk/sdf-parser": "1.3.0",
     "@tanstack/match-sorter-utils": "8.15.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/components/CreateDatasetStorageSubscription.tsx b/src/components/CreateDatasetStorageSubscription.tsx
@@ -1,4 +1,4 @@
-import { type AsError, type UnitDetail } from "@squonk/account-server-client";
+import { type AsError, type UnitAllDetail } from "@squonk/account-server-client";
 import {
   getGetProductsQueryKey,
   useCreateUnitProduct,
@@ -16,7 +16,7 @@ import { useGetStorageCost } from "../hooks/useGetStorageCost";
 import { formatCoins } from "../utils/app/coins";
 
 export interface CreateDatasetStorageSubscriptionProps {
-  unit: UnitDetail;
+  unit: UnitAllDetail;
 }
 
 const initialValues = {
diff --git a/src/components/finance/UnitCharges.tsx b/src/components/finance/UnitCharges.tsx
@@ -1,6 +1,6 @@
 import { useState } from "react";
 
-import { type UnitDetail, type UnitProductChargeSummary } from "@squonk/account-server-client";
+import { type UnitAllDetail, type UnitProductChargeSummary } from "@squonk/account-server-client";
 import { useGetUnit, useGetUnitCharges } from "@squonk/account-server-client/unit";
 
 import {
@@ -21,7 +21,7 @@ import { ChargesLinkIconButton } from "../products/ChargesLinkIconButton";
 import { SelectBillingCycle } from "./SelectBillingCycle";
 
 export interface UnitChargesProps {
-  unitId: UnitDetail["id"];
+  unitId: UnitAllDetail["id"];
 }
 
 const productTypes: Record<UnitProductChargeSummary["product_type"], string> = {
diff --git a/src/components/products/DeleteProductButton.tsx b/src/components/products/DeleteProductButton.tsx
@@ -1,4 +1,4 @@
-import { type ProductDetail, type UnitDetail } from "@squonk/account-server-client";
+import { type ProductDetail, type UnitAllDetail } from "@squonk/account-server-client";
 import {
   getGetProductQueryKey,
   getGetProductsForUnitQueryKey,
@@ -18,7 +18,7 @@ export interface DeleteProductButtonProps {
   product: ProductDetail;
   disabled?: boolean;
   tooltip: string;
-  unitId?: UnitDetail["id"];
+  unitId?: UnitAllDetail["id"];
 }
 
 export const DeleteProductButton = ({
diff --git a/src/components/projects/CreateProject/CreateProjectButton.tsx b/src/components/projects/CreateProject/CreateProjectButton.tsx
@@ -1,13 +1,14 @@
 import { useState } from "react";
 
-import { type ProductDetail, type UnitDetail } from "@squonk/account-server-client";
+import { type ProductDetail, type UnitAllDetail } from "@squonk/account-server-client";
 
 import { Button } from "@mui/material";
 
 import { CreateProjectForm } from "./CreateProjectForm";
 
 export interface CreateProjectButtonProps {
-  unit: UnitDetail;
+  unitId: UnitAllDetail["id"];
+  unitDefaultProductPrivacy: UnitAllDetail["default_product_privacy"];
   product?: ProductDetail;
   buttonText?: string;
 }
@@ -16,7 +17,8 @@ export interface CreateProjectButtonProps {
  * Button which allows user to create a new project.
  */
 export const CreateProjectButton = ({
-  unit,
+  unitId,
+  unitDefaultProductPrivacy,
   product,
   buttonText = "Create",
 }: CreateProjectButtonProps) => {
@@ -29,7 +31,7 @@ export const CreateProjectButton = ({
       </Button>
 
       <CreateProjectForm
-        defaultPrivacy={unit.default_product_privacy}
+        defaultPrivacy={unitDefaultProductPrivacy}
         modal={{
           id: "create-project",
           title: "Create Project",
@@ -38,7 +40,7 @@ export const CreateProjectButton = ({
           onClose: () => setOpen(false),
         }}
         product={product}
-        unitId={unit.id}
+        unitId={unitId}
       />
     </>
   );
diff --git a/src/components/projects/CreateProject/CreateProjectForm.tsx b/src/components/projects/CreateProject/CreateProjectForm.tsx
@@ -3,8 +3,8 @@ import {
   type ProductDetail,
   ProductDetailFlavour,
   ProductDetailType,
-  type UnitDetail,
-  UnitDetailDefaultProductPrivacy,
+  type UnitAllDetail,
+  UnitAllDetailDefaultProductPrivacy,
   type UnitProductPostBodyBodyFlavour,
 } from "@squonk/account-server-client";
 import {
@@ -46,8 +46,8 @@ export interface CreateProjectFormProps {
   modal?: Resolve<
     Pick<FormikModalWrapperProps, "id" | "onClose" | "open" | "submitText" | "title">
   >;
-  unitId: UnitDetail["id"] | (() => Promise<UnitDetail["id"]>);
-  defaultPrivacy: UnitDetailDefaultProductPrivacy;
+  unitId: UnitAllDetail["id"] | (() => Promise<UnitAllDetail["id"]>);
+  defaultPrivacy: UnitAllDetailDefaultProductPrivacy;
   product?: ProductDetail;
   autoFocus?: boolean;
 }
@@ -60,7 +60,7 @@ export interface Values {
 
 type ProjectFormikProps = FormikConfig<Values>;
 
-const isPrivateDefaultValues: Record<UnitDetailDefaultProductPrivacy, boolean> = {
+const isPrivateDefaultValues: Record<UnitAllDetailDefaultProductPrivacy, boolean> = {
   ALWAYS_PRIVATE: true,
   ALWAYS_PUBLIC: false,
   DEFAULT_PUBLIC: false,
@@ -74,10 +74,10 @@ export const CreateProjectForm = ({
   product,
   autoFocus = true,
 }: CreateProjectFormProps) => {
-  const evaluationAllowed = defaultPrivacy !== UnitDetailDefaultProductPrivacy.ALWAYS_PRIVATE;
+  const evaluationAllowed = defaultPrivacy !== UnitAllDetailDefaultProductPrivacy.ALWAYS_PRIVATE;
   const defaultFlavour = (
-    defaultPrivacy === UnitDetailDefaultProductPrivacy.ALWAYS_PRIVATE ||
-    defaultPrivacy === UnitDetailDefaultProductPrivacy.DEFAULT_PRIVATE
+    defaultPrivacy === UnitAllDetailDefaultProductPrivacy.ALWAYS_PRIVATE ||
+    defaultPrivacy === UnitAllDetailDefaultProductPrivacy.DEFAULT_PRIVATE
       ? ProductDetailFlavour.BRONZE
       : ProductDetailFlavour.EVALUATION
   ) satisfies ProductDetailFlavour;
diff --git a/src/components/projects/CreateProject/CreateProjectListItem.tsx b/src/components/projects/CreateProject/CreateProjectListItem.tsx
@@ -1,14 +1,14 @@
 import { useState } from "react";
 
-import { type UnitDetail } from "@squonk/account-server-client";
+import { type UnitAllDetail } from "@squonk/account-server-client";
 
 import { NoteAdd } from "@mui/icons-material";
 import { ListItemButton, ListItemIcon, ListItemText } from "@mui/material";
 
 import { CreateProjectForm } from "./CreateProjectForm";
 
 export interface CreateProjectListItemProps {
-  unit: UnitDetail;
+  unit: UnitAllDetail;
 }
 
 /**
diff --git a/src/components/projects/CreateProject/PrivacyToggle.tsx b/src/components/projects/CreateProject/PrivacyToggle.tsx
@@ -1,6 +1,6 @@
 import {
   ProductDetailFlavour,
-  UnitDetailDefaultProductPrivacy,
+  UnitAllDetailDefaultProductPrivacy,
 } from "@squonk/account-server-client";
 
 import { FormControlLabel } from "@mui/material";
@@ -15,16 +15,16 @@ export interface PrivacySwitchProps {
   /**
    * Default privacy of the product given by the unit
    */
-  defaultPrivacy: UnitDetailDefaultProductPrivacy;
+  defaultPrivacy: UnitAllDetailDefaultProductPrivacy;
 }
 
 export const PrivacyToggle = ({ flavour, defaultPrivacy }: PrivacySwitchProps) => {
   // Disable the switch if the product is an evaluation product or if the default privacy is set to
   // always private or always public
   const isDisabled =
     flavour === ProductDetailFlavour.EVALUATION ||
-    defaultPrivacy === UnitDetailDefaultProductPrivacy.ALWAYS_PRIVATE ||
-    defaultPrivacy === UnitDetailDefaultProductPrivacy.ALWAYS_PUBLIC;
+    defaultPrivacy === UnitAllDetailDefaultProductPrivacy.ALWAYS_PRIVATE ||
+    defaultPrivacy === UnitAllDetailDefaultProductPrivacy.ALWAYS_PUBLIC;
 
   return (
     <FormControlLabel
diff --git a/src/components/units/EditDefaultPrivacy.tsx b/src/components/units/EditDefaultPrivacy.tsx
@@ -1,4 +1,7 @@
-import { type UnitDetail, UnitDetailDefaultProductPrivacy } from "@squonk/account-server-client";
+import {
+  type UnitAllDetail,
+  UnitAllDetailDefaultProductPrivacy,
+} from "@squonk/account-server-client";
 import {
   getGetUnitQueryKey,
   getGetUnitsQueryKey,
@@ -14,7 +17,7 @@ import { useSelectedUnit } from "../../state/unitSelection";
 import { capitalise, shoutSnakeToLowerCase } from "../../utils/app/language";
 
 export interface EditDefaultPrivacyProps {
-  unit: UnitDetail;
+  unit: UnitAllDetail;
 }
 
 export const EditDefaultPrivacy = ({ unit }: EditDefaultPrivacyProps) => {
@@ -25,7 +28,7 @@ export const EditDefaultPrivacy = ({ unit }: EditDefaultPrivacyProps) => {
   const { enqueueError, enqueueSnackbar } = useEnqueueError();
   const queryClient = useQueryClient();
 
-  const handleSelection = async (newValue: UnitDetailDefaultProductPrivacy) => {
+  const handleSelection = async (newValue: UnitAllDetailDefaultProductPrivacy) => {
     try {
       await patchUnit({
         unitId: unit.id,
@@ -37,7 +40,7 @@ export const EditDefaultPrivacy = ({ unit }: EditDefaultPrivacyProps) => {
       await queryClient.invalidateQueries({ queryKey: getGetUnitQueryKey(unit.id) });
       enqueueSnackbar("Unit default privacy updated", { variant: "success" });
 
-      const newUnit = { ...unit, default_product_privacy: newValue } satisfies UnitDetail;
+      const newUnit = { ...unit, default_product_privacy: newValue } satisfies UnitAllDetail;
       setUnit(newUnit);
     } catch (error) {
       enqueueError(error);
@@ -64,10 +67,10 @@ export const EditDefaultPrivacy = ({ unit }: EditDefaultPrivacyProps) => {
       label="Default project privacy"
       value={unit.default_product_privacy}
       onChange={(event) =>
-        void handleSelection(event.target.value as UnitDetailDefaultProductPrivacy)
+        void handleSelection(event.target.value as UnitAllDetailDefaultProductPrivacy)
       }
     >
-      {Object.values(UnitDetailDefaultProductPrivacy).map((rule) => (
+      {Object.values(UnitAllDetailDefaultProductPrivacy).map((rule) => (
         <MenuItem key={rule} value={rule}>
           {capitalise(shoutSnakeToLowerCase(rule))}
         </MenuItem>
diff --git a/src/components/units/EditUnitName.tsx b/src/components/units/EditUnitName.tsx
@@ -1,6 +1,6 @@
 import { useState } from "react";
 
-import { type UnitDetail } from "@squonk/account-server-client";
+import { type UnitAllDetail } from "@squonk/account-server-client";
 import {
   getGetOrganisationUnitsQueryKey,
   getGetUnitQueryKey,
@@ -19,7 +19,7 @@ import { useSelectedUnit } from "../../state/unitSelection";
 import { getErrorMessage } from "../../utils/next/orvalError";
 
 export interface EditUnitProps {
-  unit: UnitDetail;
+  unit: UnitAllDetail;
 }
 
 export const EditUnitName = ({ unit }: EditUnitProps) => {
diff --git a/src/components/units/UnitMembers.tsx b/src/components/units/UnitMembers.tsx
@@ -1,4 +1,4 @@
-import { type UnitDetail } from "@squonk/account-server-client";
+import { type UnitAllDetail } from "@squonk/account-server-client";
 import {
   getGetOrganisationUnitUsersQueryKey,
   useAddOrganisationUnitUser,
@@ -19,7 +19,7 @@ export interface UnitMembersProps {
   /**
    * Unit to be edited.
    */
-  unit: UnitDetail;
+  unit: UnitAllDetail;
 }
 
 /**
diff --git a/src/components/userContext/ItemIcons.tsx b/src/components/userContext/ItemIcons.tsx
@@ -1,4 +1,4 @@
-import { type OrganisationDetail, type UnitDetail } from "@squonk/account-server-client";
+import { type OrganisationDetail, type UnitAllDetail } from "@squonk/account-server-client";
 
 import {
   Lock as LockIcon,
@@ -7,7 +7,7 @@ import {
 } from "@mui/icons-material";
 import { Tooltip } from "@mui/material";
 
-export const ItemIcons = ({ item }: { item?: OrganisationDetail | UnitDetail }) => (
+export const ItemIcons = ({ item }: { item?: OrganisationDetail | UnitAllDetail }) => (
   <>
     {item?.private !== undefined &&
       (item.private ? (
diff --git a/src/components/userContext/SelectOrganisation.tsx b/src/components/userContext/SelectOrganisation.tsx
@@ -55,7 +55,7 @@ export const SelectOrganisation = (autoCompleteProps: SelectOrganisationProps) =
               startAdornment: (
                 <>
                   <ItemIcons item={organisation} />
-                  {!!organisation && (
+                  {!!organisation && !!organisation.caller_is_member && (
                     <Adornment
                       href={`/organisation/${organisation.id}/inventory`}
                       title="User Usage"
diff --git a/src/components/userContext/SelectUnit.tsx b/src/components/userContext/SelectUnit.tsx
@@ -54,7 +54,7 @@ export const SelectUnit = ({
               startAdornment: (
                 <>
                   <ItemIcons item={unit} />
-                  {!!unit && (
+                  {!!unit && !!(unit.caller_is_member || organisation?.caller_is_member) && (
                     <>
                       <Adornment href={`/unit/${unit.id}/charges`} title="Charges">
                         <ReceiptIcon />
diff --git a/src/features/Finance/UnitChargesView.tsx b/src/features/Finance/UnitChargesView.tsx
@@ -1,12 +1,12 @@
-import { type UnitDetail } from "@squonk/account-server-client";
+import { type UnitAllDetail } from "@squonk/account-server-client";
 import { useGetUnit } from "@squonk/account-server-client/unit";
 
 import Head from "next/head";
 
 import { UnitCharges } from "../../components/finance/UnitCharges";
 
 export interface UnitChargesViewProps {
-  unitId: UnitDetail["id"];
+  unitId: UnitAllDetail["id"];
 }
 
 export const UnitChargesView = ({ unitId }: UnitChargesViewProps) => {
diff --git a/src/features/ProductTables/ProjectProductTable/ProjectProductTable.tsx b/src/features/ProductTables/ProjectProductTable/ProjectProductTable.tsx
@@ -40,7 +40,13 @@ export const ProjectProductTable = ({ products }: ProjectProductTableProps) => {
               </NextLink>
             );
           }
-          return <CreateProjectButton product={product.product} unit={row.original.unit} />;
+          return (
+            <CreateProjectButton
+              product={product.product}
+              unitDefaultProductPrivacy={row.original.unit.default_product_privacy}
+              unitId={row.original.unit.id}
+            />
+          );
         },
       }),
       columnHelper.display({
diff --git a/src/features/userSettings/UserSettingsContent/ContextSection/contextActions/DeleteUnitListItem.tsx b/src/features/userSettings/UserSettingsContent/ContextSection/contextActions/DeleteUnitListItem.tsx
@@ -1,4 +1,4 @@
-import { type UnitDetail } from "@squonk/account-server-client";
+import { type UnitAllDetail } from "@squonk/account-server-client";
 import {
   getGetOrganisationUnitsQueryKey,
   getGetUnitsQueryKey,
@@ -17,7 +17,7 @@ import { useKeycloakUser } from "../../../../../hooks/useKeycloakUser";
 import { useSelectedOrganisation } from "../../../../../state/organisationSelection";
 
 export interface DeleteUnitListItem {
-  unit: UnitDetail;
+  unit: UnitAllDetail;
   /**
    * Called when deletion _completes successfully_
    */
diff --git a/src/features/userSettings/UserSettingsContent/ContextSection/contextActions/EditUnitListItem.tsx b/src/features/userSettings/UserSettingsContent/ContextSection/contextActions/EditUnitListItem.tsx
diff --git a/src/hooks/useGetVisibleUnits.ts b/src/hooks/useGetVisibleUnits.ts
diff --git a/src/state/unitSelection.ts b/src/state/unitSelection.ts
