feat: first iteration of the update

graasp · Sep 13, 2024 · fd236e0 · fd236e0
1 parent be6875b
commit fd236e0
Show file tree

Hide file tree

Showing 18 changed files with 54 additions and 100 deletions.
diff --git a/cypress/e2e/item/settings/thumbnail.cy.ts b/cypress/e2e/item/settings/thumbnail.cy.ts
@@ -25,7 +25,7 @@ describe('Item Thumbnail', () => {
     });
   });
   describe('Upload Thumbnails', () => {
-    it(`upload item thumbnail`, () => {
+    it.only(`upload item thumbnail`, () => {
       cy.visit(buildItemSettingsPath(item.id));
 
       // change item thumbnail

diff --git a/package.json b/package.json
@@ -20,8 +20,8 @@
     "@emotion/styled": "11.13.0",
     "@graasp/chatbox": "3.2.1",
     "@graasp/map": "1.17.0",
-    "@graasp/query-client": "3.22.3",
-    "@graasp/sdk": "4.27.0",
+    "@graasp/query-client": "github:graasp/graasp-query-client#889-migrate-to-v5",
+    "@graasp/sdk": "4.28.0",
     "@graasp/stylis-plugin-rtl": "2.2.0",
     "@graasp/translations": "1.35.1",
     "@graasp/ui": "4.27.0",

diff --git a/src/components/Root.tsx b/src/components/Root.tsx
@@ -62,7 +62,7 @@ const Root = (): JSX.Element => (
         <ThemeWrapper />
       </I18nextProvider>
       {import.meta.env.DEV && import.meta.env.MODE !== 'test' && (
-        <ReactQueryDevtools position="bottom-right" />
+        <ReactQueryDevtools buttonPosition="bottom-left" />
       )}
     </QueryClientProvider>
   </HelmetProvider>

diff --git a/src/components/file/FileUploader.tsx b/src/components/file/FileUploader.tsx
@@ -36,7 +36,7 @@ const FileUploader = ({
   const { itemId: parentItemId } = useParams();
   const [error, setError] = useState<string>();
 
-  const { mutateAsync: uploadFiles, isLoading } = mutations.useUploadFiles();
+  const { mutateAsync: uploadFiles, isPending } = mutations.useUploadFiles();
 
   const [totalProgress, setTotalProgress] = useState(0);
 
@@ -96,7 +96,7 @@ const FileUploader = ({
             onDrop([...e.target.files]);
           }
         }}
-        isLoading={isLoading}
+        isLoading={isPending}
         uploadProgress={Math.ceil(totalProgress * 100)}
         multiple
         onDrop={onDrop}

diff --git a/src/components/hooks/useItemCategories.tsx b/src/components/hooks/useItemCategories.tsx
@@ -36,13 +36,13 @@ export const useItemCategories = ({
 
   const {
     mutate: createItemCategory,
-    isLoading: isPostLoading,
+    isPending: isPostLoading,
     isSuccess: isPostSuccess,
     isError: isPostError,
   } = usePostItemCategory();
   const {
     mutate: deleteItemCategory,
-    isLoading: isDeleteLoading,
+    isPending: isDeleteLoading,
     isSuccess: isDeleteSuccess,
     isError: isDeleteError,
   } = useDeleteItemCategory();

diff --git a/src/components/hooks/useItemLicense.tsx b/src/components/hooks/useItemLicense.tsx
@@ -54,7 +54,7 @@ const useItemLicense = ({
 
   const {
     mutate: updateItem,
-    isLoading,
+    isPending: isLoading,
     isError,
     isSuccess,
   } = useEditItem({ enableNotifications });

diff --git a/src/components/item/publish/CoEditorsContainer.tsx b/src/components/item/publish/CoEditorsContainer.tsx
@@ -43,7 +43,7 @@ export const CoEditorsContainer = ({
 
   const {
     mutate: updateDisplayCoEditors,
-    isLoading,
+    isPending: isLoading,
     isSuccess,
     isError,
   } = mutations.useEditItem({

diff --git a/src/components/item/publish/EditItemDescription.tsx b/src/components/item/publish/EditItemDescription.tsx
@@ -32,7 +32,7 @@ export const EditItemDescription = ({ item }: Props): JSX.Element => {
   const {
     mutate: updateItem,
     isSuccess,
-    isLoading,
+    isPending: isLoading,
     isError,
   } = mutations.useEditItem({
     enableNotifications: false,

diff --git a/src/components/item/publish/EditItemName.tsx b/src/components/item/publish/EditItemName.tsx
@@ -29,7 +29,7 @@ export const EditItemName = ({ item }: Props): JSX.Element => {
   const {
     mutate: updateItem,
     isSuccess,
-    isLoading,
+    isPending: isLoading,
     isError,
   } = mutations.useEditItem({
     enableNotifications: false,

diff --git a/src/components/item/publish/customizedTags/CustomizedTags.hook.tsx b/src/components/item/publish/customizedTags/CustomizedTags.hook.tsx
@@ -32,7 +32,7 @@ export const useCustomizedTags = ({
   const {
     mutate: updateCustomizedTags,
     isSuccess,
-    isLoading,
+    isPending: isLoading,
     isError,
   } = mutations.useEditItem({
     enableNotifications,

diff --git a/src/components/item/publish/publicationButtons/InvalidButton.tsx b/src/components/item/publish/publicationButtons/InvalidButton.tsx
@@ -24,7 +24,7 @@ export const InvalidButton = ({ item, isLoading }: Props): JSX.Element => {
   const { id: itemId, public: isPublic } = item;
   const { isOpen, openModal, closeModal } = useModalStatus();
 
-  const { mutate: validateItem, isLoading: isValidating } =
+  const { mutate: validateItem, isPending: isValidating } =
     usePostItemValidation();
 
   const handleValidateItem = () => {

diff --git a/src/components/item/publish/publicationButtons/PublishedButton.tsx b/src/components/item/publish/publicationButtons/PublishedButton.tsx
@@ -27,7 +27,7 @@ export const PublishedButton = ({ item, isLoading }: Props): JSX.Element => {
   const { t } = useBuilderTranslation();
   const { id: itemId } = item;
 
-  const { mutate: unpublish, isLoading: isUnPublishing } = useUnpublishItem();
+  const { mutate: unpublish, isPending: isUnPublishing } = useUnpublishItem();
 
   const handleUnPublishItem = () => unpublish({ id: itemId });
 

diff --git a/src/components/item/publish/publicationButtons/ReadyToPublishButton.tsx b/src/components/item/publish/publicationButtons/ReadyToPublishButton.tsx
@@ -29,7 +29,7 @@ export const ReadyToPublishButton = ({
   const { id: itemId, public: isPublic } = item;
   const { isOpen, openModal, closeModal } = useModalStatus();
 
-  const { mutate: publish, isLoading: isPublishing } = usePublishItem();
+  const { mutate: publish, isPending: isPublishing } = usePublishItem();
 
   const publishItem = () =>
     publish({ id: itemId, notification: notifyCoEditors });

diff --git a/src/components/item/publish/publicationButtons/UnpublishedButton.tsx b/src/components/item/publish/publicationButtons/UnpublishedButton.tsx
@@ -23,7 +23,7 @@ export const UnpublishedButton = ({ item, isLoading }: Props): JSX.Element => {
   const { id: itemId, public: isPublic } = item;
   const { isOpen, openModal, closeModal } = useModalStatus();
 
-  const { mutate: validateItem, isLoading: isValidating } =
+  const { mutate: validateItem, isPending: isValidating } =
     usePostItemValidation();
 
   const handleValidateItem = () => {

diff --git a/src/components/item/sharing/shortLink/ShortLinkDialogContent.tsx b/src/components/item/sharing/shortLink/ShortLinkDialogContent.tsx
@@ -44,9 +44,9 @@ const ShortLinkDialogContent = ({
 }: Props): JSX.Element => {
   const { t: translateBuilder } = useBuilderTranslation();
 
-  const { mutateAsync: postShortLink, isLoading: loadingPost } =
+  const { mutateAsync: postShortLink, isPending: loadingPost } =
     usePostShortLink();
-  const { mutateAsync: patchShortLink, isLoading: loadingDelete } =
+  const { mutateAsync: patchShortLink, isPending: loadingDelete } =
     usePatchShortLink();
 
   const DIALOG_TITLE = translateBuilder(

diff --git a/src/components/main/DownloadButton.tsx b/src/components/main/DownloadButton.tsx
@@ -20,7 +20,7 @@ export const DownloadButton = ({ item }: Props): JSX.Element => {
     mutate: downloadItem,
     data,
     isSuccess,
-    isLoading: isDownloading,
+    isPending: isDownloading,
   } = mutations.useExportItem();
 
   useEffect(() => {

diff --git a/src/components/main/ImportH5P.tsx b/src/components/main/ImportH5P.tsx
@@ -24,7 +24,8 @@ const ImportH5P = ({
   previousItemId?: DiscriminatedItem['id'];
 }): JSX.Element => {
   const { itemId } = useParams();
-  const { mutateAsync: importH5P, isLoading } = mutations.useImportH5P();
+  const { mutateAsync: importH5P, isPending: isLoading } =
+    mutations.useImportH5P();
   const { update, close: closeNotification } = useUploadWithProgress();
   const { t: translateBuilder } = useBuilderTranslation();
 

diff --git a/yarn.lock b/yarn.lock
@@ -1930,25 +1930,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@graasp/query-client@npm:3.22.3":
+"@graasp/query-client@github:graasp/graasp-query-client#889-migrate-to-v5":
   version: 3.22.3
-  resolution: "@graasp/query-client@npm:3.22.3"
+  resolution: "@graasp/query-client@https://github.com/graasp/graasp-query-client.git#commit=43f453c805378b3f0f64314abbb87f584a05953c"
   dependencies:
-    "@tanstack/react-query": "npm:4.36.1"
-    "@tanstack/react-query-devtools": "npm:4.36.1"
+    "@tanstack/react-query": "npm:5.52.0"
+    "@tanstack/react-query-devtools": "npm:5.52.0"
     axios: "npm:1.7.5"
     http-status-codes: "npm:2.3.0"
   peerDependencies:
     "@graasp/sdk": ^4.0.0
     "@graasp/translations": "*"
     react: ^18.0.0
-  checksum: 10/a1cf0e884e77ca928f7b983fdde7e3b7ca55b23c93d6ec8d79cd3e4db7f675a2e153a5072a0085d8aa5fce977ef7e06de684f23d4e37737ca28ddfccf0914eb7
+  checksum: 10/426982d88d660473d3c1f45489bb647f5805d4e27fbb258d9a5544080e0403b32742380298445da10a6ff00a5d8e828164b50ebfda55df4746a6bacef2824caa
   languageName: node
   linkType: hard
 
-"@graasp/sdk@npm:4.27.0":
-  version: 4.27.0
-  resolution: "@graasp/sdk@npm:4.27.0"
+"@graasp/sdk@npm:4.28.0":
+  version: 4.28.0
+  resolution: "@graasp/sdk@npm:4.28.0"
   dependencies:
     "@faker-js/faker": "npm:9.0.0"
     filesize: "npm:10.1.6"
@@ -1957,7 +1957,7 @@ __metadata:
   peerDependencies:
     date-fns: ^3
     uuid: ^9 || ^10
-  checksum: 10/e218576d56de950d873a349f32744ae09185ee4862f8a383fa927339088795ebdccc8d3e4a626b3435fd99cb2291c7246b7897200c3becac8f4e4becaa510b08
+  checksum: 10/89f9c559154896637ac6d02daa710288de6ac2b753270037eef95dc32a763d6b597aeaafedab312bfd558d1b42b265d23066ffa640197acf4ef1883f4029ba48
   languageName: node
   linkType: hard
 
@@ -3468,53 +3468,40 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tanstack/match-sorter-utils@npm:^8.7.0":
-  version: 8.15.1
-  resolution: "@tanstack/match-sorter-utils@npm:8.15.1"
-  dependencies:
-    remove-accents: "npm:0.5.0"
-  checksum: 10/5a42964a6b45ec1cbc43720953156070751ce589c95825df2d3cb392978e37b1bbcd418853426902e18470b29939076255b3239241133d77f220c3be693a60b1
+"@tanstack/query-core@npm:5.52.0":
+  version: 5.52.0
+  resolution: "@tanstack/query-core@npm:5.52.0"
+  checksum: 10/cd21e87ad7a0bbb262dea21704352eb1bbaafc26776ae1602b4be9a2d0d1f16a89cc4b5951f69083e26f970d75386431240d5a573ed9bce5a37ba2dc862e376a
   languageName: node
   linkType: hard
 
-"@tanstack/query-core@npm:4.36.1":
-  version: 4.36.1
-  resolution: "@tanstack/query-core@npm:4.36.1"
-  checksum: 10/7c648872cd491bcab2aa4c18e0b7ca130c072f05c277a5876977fa3bfa87634bbfde46e9d249236587d78c39866889a02e4e202b478dc6074ff96093732ae56d
+"@tanstack/query-devtools@npm:5.51.16":
+  version: 5.51.16
+  resolution: "@tanstack/query-devtools@npm:5.51.16"
+  checksum: 10/b0e8c1f86890a515d4ddbab4743387aecd882271f7be2cbc36f69d05ba42b803ae2e9bbfd53a03450ca4827c94f6b5d7d6fa5e013bfabe6ee0aa9a7b34a223d3
   languageName: node
   linkType: hard
 
-"@tanstack/react-query-devtools@npm:4.36.1":
-  version: 4.36.1
-  resolution: "@tanstack/react-query-devtools@npm:4.36.1"
+"@tanstack/react-query-devtools@npm:5.52.0":
+  version: 5.52.0
+  resolution: "@tanstack/react-query-devtools@npm:5.52.0"
   dependencies:
-    "@tanstack/match-sorter-utils": "npm:^8.7.0"
-    superjson: "npm:^1.10.0"
-    use-sync-external-store: "npm:^1.2.0"
+    "@tanstack/query-devtools": "npm:5.51.16"
   peerDependencies:
-    "@tanstack/react-query": ^4.36.1
-    react: ^16.8.0 || ^17.0.0 || ^18.0.0
-    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 10/f21896c97a50304071d9ebe130c9d1ea35b29462830fd3f908b986690a9d7f018d76c7595406154d83e4e173ffc2fe0be5ae78f19b36f6df2a3f4d551776d2b7
+    "@tanstack/react-query": ^5.52.0
+    react: ^18 || ^19
+  checksum: 10/67fff9fe45a54e6823800bd15de5d5712b65bda9bb567907765481025775817b03c56925add47dd51fe19de1135b57b290570e5cb00b5a071ca3f7d409c39805
   languageName: node
   linkType: hard
 
-"@tanstack/react-query@npm:4.36.1":
-  version: 4.36.1
-  resolution: "@tanstack/react-query@npm:4.36.1"
+"@tanstack/react-query@npm:5.52.0":
+  version: 5.52.0
+  resolution: "@tanstack/react-query@npm:5.52.0"
   dependencies:
-    "@tanstack/query-core": "npm:4.36.1"
-    use-sync-external-store: "npm:^1.2.0"
+    "@tanstack/query-core": "npm:5.52.0"
   peerDependencies:
-    react: ^16.8.0 || ^17.0.0 || ^18.0.0
-    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-    react-native: "*"
-  peerDependenciesMeta:
-    react-dom:
-      optional: true
-    react-native:
-      optional: true
-  checksum: 10/764b860c3ac8d254fc6b07e01054a0f58058644d59626c724b213293fbf1e31c198cbb26e4c32c0d16dcaec0353c0ae19147d9c667675b31f8cea1d64f1ff4ac
+    react: ^18.0.0
+  checksum: 10/6976d309d306f0dd70f25e0de820812c47bfc39b654294e1512d4bb5320d0abad1bc3d6de16a25b7ae6766eb9b928c5e396e996d7d6689d33a1c1436de68cf7b
   languageName: node
   linkType: hard
 
@@ -5805,15 +5792,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"copy-anything@npm:^3.0.2":
-  version: 3.0.5
-  resolution: "copy-anything@npm:3.0.5"
-  dependencies:
-    is-what: "npm:^4.1.8"
-  checksum: 10/4c41385a94a1cff6352a954f9b1c05b6bb1b70713a2d31f4c7b188ae7187ce00ddcc9c09bd58d24cd35b67fc6dd84df5954c0be86ea10700ff74e677db3cb09c
-  languageName: node
-  linkType: hard
-
 "core-util-is@npm:1.0.2":
   version: 1.0.2
   resolution: "core-util-is@npm:1.0.2"
@@ -8156,8 +8134,8 @@ __metadata:
     "@emotion/styled": "npm:11.13.0"
     "@graasp/chatbox": "npm:3.2.1"
     "@graasp/map": "npm:1.17.0"
-    "@graasp/query-client": "npm:3.22.3"
-    "@graasp/sdk": "npm:4.27.0"
+    "@graasp/query-client": "github:graasp/graasp-query-client#889-migrate-to-v5"
+    "@graasp/sdk": "npm:4.28.0"
     "@graasp/stylis-plugin-rtl": "npm:2.2.0"
     "@graasp/translations": "npm:1.35.1"
     "@graasp/ui": "npm:4.27.0"
@@ -9076,13 +9054,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-what@npm:^4.1.8":
-  version: 4.1.16
-  resolution: "is-what@npm:4.1.16"
-  checksum: 10/f6400634bae77be6903365dc53817292e1c4d8db1b467515d0c842505b8388ee8e558326d5e6952cb2a9d74116eca2af0c6adb8aa7e9d5c845a130ce9328bf13
-  languageName: node
-  linkType: hard
-
 "is-windows@npm:^1.0.2":
   version: 1.0.2
   resolution: "is-windows@npm:1.0.2"
@@ -13426,15 +13397,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"superjson@npm:^1.10.0":
-  version: 1.13.3
-  resolution: "superjson@npm:1.13.3"
-  dependencies:
-    copy-anything: "npm:^3.0.2"
-  checksum: 10/71a186c513a9821e58264c0563cd1b3cf07d3b5ba53a09cc5c1a604d8ffeacac976a6ba1b5d5b3c71b6ab5a1941dfba5a15e3f106ad3ef22fe8d5eee3e2be052
-  languageName: node
-  linkType: hard
-
 "supports-color@npm:^5.3.0":
   version: 5.5.0
   resolution: "supports-color@npm:5.5.0"
@@ -14137,15 +14099,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"use-sync-external-store@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "use-sync-external-store@npm:1.2.0"
-  peerDependencies:
-    react: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 10/a676216affc203876bd47981103f201f28c2731361bb186367e12d287a7566763213a8816910c6eb88265eccd4c230426eb783d64c373c4a180905be8820ed8e
-  languageName: node
-  linkType: hard
-
 "util-deprecate@npm:^1.0.2":
   version: 1.0.2
   resolution: "util-deprecate@npm:1.0.2"