Merge branch 'outline:main' into main

Author: pesaventofilippo

app/components/ConfirmMoveDialog.tsx

@@ -21,11 +21,13 @@ function ConfirmMoveDialog({ collection, item, ...rest }: Props) {
   const { documents, dialogs, collections } = useStores();
   const { t } = useTranslation();
   const prevCollection = collections.get(item.collectionId!);
-  const accessMapping = {
-    [CollectionPermission.ReadWrite]: t("view and edit access"),
-    [CollectionPermission.Read]: t("view only access"),
-    null: t("no access"),
-  };
+  const accessMapping: Record<Partial<CollectionPermission> | "null", string> =
+    {
+      [CollectionPermission.Admin]: t("manage access"),
+      [CollectionPermission.ReadWrite]: t("view and edit access"),
+      [CollectionPermission.Read]: t("view only access"),
+      null: t("no access"),
+    };
 
   const handleSubmit = async () => {
     await documents.move({

app/components/ConnectionStatus.tsx

@@ -35,7 +35,7 @@ function ConnectionStatus() {
   };
 
   const message = ui.multiplayerErrorCode
-    ? codeToMessage[ui.multiplayerErrorCode]
+    ? codeToMessage[ui.multiplayerErrorCode as keyof typeof codeToMessage]
     : undefined;
 
   return ui.multiplayerStatus === "connecting" ||

app/components/LocaleTime.tsx

@@ -39,12 +39,15 @@ const LocaleTime: React.FC<Props> = ({
   relative,
   tooltipDelay,
 }: Props) => {
-  const userLocale: string = useUserLocale() || "";
-  const dateFormatLong = {
+  const userLocale = useUserLocale();
+  const dateFormatLong: Record<string, string> = {
     en_US: "MMMM do, yyyy h:mm a",
     fr_FR: "'Le 'd MMMM yyyy 'à' H:mm",
   };
-  const formatLocaleLong = dateFormatLong[userLocale] ?? "MMMM do, yyyy h:mm a";
+  const formatLocaleLong =
+    (userLocale ? dateFormatLong[userLocale] : undefined) ??
+    "MMMM do, yyyy h:mm a";
+  // @ts-expect-error fallback to formatLocaleLong
   const formatLocale = format?.[userLocale] ?? formatLocaleLong;
   const [_, setMinutesMounted] = React.useState(0); // eslint-disable-line @typescript-eslint/no-unused-vars
   const callback = React.useRef<() => void>();

app/components/PaginatedList.tsx

@@ -19,7 +19,8 @@ export interface PaginatedItem {
 }
 
 type Props<T> = WithTranslation &
-  RootStore & {
+  RootStore &
+  React.HTMLAttributes<HTMLDivElement> & {
     fetch?: (
       options: Record<string, any> | undefined
     ) => Promise<T[] | undefined> | undefined;

app/editor/components/EmojiMenu.tsx

@@ -29,6 +29,7 @@ const EmojiMenu = (props: Props) => {
         .map((item) => {
           // We snake_case the shortcode for backwards compatability with gemoji to
           // avoid multiple formats being written into documents.
+          // @ts-expect-error emojiMartToGemoji key
           const shortcode = snakeCase(emojiMartToGemoji[item.id] || item.id);
           const emoji = item.value;
 

app/editor/extensions/MentionMenu.tsx

@@ -8,7 +8,7 @@ export default class MentionMenuExtension extends Suggestion {
   get defaultOptions() {
     return {
       // ported from https://github.com/tc39/proposal-regexp-unicode-property-escapes#unicode-aware-version-of-w
-      openRegex: /(?:^|\s|\()@([\p{L}\p{M}\d]+)?$/u,
+      openRegex: /(?:^|\s|\()@([\p{L}\p{M}\d\s{1}]+)?$/u,
       closeRegex: /(?:^|\s|\()@(([\p{L}\p{M}\d]*\s{2})|(\s+[\p{L}\p{M}\d]+))$/u,
     };
   }

app/editor/menus/code.tsx

@@ -14,7 +14,10 @@ export default function codeMenuItems(
 ): MenuItem[] {
   const node = state.selection.$from.node();
 
-  const allLanguages = Object.entries(LANGUAGES);
+  const allLanguages = Object.entries(LANGUAGES) as [
+    keyof typeof LANGUAGES,
+    string
+  ][];
   const frequentLanguages = getFrequentCodeLanguages();
 
   const frequentLangMenuItems = frequentLanguages.map((value) => {
@@ -49,6 +52,7 @@ export default function codeMenuItems(
       visible: !readOnly,
       name: "code_block",
       icon: <ExpandedIcon />,
+      // @ts-expect-error We have a fallback for incorrect mapping
       label: LANGUAGES[node.attrs.language ?? "none"],
       children: languageMenuItems,
     },

app/hooks/useUserLocale.ts

@@ -3,16 +3,9 @@ import useCurrentUser from "./useCurrentUser";
 /**
  * Returns the user's locale, or undefined if the user is not logged in.
  *
- * @param languageCode Whether to only return the language code
  * @returns The user's locale, or undefined if the user is not logged in
  */
-export default function useUserLocale(languageCode?: boolean) {
+export default function useUserLocale() {
   const user = useCurrentUser({ rejectOnEmpty: false });
-
-  if (!user?.language) {
-    return undefined;
-  }
-
-  const { language } = user;
-  return languageCode ? language.split("_")[0] : language;
+  return user?.language;
 }

app/models/FileOperation.ts

@@ -1,5 +1,9 @@
 import { computed, observable } from "mobx";
-import { FileOperationFormat, FileOperationType } from "@shared/types";
+import {
+  FileOperationFormat,
+  FileOperationState,
+  FileOperationType,
+} from "@shared/types";
 import { bytesToHumanReadable } from "@shared/utils/files";
 import User from "./User";
 import Model from "./base/Model";
@@ -10,7 +14,7 @@ class FileOperation extends Model {
   id: string;
 
   @observable
-  state: string;
+  state: FileOperationState;
 
   name: string;
 

app/models/User.ts

@@ -11,6 +11,7 @@ import {
   UserRole,
 } from "@shared/types";
 import type { NotificationSettings } from "@shared/types";
+import { locales } from "@shared/utils/date";
 import { client } from "~/utils/ApiClient";
 import Document from "./Document";
 import Group from "./Group";
@@ -39,7 +40,7 @@ class User extends ParanoidModel {
 
   @Field
   @observable
-  language: string;
+  language: keyof typeof locales;
 
   @Field
   @observable

app/models/base/Model.ts

@@ -40,6 +40,7 @@ export default abstract class Model {
    * @returns A promise that resolves when loading is complete.
    */
   async loadRelations(
+    this: Model,
     options: { withoutPolicies?: boolean } = {}
   ): Promise<any> {
     const relations = getRelationsForModelClass(
@@ -62,7 +63,7 @@ export default abstract class Model {
       if ("fetch" in store) {
         const id = this[properties.idKey];
         if (id) {
-          promises.push(store.fetch(id));
+          promises.push(store.fetch(id as string));
         }
       }
     }
@@ -145,6 +146,7 @@ export default abstract class Model {
         if (key === "initialized") {
           continue;
         }
+        // @ts-expect-error TODO
         this[key] = data[key];
       } catch (error) {
         Logger.warn(`Error setting ${key} on model`, error);

app/models/decorators/Relation.ts

@@ -17,7 +17,7 @@ type RelationOptions<T = Model> = {
 
 type RelationProperties<T = Model> = {
   /** The name of the property on the model that stores the ID of the relation. */
-  idKey: string;
+  idKey: keyof T;
   /** A function that returns the class of the relation. */
   relationClassResolver: () => typeof Model;
   /** Options for the relation. */

app/scenes/Collection/components/MembershipPreview.tsx

@@ -43,8 +43,12 @@ const MembershipPreview = ({ collection, limit = 8 }: Props) => {
           memberships.fetchPage(options),
           groupMemberships.fetchPage(options),
         ]);
-        setUsersCount(users[PAGINATION_SYMBOL].total);
-        setGroupsCount(groups[PAGINATION_SYMBOL].total);
+        if (users[PAGINATION_SYMBOL]) {
+          setUsersCount(users[PAGINATION_SYMBOL].total);
+        }
+        if (groups[PAGINATION_SYMBOL]) {
+          setGroupsCount(groups[PAGINATION_SYMBOL].total);
+        }
       } finally {
         setIsLoading(false);
       }

app/scenes/Invite.tsx

@@ -71,10 +71,11 @@ function Invite({ onSubmit }: Props) {
     [onSubmit, invites, role, t, users]
   );
 
-  const handleChange = React.useCallback((ev, index) => {
+  const handleChange = React.useCallback((ev, index: number) => {
     setInvites((prevInvites) => {
       const newInvites = [...prevInvites];
-      newInvites[index][ev.target.name] = ev.target.value;
+      newInvites[index][ev.target.name as keyof InviteRequest] =
+        ev.target.value;
       return newInvites;
     });
   }, []);

app/scenes/Settings/Members.tsx

@@ -62,7 +62,9 @@ function Members() {
           filter,
           role,
         });
-        setTotalPages(Math.ceil(response[PAGINATION_SYMBOL].total / limit));
+        if (response[PAGINATION_SYMBOL]) {
+          setTotalPages(Math.ceil(response[PAGINATION_SYMBOL].total / limit));
+        }
         setUserIds(response.map((u: User) => u.id));
       } finally {
         setIsLoading(false);

app/scenes/Settings/Shares.tsx

@@ -47,7 +47,9 @@ function Shares() {
           sort,
           direction,
         });
-        setTotalPages(Math.ceil(response[PAGINATION_SYMBOL].total / limit));
+        if (response[PAGINATION_SYMBOL]) {
+          setTotalPages(Math.ceil(response[PAGINATION_SYMBOL].total / limit));
+        }
         setShareIds(response.map((u: Share) => u.id));
       } finally {
         setIsLoading(false);

app/scenes/Settings/components/FileOperationListItem.tsx

@@ -38,16 +38,17 @@ const FileOperationListItem = ({ fileOperation }: Props) => {
     [FileOperationState.Error]: t("Failed"),
   };
 
-  const iconMapping = {
+  const iconMapping: Record<FileOperationState, React.JSX.Element> = {
     [FileOperationState.Creating]: <Spinner />,
     [FileOperationState.Uploading]: <Spinner />,
     [FileOperationState.Expired]: <ArchiveIcon color={theme.textTertiary} />,
     [FileOperationState.Complete]: <DoneIcon color={theme.accent} />,
     [FileOperationState.Error]: <WarningIcon color={theme.danger} />,
   };
 
-  const formatMapping = {
+  const formatMapping: Record<FileOperationFormat, string> = {
     [FileOperationFormat.JSON]: "JSON",
+    [FileOperationFormat.Notion]: "Notion",
     [FileOperationFormat.MarkdownZip]: "Markdown",
     [FileOperationFormat.HTMLZip]: "HTML",
     [FileOperationFormat.PDF]: "PDF",

app/stores/GroupMembershipsStore.ts

@@ -5,7 +5,11 @@ import GroupMembership from "~/models/GroupMembership";
 import { PaginationParams } from "~/types";
 import { client } from "~/utils/ApiClient";
 import RootStore from "./RootStore";
-import Store, { PAGINATION_SYMBOL, RPCAction } from "./base/Store";
+import Store, {
+  PAGINATION_SYMBOL,
+  PaginatedResponse,
+  RPCAction,
+} from "./base/Store";
 
 export default class GroupMembershipsStore extends Store<GroupMembership> {
   actions = [RPCAction.Create, RPCAction.Delete];
@@ -24,7 +28,7 @@ export default class GroupMembershipsStore extends Store<GroupMembership> {
         documentId?: string;
         collectionId?: string;
         groupId?: string;
-      }): Promise<GroupMembership[]> => {
+      }): Promise<PaginatedResponse<GroupMembership>> => {
     this.isFetching = true;
 
     try {
@@ -41,7 +45,7 @@ export default class GroupMembershipsStore extends Store<GroupMembership> {
         : await client.post(`/groupMemberships.list`, params);
       invariant(res?.data, "Data not available");
 
-      let response: GroupMembership[] = [];
+      let response: PaginatedResponse<GroupMembership> = [];
       runInAction(`GroupMembershipsStore#fetchPage`, () => {
         res.data.groups?.forEach(this.rootStore.groups.add);
         res.data.documents?.forEach(this.rootStore.documents.add);

app/stores/MembershipsStore.ts

@@ -5,7 +5,11 @@ import Membership from "~/models/Membership";
 import { PaginationParams } from "~/types";
 import { client } from "~/utils/ApiClient";
 import RootStore from "./RootStore";
-import Store, { PAGINATION_SYMBOL, RPCAction } from "./base/Store";
+import Store, {
+  PAGINATION_SYMBOL,
+  PaginatedResponse,
+  RPCAction,
+} from "./base/Store";
 
 export default class MembershipsStore extends Store<Membership> {
   actions = [RPCAction.Create, RPCAction.Delete];
@@ -17,14 +21,14 @@ export default class MembershipsStore extends Store<Membership> {
   @action
   fetchPage = async (
     params: (PaginationParams & { id?: string }) | undefined
-  ): Promise<Membership[]> => {
+  ): Promise<PaginatedResponse<Membership>> => {
     this.isFetching = true;
 
     try {
       const res = await client.post(`/collections.memberships`, params);
       invariant(res?.data, "Data not available");
 
-      let response: Membership[] = [];
+      let response: PaginatedResponse<Membership> = [];
       runInAction(`MembershipsStore#fetchPage`, () => {
         res.data.users.forEach(this.rootStore.users.add);
         response = res.data.memberships.map(this.add);

app/stores/RootStore.ts

@@ -102,14 +102,11 @@ export default class RootStore {
    *
    * @param modelName
    */
-  public getStoreForModelName<K extends keyof RootStore>(
-    modelName: string
-  ): RootStore[K] {
+  public getStoreForModelName<K extends keyof RootStore>(modelName: string) {
     const storeName = this.getStoreNameForModelName(modelName);
     const store = this[storeName];
     invariant(store, `No store found for model name "${modelName}"`);
-
-    return store;
+    return store as RootStore[K];
   }
 
   /**
@@ -118,8 +115,9 @@ export default class RootStore {
   public clear() {
     Object.getOwnPropertyNames(this)
       .filter((key) => ["auth", "ui"].includes(key) === false)
-      .forEach((key) => {
-        this[key]?.clear?.();
+      .forEach((key: keyof RootStore) => {
+        // @ts-expect-error clear exists on all stores
+        "clear" in this[key] && this[key].clear();
       });
   }
 
@@ -128,14 +126,17 @@ export default class RootStore {
    *
    * @param StoreClass
    */
-  private registerStore<T = typeof Store>(StoreClass: T, name?: string) {
+  private registerStore<T = typeof Store>(
+    StoreClass: T,
+    name?: keyof RootStore
+  ) {
     // @ts-expect-error TS thinks we are instantiating an abstract class.
     const store = new StoreClass(this);
     const storeName = name ?? this.getStoreNameForModelName(store.modelName);
     this[storeName] = store;
   }
 
   private getStoreNameForModelName(modelName: string) {
-    return pluralize(lowerFirst(modelName));
+    return pluralize(lowerFirst(modelName)) as keyof RootStore;
   }
 }