Merge branch 'dev' into main

Author: gustavotoyota

.circleci/config.yml

@@ -186,6 +186,12 @@ jobs:
       - run:
           name: Build iOS app
           command: pnpm run build:ios
+      - run:
+          name: Create review demo metadata files
+          command: |
+            cd apps/client/src-capacitor/ios/App/fastlane/metadata/review_information
+            echo $FASTLANE_REVIEW_DEMO_USER > demo_user.txt
+            echo $FASTLANE_REVIEW_DEMO_PASSWORD > demo_password.txt
       - run:
           name: Install Ruby bundle
           command: |

apps/client/package.json

@@ -2,7 +2,7 @@
   "name": "@deepnotes/client",
   "description": "DeepNotes",
   "homepage": "https://deepnotes.app",
-  "version": "1.0.19",
+  "version": "1.0.20",
   "author": "Gustavo Toyota <gustavottoyota@gmail.com>",
   "dependencies": {
     "@_ueberdosis/prosemirror-tables": "~1.1.3",

apps/client/src-capacitor/ios/App/App.xcodeproj/project.pbxproj

@@ -359,7 +359,7 @@
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.0.19;
+				MARKETING_VERSION = 1.0.20;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = app.deepnotes;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -386,7 +386,7 @@
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.0.19;
+				MARKETING_VERSION = 1.0.20;
 				PRODUCT_BUNDLE_IDENTIFIER = app.deepnotes;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

apps/client/src/code/pages/page/elems/find-and-replace.ts

@@ -115,6 +115,8 @@ export class PageFindAndReplace {
           editor.commands.setFindTerm('');
         }
       }
+
+      this.react.resultCount = 0;
     }
   }
 
@@ -137,6 +139,22 @@ export class PageFindAndReplace {
       return;
     }
 
+    let parent = elemInfo.elem.react.region;
+
+    while (parent?.type === 'note') {
+      if (parent.react.collapsing.collapsed) {
+        parent.react.collapsing.collapsed = false;
+      }
+
+      parent = parent.react.region;
+    }
+
+    if (elemInfo.elem?.type === 'note' && this.editorIndex > 0) {
+      if (elemInfo.elem.react.collapsing.collapsed) {
+        elemInfo.elem.react.collapsing.collapsed = false;
+      }
+    }
+
     const editor = elemInfo.editors[this.editorIndex];
 
     if (editor == null) {
@@ -272,6 +290,8 @@ export class PageFindAndReplace {
         }
       }
     }
+
+    this.updateResultCount();
   }
 }
 

apps/client/src/code/pages/page/page.ts

