fix: deprecate edit member (#362)

* fix: udpate hook * fix: mock server * fix: merge changes * fix: update deps * fix: server mock function paths * fix: use npm version of query-client
graasp · Oct 7, 2024 · 246e230 · 246e230
1 parent 8e85e76
commit 246e230
Show file tree

Hide file tree

Showing 6 changed files with 282 additions and 642 deletions.
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
@@ -7,7 +7,7 @@ import {
 } from '../fixtures/members';
 import {
   mockDeleteCurrentMember,
-  mockEditMember,
+  mockEditCurrentMember,
   mockEditPublicProfile,
   mockExportData,
   mockGetCurrentMember,
@@ -77,7 +77,7 @@ Cypress.Commands.add(
 
     mockSignOut();
 
-    mockEditMember(cachedCurrentMember, editMemberError);
+    mockEditCurrentMember(cachedCurrentMember, editMemberError);
     mockEditPublicProfile(cachedCurrentProfile, editPublicProfileError);
     mockGetCurrentMemberAvatar(currentMember, getAvatarUrlError);
 

diff --git a/cypress/support/server.ts b/cypress/support/server.ts
@@ -2,7 +2,6 @@ import { API_ROUTES } from '@graasp/query-client';
 import {
   CompleteMember,
   HttpMethod,
-  Member,
   PublicProfile,
   buildSignInPath,
 } from '@graasp/sdk';
@@ -17,10 +16,9 @@ import {
 import { ID_FORMAT, MemberForTest } from './utils';
 
 const {
-  buildGetMemberRoute,
   buildGetCurrentMemberRoute,
   SIGN_OUT_ROUTE,
-  buildPatchMemberRoute,
+  buildPatchCurrentMemberRoute,
   buildUploadAvatarRoute,
   buildPatchMemberPasswordRoute,
   buildGetOwnPublicProfileRoute,
@@ -89,7 +87,7 @@ export const mockGetCurrentMember = (
   cy.intercept(
     {
       method: HttpMethod.Get,
-      url: `${API_HOST}/${buildGetCurrentMemberRoute()}`,
+      pathname: `/${buildGetCurrentMemberRoute()}`,
     },
     ({ reply }) => {
       if (shouldThrowError) {
@@ -105,39 +103,14 @@ export const mockGetCurrentMember = (
   ).as('getCurrentMember');
 };
 
-export const mockGetMember = (members: Member[]): void => {
-  cy.intercept(
-    {
-      method: HttpMethod.Get,
-      url: new RegExp(`${API_HOST}/${buildGetMemberRoute(ID_FORMAT)}$`),
-    },
-    ({ url, reply }) => {
-      const memberId = url.slice(API_HOST.length).split('/')[2];
-      const member = members.find((m) => m.id === memberId);
-
-      // member does not exist in db
-      if (!member) {
-        return reply({
-          statusCode: StatusCodes.NOT_FOUND,
-        });
-      }
-
-      return reply({
-        body: member,
-        statusCode: StatusCodes.OK,
-      });
-    },
-  ).as('getMember');
-};
-
-export const mockEditMember = (
+export const mockEditCurrentMember = (
   currentMember: CompleteMember,
   shouldThrowError: boolean,
 ): void => {
   cy.intercept(
     {
       method: HttpMethod.Patch,
-      url: new RegExp(`${API_HOST}/${buildPatchMemberRoute(ID_FORMAT)}`),
+      pathname: `/${buildPatchCurrentMemberRoute()}`,
     },
     ({ reply, body }) => {
       if (shouldThrowError) {
@@ -252,7 +225,7 @@ export const mockPostAvatar = (shouldThrowError: boolean): void => {
   cy.intercept(
     {
       method: HttpMethod.Post,
-      url: new RegExp(`${buildUploadAvatarRoute()}`),
+      pathname: `/${buildUploadAvatarRoute()}`,
     },
     ({ reply }) => {
       if (shouldThrowError) {
@@ -268,7 +241,7 @@ export const mockUpdatePassword = (shouldThrowError: boolean): void => {
   cy.intercept(
     {
       method: HttpMethod.Patch,
-      url: new RegExp(`${API_HOST}/${buildPatchMemberPasswordRoute()}`),
+      pathname: `/${buildPatchMemberPasswordRoute()}`,
     },
     ({ reply }) => {
       if (shouldThrowError) {
@@ -284,7 +257,7 @@ export const mockUpdateEmail = (shouldThrowError: boolean): void => {
   cy.intercept(
     {
       method: HttpMethod.Post,
-      url: new RegExp(`${API_HOST}/${buildPostMemberEmailUpdateRoute()}`),
+      pathname: `/${buildPostMemberEmailUpdateRoute()}`,
     },
     ({ reply }) => {
       if (shouldThrowError) {
@@ -300,7 +273,7 @@ export const mockExportData = (shouldThrowError: boolean): void => {
   cy.intercept(
     {
       method: HttpMethod.Post,
-      url: new RegExp(`${API_HOST}/${buildExportMemberDataRoute()}`),
+      pathname: `/${buildExportMemberDataRoute()}`,
     },
     ({ reply }) => {
       if (shouldThrowError) {
@@ -316,7 +289,7 @@ export const mockDeleteCurrentMember = (): void => {
   cy.intercept(
     {
       method: HttpMethod.Delete,
-      url: new RegExp(`${API_HOST}/${buildDeleteCurrentMemberRoute()}`),
+      pathname: `/${buildDeleteCurrentMemberRoute()}`,
     },
     ({ reply }) => reply({ statusCode: StatusCodes.NO_CONTENT }),
   ).as('deleteCurrentMember');

diff --git a/package.json b/package.json
@@ -14,8 +14,8 @@
     "@emotion/cache": "11.13.1",
     "@emotion/react": "11.13.3",
     "@emotion/styled": "11.13.0",
-    "@graasp/query-client": "3.26.0",
-    "@graasp/sdk": "4.31.0",
+    "@graasp/query-client": "4.0.1",
+    "@graasp/sdk": "4.32.0",
     "@graasp/stylis-plugin-rtl": "2.2.0",
     "@graasp/translations": "1.39.0",
     "@graasp/ui": "5.2.1",
@@ -34,7 +34,7 @@
     "axios": "1.7.7",
     "date-fns": "4.1.0",
     "http-status-codes": "2.3.0",
-    "i18next": "23.15.1",
+    "i18next": "23.15.2",
     "lodash.truncate": "4.4.2",
     "lucide-react": "^0.447.0",
     "react": "18.3.1",

diff --git a/src/components/main/EditMemberPreferences.tsx b/src/components/main/EditMemberPreferences.tsx
@@ -32,7 +32,7 @@ const EditMemberPreferences = ({
 }: EditPreferencesProp): JSX.Element => {
   const { t } = useAccountTranslation();
   const { t: translateCommon } = useCommonTranslation();
-  const { mutate: editMember } = mutations.useEditMember();
+  const { mutate: editMember } = mutations.useEditCurrentMember();
 
   const memberLang = member?.extra?.lang ?? DEFAULT_LANG;
   const memberEmailFreq = member?.extra?.emailFreq ?? DEFAULT_EMAIL_FREQUENCY;
@@ -49,7 +49,6 @@ const EditMemberPreferences = ({
   };
   const saveSettings = () => {
     editMember({
-      id: member.id,
       extra: {
         lang: selectedLang,
         emailFreq: selectedEmailFreq,

diff --git a/src/modules/profile/EditPersonalInformation.tsx b/src/modules/profile/EditPersonalInformation.tsx
@@ -48,7 +48,7 @@ const EditPersonalInformation = ({
 }: EditMemberPersonalInformationProp): JSX.Element => {
   const { t } = useAccountTranslation();
   const { t: translateCommon } = useCommonTranslation();
-  const { mutate: editMember } = mutations.useEditMember();
+  const { mutate: editMember } = mutations.useEditCurrentMember();
   const { mutate: updateEmail } = mutations.useUpdateMemberEmail();
   const [newUserName, setNewUserName] = useState('');
   const [newEmail, setNewEmail] = useState('');
@@ -95,7 +95,6 @@ const EditPersonalInformation = ({
       const name = newUserName.trim();
       if (member && name !== member.name) {
         editMember({
-          id: member.id,
           name,
         });
       }