fix: Fix sync issues with Orgs (#14)

beclab · May 11, 2024 · 3e48ff7 · 3e48ff7
2 parents 377f7e1 + 2d8989e
commit 3e48ff7
Show file tree

Hide file tree

Showing 13 changed files with 139 additions and 370 deletions.
diff --git a/package.json b/package.json
@@ -60,7 +60,7 @@
         "dev": "PL_SERVER_URL=http://127.0.0.1:3000 SERVER_PROXY_NNME=zhaohuaiyuan lerna run --scope '@didvault/{server,app,mockbfl,notification,mockws}' --parallel dev",
         "dev:1": "PL_SERVER_URL=http://127.0.0.1:3000 lerna run --scope '@didvault/{server,mockbfl}' --parallel dev",
         "dev:2": "PL_SERVER_URL=http://127.0.0.1:3010 lerna run --scope '@didvault/{server2,mockbfl2}' --parallel dev",
-        "dev:desktop": "PL_SERVER_URL=http://127.0.0.1:3000 SERVER_PROXY_NNME=local.guojianmin lerna run --scope '@didvault/app' --parallel dev:desktop",
+        "dev:desktop": "PL_SERVER_URL=http://127.0.0.1:3000 SERVER_PROXY_NNME=zhaohuaiyuan lerna run --scope '@didvault/app' --parallel dev:desktop",
         "dev:files": "PL_SERVER_URL=http://127.0.0.1:3000 SERVER_PROXY_NNME=zhaohuaiyuan lerna run --scope '@didvault/app' --parallel dev:files",
         "clean:2": "lerna run --scope '@didvault/{server,server2,mockbfl,mockbfl2,sign2}' --parallel clean",
         "dev:mobile": "PL_SERVER_URL=http://127.0.0.1:3000 SERVER_PROXY_NNME=zhaohuaiyuan lerna run --scope '@didvault/app' --parallel dev:mobile",

diff --git a/packages/app/src/components/files/ListingItem.vue b/packages/app/src/components/files/ListingItem.vue
@@ -156,13 +156,14 @@ export default defineComponent({
 			}
 
 			if ((props.type == 'folder' || !props.type) && props.fileSize) {
-				return humanStorageSize(props.fileSize) === '4.0KB'
-					? '0KB'
-					: humanStorageSize(props.fileSize);
+				return '-';
+				// return humanStorageSize(props.fileSize) === '4.0KB'
+				// 	? '0KB'
+				// 	: humanStorageSize(props.fileSize);
 			}
 
 			return humanStorageSize(props.size) === '4.0KB'
-				? '0KB'
+				? '-'
 				: humanStorageSize(props.size);
 		};
 

diff --git a/packages/app/src/components/files/prompts/InfoDialog.vue b/packages/app/src/components/files/prompts/InfoDialog.vue
@@ -82,6 +82,10 @@ const show = ref(true);
 const store = useDataStore();
 
 const humanSize = computed(function () {
+	if (fileType.value === 'folder') {
+		return '-';
+	}
+
 	if (store.selectedCount === 0) {
 		return humanStorageSize(store.req.size);
 	}
@@ -96,14 +100,15 @@ const humanSize = computed(function () {
 });
 
 const humanNumber = computed(function () {
-	if (store.selectedCount === 0) {
-		return 0;
-	}
-	const item = store.req.items[store.selected[0]];
-	let folder = `${item.numDirs} ${item.numDirs > 1 ? 'folders, ' : 'folder, '}`;
-	let file = `${item.numFiles} ${item.numFiles > 1 ? 'files' : 'file'}`;
-
-	return `${item.numDirs > 0 ? folder : ''} ${file}`;
+	return '-';
+	// if (store.selectedCount === 0) {
+	// 	return 0;
+	// }
+	// const item = store.req.items[store.selected[0]];
+	// let folder = `${item.numDirs} ${item.numDirs > 1 ? 'folders, ' : 'folder, '}`;
+	// let file = `${item.numFiles} ${item.numFiles > 1 ? 'files' : 'file'}`;
+
+	// return `${item.numDirs > 0 ? folder : ''} ${file}`;
 });
 
 const name = computed(function () {

diff --git a/packages/app/src/pages/Web/Orgs/invites/OrgInvitesList.vue b/packages/app/src/pages/Web/Orgs/invites/OrgInvitesList.vue
@@ -1,30 +1,9 @@
 <template>
-	<div style="width: 100%; height: 60px">
-		<div class="searchWrap" v-if="filterShowing === 'search'">
-			<q-input
-				dense
-				class="searchInput q-px-sm"
-				v-model="filterInput"
-				debounce="500"
-				borderless
-				placeholder="Search"
-				@update:model-value="search"
-			>
-				<template v-slot:prepend>
-					<q-icon name="sym_r_search"> </q-icon>
-				</template>
-				<template v-slot:append>
-					<q-icon class="closeIcon" name="sym_r_close" @click="closeSearch">
-						<q-tooltip> {{ t('buttons.close') }} </q-tooltip>
-					</q-icon>
-				</template>
-			</q-input>
-		</div>
-
-		<div
-			class="row justify-between items-center"
-			v-if="filterShowing === 'default'"
-		>
+	<div
+		class="row justify-between items-center"
+		style="width: 100%; height: 60px"
+	>
+		<div class="row justify-between items-center">
 			<div class="row items-center q-pl-md">
 				<q-icon
 					v-if="isMobile"
@@ -52,17 +31,6 @@
 					{{ heading.title }}
 				</div>
 			</div>
-
-			<div class="row items-center q-py-xs q-my-md">
-				<q-icon
-					class="q-mr-md cursor-pointer"
-					name="sym_r_search"
-					size="24px"
-					@click="() => (filterShowing = 'search')"
-				>
-					<q-tooltip>{{ t('search') }}</q-tooltip>
-				</q-icon>
-			</div>
 		</div>
 	</div>
 
@@ -114,41 +82,29 @@ import { debounce, Invite } from '@didvault/sdk/src/core';
 import { scrollBarStyle } from '../../../../utils/contact';
 import { useMenuStore } from '../../../../stores/menu';
 import OrgInviteItem from './OrgInviteItem.vue';
-// import VaultsMenu from '../../../../layouts/TermipassLayout/VaultsMenu.vue';
 import { busOn, busOff } from '../../../../utils/bus';
 import { useI18n } from 'vue-i18n';
 
 export default defineComponent({
 	name: 'OrgInvitesIndex',
 	components: {
 		OrgInviteItem
-		// VaultsMenu
 	},
 	setup() {
 		const $q = useQuasar();
 		const router = useRouter();
 		const route = useRoute();
 		const meunStore = useMenuStore();
-		const values = ref('');
-		const vaultItemRef = ref();
-		const showArrow = ref(false);
-		const arrowItemObj = ref({});
-		const contentStyle = ref({
-			height: 0
-		});
-		const checkBoxArr = ref([]);
-		const filterInput = ref('');
-		const filterShowing = ref('default');
 		const isMobile = ref(
 			process.env.PLATFORM == 'MOBILE' ||
 				process.env.PLATFORM == 'BEX' ||
 				$q.platform.is.mobile
 		);
-		const platform = ref(process.env.PLATFORM);
 		const org = ref();
 
 		const initOrg = () => {
 			org.value = app.orgs.find((org) => org.id == meunStore.org_id);
+			console.log('initOrginitOrg', org.value);
 		};
 
 		const heading = computed(function () {
@@ -160,13 +116,7 @@ export default defineComponent({
 
 		function _getItems() {
 			initOrg();
-			const memFilter = filterInput.value.toLowerCase();
-			console.log('org.valueorg.value', org.value);
-			const invites = memFilter
-				? org.value!.invites.filter(({ did }) =>
-						did.toLowerCase().includes(memFilter)
-				  )
-				: org.value!.invites;
+			const invites = org.value!.invites;
 			return invites;
 		}
 
@@ -189,14 +139,6 @@ export default defineComponent({
 			updateItems();
 		}
 
-		function closeSearch() {
-			if (filterInput?.value) {
-				filterInput.value = '';
-				updateItems();
-			}
-			filterShowing.value = 'default';
-		}
-
 		const goBack = () => {
 			router.go(-1);
 		};
@@ -224,21 +166,11 @@ export default defineComponent({
 			selectItem,
 			isSelected,
 			heading,
-			filterShowing,
-			filterInput,
 			org,
-			values,
-			showArrow,
-			arrowItemObj,
-			vaultItemRef,
-			contentStyle,
-			checkBoxArr,
 			search,
-			closeSearch,
 			isMobile,
 			goBack,
 			scrollBarStyle,
-			platform,
 			t
 		};
 	}

diff --git a/packages/app/src/pages/Web/Orgs/invites/OrgInvitesView.vue b/packages/app/src/pages/Web/Orgs/invites/OrgInvitesView.vue
@@ -118,8 +118,6 @@ export default defineComponent({
 		const router = useRouter();
 		const $q = useQuasar();
 		const meunStore = useMenuStore();
-		const now = new Date();
-		const nameRef = ref();
 		const invite = ref();
 		const isMobile = ref(
 			process.env.PLATFORM == 'MOBILE' ||
@@ -185,6 +183,7 @@ export default defineComponent({
 				}
 				invite.value =
 					org.value && org.value.getInvite(route.params.org_type as string);
+
 				if (newVaule) {
 					updateSecert();
 				}
@@ -200,7 +199,12 @@ export default defineComponent({
 						invite.value!.purpose
 					)
 				)[0];
-				secret.value = newInvite && newInvite.secret!;
+				if (newInvite) {
+					router.replace({
+						path: '/org/Invites/' + (newInvite.id ? newInvite.id : '')
+					});
+					secret.value = newInvite.secret!;
+				}
 			} catch (e) {
 				notifyFailed(e.message);
 			}
@@ -222,17 +226,18 @@ export default defineComponent({
 			}
 		}
 
-		function stateUpdate() {
-			initOrg();
-			invite.value = getInvite();
+		async function stateUpdate() {
+			await initOrg();
+			invite.value = await getInvite();
 		}
 
 		const goBack = () => {
 			router.go(-1);
 		};
 
 		onMounted(() => {
-			busOn('appSubscribe', stateUpdate);
+			stateUpdate();
+			busOn('orgSubscribe', stateUpdate);
 			invite.value =
 				org.value && org.value.getInvite(route.params.org_type as string);
 			updateSecert();
@@ -243,7 +248,7 @@ export default defineComponent({
 		});
 
 		onUnmounted(() => {
-			busOff('appSubscribe', stateUpdate);
+			busOff('orgSubscribe', stateUpdate);
 		});
 
 		let updateItems = debounce(() => {
@@ -258,9 +263,7 @@ export default defineComponent({
 			onConfirm,
 			org,
 			invite,
-			now,
 			secret,
-			nameRef,
 			status,
 			isMobile,
 			goBack,

diff --git a/packages/app/src/pages/Web/Orgs/members/OrgMemberItem.vue b/packages/app/src/pages/Web/Orgs/members/OrgMemberItem.vue
@@ -1,9 +1,6 @@
 <template>
 	<div class="member_wrap row items-center justify-center">
-		<div
-			class="stretch row items-center justify-start"
-			:class="isSelected ? 'memberActive' : ''"
-		>
+		<div class="stretch row items-center justify-start">
 			<div class="q-mr-md avator">
 				<TerminusAvatar
 					:info="userStore.getUserTerminusInfo(member.id || '')"
@@ -14,7 +11,7 @@
 				<div class="did text-subtitle2">{{ member.name }}</div>
 				<div>
 					<!-- TODO: snowning.com error-->
-					<span>@{{ getCurrentDomain }}</span>
+					<span>@{{ userStore.getCurrentDomain() }}</span>
 					<span
 						class="tag text-3ubtitle3 owner"
 						v-if="member.role === OrgRole.Owner"
@@ -43,7 +40,6 @@ import { app } from '../../../../globals';
 import { useMenuStore } from '../../../../stores/menu';
 import { useUserStore } from '../../../../stores/user';
 import { useI18n } from 'vue-i18n';
-import { TerminusDefaultDomain } from '@bytetrade/core';
 
 export default defineComponent({
 	name: 'MemberItem',
@@ -74,23 +70,13 @@ export default defineComponent({
 
 		const { t } = useI18n();
 
-		const getCurrentDomain = computed(() => {
-			const current_user = userStore.current_user;
-			if (current_user && current_user.name.indexOf('@')) {
-				return current_user.name.split('@')[1];
-			} else {
-				return TerminusDefaultDomain;
-			}
-		});
-
 		return {
 			org,
 			OrgMemberStatus,
 			OrgRole,
 			groups,
 			userStore,
-			t,
-			getCurrentDomain
+			t
 		};
 	}
 });
@@ -99,19 +85,11 @@ export default defineComponent({
 <style lang="scss" scoped>
 .member_wrap {
 	width: 94%;
-	height: 80px;
 
 	.stretch {
 		width: 96%;
-		height: 64px;
+		height: 58px;
 		border-radius: 8px;
-		padding-left: 8px;
-		&.memberActive {
-			background: $grey-1;
-		}
-		&:hover {
-			background: $grey-1;
-		}
 		.avator {
 			width: 28px;
 			height: 28px;