Merge branch 'dev' into main

Author: gustavotoyota

apps/app-server/src/websocket/groups/join-invitations/reject.ts

@@ -48,10 +48,6 @@ export async function rejectStep1({
   typeof baseProcedureStep1
 >): Promise<NotificationsResponse> {
   return await ctx.dataAbstraction.transaction(async (dtrx) => {
-    // Assert that user is subscribed
-
-    await ctx.assertUserSubscribed({ userId: ctx.userId });
-
     // Check pending invitation
 
     if (

apps/client/package.json

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

apps/client/quasar.config.js

@@ -348,7 +348,7 @@ module.exports = configure(function (ctx) {
           target: 'AppImage',
         },
 
-        ...(false // true for NSIS, false for AppX
+        ...(env.NSIS === 'true'
           ? {
               win: {
                 target: 'nsis',

apps/client/src-capacitor/android/app/version.properties

@@ -1,2 +1,2 @@
-#Mon Aug 21 14:15:23 AMT 2023
-VERSION_CODE=52
+#Sun Oct 29 10:56:18 AMT 2023
+VERSION_CODE=61

apps/client/src/code/api-interface/pages/move.ts

@@ -178,7 +178,7 @@ export async function movePage(input: {
     return {
       pageId: input.pageId,
 
-      destGroupId: input.destGroupId,
+      destGroupId: destGroupId,
       setAsMainPage: input.setAsMainPage,
 
       groupCreation,

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

@@ -368,6 +368,8 @@ export class Serialization {
     noteCollab.editedAt = null;
     noteCollab.movedAt = null;
 
+    noteCollab.movable = true;
+
     const noteId = nanoid();
 
     noteMap.set(noteIndex, noteId);

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

@@ -133,6 +133,7 @@ import {
   maxGroupNameLength,
   maxNameLength,
   maxPageTitleLength,
+  rolesMap,
 } from '@deeplib/misc';
 import { BREAKPOINT_MD_MIN, sleep } from '@stdlib/misc';
 import { createPage } from 'src/code/api-interface/pages/create';
@@ -158,17 +159,25 @@ const pageRelativeTitleElem = ref<ComponentPublicInstance>();
 const realtimeCtx = useRealtimeContext();
 
 const groupIds = ref<string[]>([]);
+const groupMemberRoles = ref<string[]>([]);
 
 const groupOptions = computed(() => [
   { id: 'new', name: '(New group)' },
   ...groupIds.value
-    .map((groupId) => {
+    .map((groupId, groupIndex) => {
       if (
         realtimeCtx.hget('group', groupId, 'permanent-deletion-date') != null
       ) {
         return;
       }
 
+      if (
+        !rolesMap()[groupMemberRoles.value[groupIndex]]?.permissions
+          .editGroupPages
+      ) {
+        return;
+      }
+
       const groupName = groupNames()(groupId).get();
 
       if (groupName.status === 'success') {
@@ -196,7 +205,6 @@ onMounted(async () => {
   // Initialize group IDs
 
   groupIds.value = [page.value.react.groupId];
-  destGroupId.value = page.value.react.groupId;
 
   // Focus page title
 
@@ -213,6 +221,16 @@ onMounted(async () => {
         authStore().userId,
         'recent-group-ids',
       )) ?? [page.value.react.groupId];
+
+      groupMemberRoles.value = await Promise.all(
+        groupIds.value.map((groupId) =>
+          internals.realtime.hget(
+            'group-member',
+            `${groupId}:${authStore().userId}`,
+            'role',
+          ),
+        ),
+      );
     })(),
 
     (async () => {
@@ -223,6 +241,8 @@ onMounted(async () => {
       ).text;
     })(),
   ]);
+
+  destGroupId.value = page.value.react.groupId;
 });
 
 async function _createPage() {

apps/client/src/layouts/PagesLayout/RightSidebar/PageProperties/GroupSettingsDialog/PagesTab/PagesTab.vue

@@ -130,7 +130,9 @@ const realtimeCtx = inject<RealtimeContext>('realtimeCtx')!;
 const basePageIds = inject<Ref<string[]>>('pageIds')!;
 const finalPageIds = computed(() =>
   basePageIds.value.filter(
-    (pageId) => realtimeCtx.hget('page', pageId, 'group-id') === groupId,
+    (pageId) =>
+      realtimeCtx.hget('page', pageId, 'group-id') === groupId &&
+      realtimeCtx.hget('page', pageId, 'permanent-deletion-date') == null,
   ),
 );
 

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

@@ -113,7 +113,7 @@
 </template>
 
 <script setup lang="ts">
-import { maxGroupNameLength, maxNameLength } from '@deeplib/misc';
+import { maxGroupNameLength, maxNameLength, rolesMap } from '@deeplib/misc';
 import { BREAKPOINT_MD_MIN } from '@stdlib/misc';
 import type { movePage } from 'src/code/api-interface/pages/move';
 import { groupNames } from 'src/code/pages/computed/group-names';
@@ -130,6 +130,7 @@ const dialogRef = ref() as Ref<InstanceType<typeof CustomDialog>>;
 const horizontal = computed(() => uiStore().width >= BREAKPOINT_MD_MIN);
 
 const groupIds = ref<string[]>([]);
+const groupMemberRoles = ref<string[]>([]);
 const destGroupId = ref<string>();
 
 const setAsMainPage = ref(false);
@@ -151,13 +152,20 @@ const realtimeCtx = useRealtimeContext();
 const groupOptions = computed(() => [
   { id: 'new', name: '(New group)' },
   ...groupIds.value
-    .map((groupId) => {
+    .map((groupId, groupIndex) => {
       if (
         realtimeCtx.hget('group', groupId, 'permanent-deletion-date') != null
       ) {
         return;
       }
 
+      if (
+        !rolesMap()[groupMemberRoles.value[groupIndex]]?.permissions
+          .editGroupPages
+      ) {
+        return;
+      }
+
       const groupName = groupNames()(groupId).get();
 
       if (groupName.status === 'success') {
@@ -169,7 +177,6 @@ const groupOptions = computed(() => [
 
 onMounted(async () => {
   groupIds.value = [props.groupId];
-  destGroupId.value = props.groupId;
 
   await Promise.all([
     (async () => {
@@ -178,12 +185,24 @@ onMounted(async () => {
         authStore().userId,
         'recent-group-ids',
       )) ?? [props.groupId];
+
+      groupMemberRoles.value = await Promise.all(
+        groupIds.value.map((groupId) =>
+          internals.realtime.hget(
+            'group-member',
+            `${groupId}:${authStore().userId}`,
+            'role',
+          ),
+        ),
+      );
     })(),
 
     (async () => {
       groupMemberName.value = await selfUserName().getAsync();
     })(),
   ]);
+
+  destGroupId.value = props.groupId;
 });
 
 async function _movePage() {

apps/manager/src/index.ts

@@ -1,7 +1,50 @@
 import './env';
 
+import readline from 'readline';
+
+import { dataAbstraction } from './data/data-abstraction';
 import { initKnex } from './data/knex';
 
 initKnex();
 
-// Write code here
+const readlineInterface = readline.createInterface({
+  input: process.stdin,
+  output: process.stdout,
+});
+
+async function handleCommand(command: string) {
+  const [commandName, ...args] = command.split(' ');
+
+  switch (commandName) {
+    case 'help':
+      console.log('Commands:');
+      console.log('- hget <prefix> <suffix> <field>');
+      console.log('- hset <prefix> <suffix> <field> <value>');
+      break;
+    case 'hget':
+      console.log(
+        await dataAbstraction().hget(args[0] as any, args[1], args[2]),
+      );
+      break;
+    case 'hset':
+      await dataAbstraction().hmset(args[0] as any, args[1], {
+        [args[2]]: args[3],
+      });
+      break;
+  }
+}
+
+function requestCommand() {
+  readlineInterface.question('', async (command) => {
+    if (command === 'exit') {
+      readlineInterface.close();
+      return;
+    }
+
+    await handleCommand(command);
+
+    requestCommand();
+  });
+}
+
+requestCommand();