Merge pull request #2146 from makeplane/sync/ce-ee

Sync: Community Changes

Author: pushya22

packages/services/src/auth/auth.service.ts

@@ -22,9 +22,10 @@ export class AuthService extends APIService {
    * Requests a CSRF token for form submission security
    * @returns {Promise<ICsrfTokenData>} Object containing the CSRF token
    * @throws {Error} Throws the complete error object if the request fails
+   * @remarks This method uses the validateStatus: null option to bypass interceptors for unauthorized errors.
    */
   async requestCSRFToken(): Promise<ICsrfTokenData> {
-    return this.get("/auth/get-csrf-token/")
+    return this.get("/auth/get-csrf-token/", { validateStatus: null })
       .then((response) => response.data)
       .catch((error) => {
         throw error;

packages/services/src/instance/instance.service.ts

@@ -29,9 +29,10 @@ export class InstanceService extends APIService {
    * Retrieves information about the current instance
    * @returns {Promise<IInstanceInfo>} Promise resolving to instance information
    * @throws {Error} If the API request fails
+   * @remarks This method uses the validateStatus: null option to bypass interceptors for unauthorized errors.
    */
   async info(): Promise<IInstanceInfo> {
-    return this.get("/api/instances/")
+    return this.get("/api/instances/", { validateStatus: null })
       .then((response) => response.data)
       .catch((error) => {
         throw error?.response?.data;
@@ -55,9 +56,10 @@ export class InstanceService extends APIService {
    * Fetches the list of instance admins
    * @returns {Promise<IInstanceAdmin[]>} Promise resolving to an array of instance admins
    * @throws {Error} If the API request fails
+   * @remarks This method uses the validateStatus: null option to bypass interceptors for unauthorized errors.
    */
   async admins(): Promise<IInstanceAdmin[]> {
-    return this.get("/api/instances/admins/")
+    return this.get("/api/instances/admins/", { validateStatus: null })
       .then((response) => response.data)
       .catch((error) => {
         throw error?.response?.data;

packages/services/src/user/user.service.ts

@@ -22,9 +22,10 @@ export class UserService extends APIService {
    * Retrieves the current instance admin details
    * @returns {Promise<IUser>} Promise resolving to the current instance admin details
    * @throws {Error} If the API request fails
+   * @remarks This method uses the validateStatus: null option to bypass interceptors for unauthorized errors.
    */
   async adminDetails(): Promise<IUser> {
-    return this.get("/api/instances/admins/me/")
+    return this.get("/api/instances/admins/me/", { validateStatus: null })
       .then((response) => response?.data)
       .catch((error) => {
         throw error?.response?.data;

web/core/hooks/use-page-fallback.ts

@@ -1,14 +1,14 @@
 import { useCallback, useEffect } from "react";
 // plane editor
-import { EditorRefApi } from "@plane/editor";
+import { EditorRefApi, getBinaryDataFromDocumentEditorHTMLString } from "@plane/editor";
 // plane types
 import { TDocumentPayload } from "@plane/types";
 // hooks
 import useAutoSave from "@/hooks/use-auto-save";
 
 type TArgs = {
   editorRef: React.RefObject<EditorRefApi>;
-  fetchPageDescription: () => Promise<any>;
+  fetchPageDescription: () => Promise<ArrayBuffer>;
   hasConnectionFailed: boolean;
   updatePageDescription: (data: TDocumentPayload) => Promise<void>;
 };
@@ -21,28 +21,35 @@ export const usePageFallback = (args: TArgs) => {
     const editor = editorRef.current;
     if (!editor) return;
 
-    const latestEncodedDescription = await fetchPageDescription();
-    const latestDecodedDescription = latestEncodedDescription
-      ? new Uint8Array(latestEncodedDescription)
-      : new Uint8Array();
-
-    editor.setProviderDocument(latestDecodedDescription);
-    const { binary, html, json } = editor.getDocument();
-    if (!binary || !json) return;
-    const encodedBinary = Buffer.from(binary).toString("base64");
-
-    await updatePageDescription({
-      description_binary: encodedBinary,
-      description_html: html,
-      description: json,
-    });
-  }, [hasConnectionFailed]);
+    try {
+      const latestEncodedDescription = await fetchPageDescription();
+      let latestDecodedDescription: Uint8Array;
+      if (latestEncodedDescription && latestEncodedDescription.byteLength > 0) {
+        latestDecodedDescription = new Uint8Array(latestEncodedDescription);
+      } else {
+        latestDecodedDescription = getBinaryDataFromDocumentEditorHTMLString("<p></p>");
+      }
+
+      editor.setProviderDocument(latestDecodedDescription);
+      const { binary, html, json } = editor.getDocument();
+      if (!binary || !json) return;
+      const encodedBinary = Buffer.from(binary).toString("base64");
+
+      await updatePageDescription({
+        description_binary: encodedBinary,
+        description_html: html,
+        description: json,
+      });
+    } catch (error) {
+      console.error("Error in updating description using fallback logic:", error);
+    }
+  }, [editorRef, fetchPageDescription, hasConnectionFailed, updatePageDescription]);
 
   useEffect(() => {
     if (hasConnectionFailed) {
       handleUpdateDescription();
     }
-  }, [hasConnectionFailed]);
+  }, [handleUpdateDescription, hasConnectionFailed]);
 
   useAutoSave(handleUpdateDescription);
 };