Skip to content

Commit f54c5eb

Browse files
fix: various bugs
1 parent 1d64ebb commit f54c5eb

File tree

5 files changed

+26
-19
lines changed

5 files changed

+26
-19
lines changed

frontend/src/components/ContextMenu.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ const childWidth = ref(null)
6767
const childHeight = ref(null)
6868
6969
onMounted(() => {
70-
parentWidth.value = contextMenu.value.parentElement.clientWidth
71-
parentHeight.value = contextMenu.value.parentElement.clientHeight
70+
parentWidth.value = window.document.body.clientWidth
71+
parentHeight.value = window.document.body.clientHeight
7272
childWidth.value = contextMenu.value.clientWidth
7373
childHeight.value = contextMenu.value.clientHeight
7474
calculateY()

frontend/src/components/Dialogs.vue

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,12 @@
3131
}
3232
"
3333
/>
34-
<ShareDialog v-if="dialog === 's'" v-model="dialog" :entity="selections[0]" />
34+
<ShareDialog
35+
v-if="dialog === 's'"
36+
v-model="dialog"
37+
:entity="selections[0]"
38+
@success="getEntities.fetch(getEntities.params)"
39+
/>
3540

3641
<!-- Deletion dialogs -->
3742
<GeneralDialog

frontend/src/components/DocEditor/components/DocMenuAndInfoBar.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<span class="col-span-1 text-gray-600">Type</span>
7272
<span class="col-span-1">Frappe Doc</span>
7373
<span class="col-span-1 text-gray-600">Size</span>
74-
<span class="col-span-1">{{ entity.file_size_pretty }}</span>
74+
<span class="col-span-1">{{ formatSize(entity.file_size) }}</span>
7575
<span class="col-span-1 text-gray-600">Modified</span>
7676
<span class="col-span-1">{{ formatDate(entity.modified) }}</span>
7777
<span class="col-span-1 text-gray-600">Created</span>
@@ -898,7 +898,7 @@ import { useTimeAgo } from "@vueuse/core"
898898
import * as Y from "yjs"
899899
import { TiptapTransformer } from "@hocuspocus/transformer"
900900
import { fromUint8Array, toUint8Array } from "js-base64"
901-
import { formatDate } from "@/utils/format"
901+
import { formatDate, formatSize } from "@/utils/format"
902902
import AnnotationList from "../components/AnnotationList.vue"
903903
import Clock from "../../EspressoIcons/Clock.vue"
904904
import ActivityTree from "../../ActivityTree.vue"
@@ -992,6 +992,7 @@ export default {
992992
sharedWithList: userList.data,
993993
tab: this.entity?.write ? 0 : 4,
994994
formatDate,
995+
formatSize,
995996
docFont: this.settings.docFont,
996997
tabs: [
997998
{

frontend/src/components/ShareDialog/ShareDialog.vue

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,7 @@ function addShares() {
361361
getUsersWithAccess.data.push({ ...user, ...access })
362362
}
363363
sharedUsers.value = []
364+
emit("success")
364365
}
365366
const invalidAfter = ref()
366367
@@ -392,19 +393,17 @@ watch([generalAccessType, generalAccessLevel], ([type, level]) => {
392393
method: "unshare",
393394
})
394395
}
395-
console.log(level)
396-
setTimeout(
397-
() =>
398-
updateAccess.submit({
399-
entity_name: props.entity.name,
400-
user: level.value === "public" ? "" : "$TEAM",
401-
read: 1,
402-
comment: 1,
403-
share: 1,
404-
write: type.value === "editor",
405-
}),
406-
1000
407-
)
396+
setTimeout(() => {
397+
updateAccess.submit({
398+
entity_name: props.entity.name,
399+
user: level.value === "public" ? "" : "$TEAM",
400+
read: 1,
401+
comment: 1,
402+
share: 1,
403+
write: type.value === "editor",
404+
})
405+
emit("success")
406+
}, 1000)
408407
})
409408
410409
const openDialog = computed({

frontend/src/pages/Document.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import { useRoute } from "vue-router"
4141
import { useStore } from "vuex"
4242
import { createResource } from "frappe-ui"
4343
import { watchDebounced } from "@vueuse/core"
44-
import { setBreadCrumbs } from "@/utils/files"
44+
import { setBreadCrumbs, prettyData } from "@/utils/files"
4545
import { allUsers } from "@/resources/permissions"
4646
import router from "@/router"
4747
import LoadingIndicator from "frappe-ui/src/components/LoadingIndicator.vue"
@@ -119,6 +119,8 @@ const onSuccess = (data) => {
119119
if (!("docSpellcheck" in settings.value)) {
120120
settings.value.docSpellcheck = 1
121121
}
122+
console.log(prettyData([entity])[0])
123+
document.setData(prettyData([entity])[0])
122124
title.value = data.title
123125
oldTitle.value = data.title
124126
yjsContent.value = toUint8Array(data.content)

0 commit comments

Comments
 (0)