@@ -358,8 +358,12 @@ export class Page implements IPageRegion {
 
     // Bump on recent pages
 
-    pull(this.app.react.recentPageIds, this.id);
-    this.app.react.recentPageIds.unshift(this.id);
+    internals.pages.recentPageIdsKeepOverride = true;
+    internals.pages.react.recentPageIdsOverride = [
+      ...internals.pages.react.recentPageIds,
+    ];
+    pull(this.app.react.recentPageIdsOverride!, this.id);
+    this.app.react.recentPageIdsOverride!.unshift(this.id);
 
     // Bump on server
 

apps/client/src/code/pages/pages.ts

@@ -14,7 +14,9 @@ import type { Serialization } from './serialization';
 
 export interface IAppReact {
   pathPageIds: string[];
-  recentPageIds: string[];
+
+  recentPageIdsOverride?: string[];
+  recentPageIds: ComputedRef<string[]>;
 
   page: ShallowRef<Page>;
   pageId: ComputedRef<string | undefined>;
@@ -42,6 +44,8 @@ export class Pages {
 
   parentPageId?: string;
 
+  recentPageIdsKeepOverride?: boolean;
+
   constructor(input: { factories: Factories }) {
     this.factories = input.factories;
 
@@ -50,7 +54,21 @@ export class Pages {
 
     this.react = reactive({
       pathPageIds: [],
-      recentPageIds: [],
+      recentPageIds: computed(() => {
+        if (this.recentPageIdsKeepOverride) {
+          this.recentPageIdsKeepOverride = undefined;
+        } else {
+          this.react.recentPageIdsOverride = undefined;
+        }
+
+        const recentPageIds = internals.realtime.globalCtx.hget(
+          'user',
+          authStore().userId,
+          'recent-page-ids',
+        );
+
+        return this.react.recentPageIdsOverride ?? recentPageIds ?? [];
+      }),
 
       page: shallowRef(null) as any,
       pageId: computed(() => this.react.page?.id),
@@ -82,17 +100,12 @@ export class Pages {
 
     promises.push(
       (async () => {
-        const [
-          encryptedDefaultNote,
-          encryptedDefaultArrow,
-          recentPageIdsJSON,
-          isNewUser,
-        ] = await internals.realtime.hmget('user', authStore().userId, [
-          'encrypted-default-note',
-          'encrypted-default-arrow',
-          'recent-page-ids',
-          'new',
-        ]);
+        const [encryptedDefaultNote, encryptedDefaultArrow, isNewUser] =
+          await internals.realtime.hmget('user', authStore().userId, [
+            'encrypted-default-note',
+            'encrypted-default-arrow',
+            'new',
+          ]);
 
         this.defaultNote = unpack(
           internals.symmetricKeyring.decrypt(encryptedDefaultNote, {
@@ -113,8 +126,6 @@ export class Pages {
           }),
         );
 
-        this.react.recentPageIds = recentPageIdsJSON ?? [];
-
         this.react.isNewUser = !!isNewUser;
 
         if (isNewUser) {

apps/client/src/components/Checklist.vue

@@ -3,7 +3,7 @@
     <PassthroughComponent
       :is="itemsWrapper"
       v-bind="wrapperProps"
-      v-on="wrapperEvents"
+      v-on="wrapperEvents ?? {}"
     >
       <slot
         v-if="itemIds.length === 0"

apps/client/src/layouts/PagesLayout/LeftSidebar/RecentPages.vue

@@ -83,7 +83,11 @@ async function removeRecentPage(pageId: string) {
   try {
     await trpcClient.users.pages.removeRecentPage.mutate({ pageId });
 
-    pull(internals.pages.react.recentPageIds, pageId);
+    internals.pages.recentPageIdsKeepOverride = true;
+    internals.pages.react.recentPageIdsOverride = [
+      ...internals.pages.react.recentPageIds,
+    ];
+    pull(internals.pages.react.recentPageIdsOverride, pageId);
   } catch (error) {
     handleError(error);
   }

apps/client/src/layouts/PagesLayout/RightSidebar/NoteProperties/NewPageDialog.vue

@@ -172,6 +172,7 @@ const groupOptions = computed(() => [
       }
 
       if (
+        groupId !== page.value.react.groupId &&
         !rolesMap()[groupMemberRoles.value[groupIndex]]?.permissions
           .editGroupPages
       ) {
@@ -204,6 +205,7 @@ const groupMemberName = ref('');
 onMounted(async () => {
   // Initialize group IDs
 
+  destGroupId.value = page.value.react.groupId;
   groupIds.value = [page.value.react.groupId];
 
   // Focus page title
@@ -241,8 +243,6 @@ onMounted(async () => {
       ).text;
     })(),
   ]);
-
-  destGroupId.value = page.value.react.groupId;
 });
 
 async function _createPage() {

apps/client/src/layouts/PagesLayout/RightSidebar/PageProperties/MovePageDialog.vue

@@ -160,6 +160,7 @@ const groupOptions = computed(() => [
       }
 
       if (
+        groupId !== internals.pages.react.page.react.groupId &&
         !rolesMap()[groupMemberRoles.value[groupIndex]]?.permissions
           .editGroupPages
       ) {
@@ -176,6 +177,7 @@ const groupOptions = computed(() => [
 ]);
 
 onMounted(async () => {
+  destGroupId.value = props.groupId;
   groupIds.value = [props.groupId];
 
   await Promise.all([
@@ -201,8 +203,6 @@ onMounted(async () => {
       groupMemberName.value = await selfUserName().getAsync();
     })(),
   ]);
-
-  destGroupId.value = props.groupId;
 });
 
 async function _movePage() {