intrn(page): remove redundant data

lemredd · Nov 24, 2022 · 098849d · 098849d
1 parent 9a66804
commit 098849d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 24 deletions.
diff --git a/pages/role/read.page.vue b/pages/role/read.page.vue
@@ -88,7 +88,7 @@ const pageContext = inject("pageContext") as PageContext<"deserialized", Require
 const { pageProps } = pageContext
 const { userProfile } = pageProps
 
-const roles = ref<DeserializedRoleDocument>(
+const role = ref<DeserializedRoleDocument>(
 	{
 		...pageProps.role,
 		"data": {
@@ -97,13 +97,6 @@ const roles = ref<DeserializedRoleDocument>(
 	} as DeserializedRoleDocument
 )
 
-const managementInfo = computed<RoleManagementInfo>(
-	() => makeManagementInfo(userProfile, roles.value.data)
-)
-
-const role = ref<DeserializedRoleDocument<"read">>(
-	pageProps.role as DeserializedRoleDocument<"read">
-)
 const receivedErrors = ref<string[]>([])
 const successMessages = ref<string[]>([])
 
@@ -121,17 +114,13 @@ const roleData = computed<RoleAttributes<"deserialized">>({
 		}
 	}
 })
-const isDeleted = computed<boolean>(() => managementInfo.value.isDeleted)
-const password = ref<string>("")
-const flagSelectors = makeFlagSelectorInfos(roleData)
 
+const managementInfo = computed<RoleManagementInfo>(
+	() => makeManagementInfo(userProfile, role.value.data)
+)
 const mayUpdateRole = computed<boolean>(() => managementInfo.value.mayUpdateRole)
-
-const mayArchiveOrRestoreRole = computed<boolean>(
-	() => managementInfo.value.mayArchiveRole || managementInfo.value.mayRestoreRole)
-
-const mayArchiveRole = computed<boolean>(() => !isDeleted.value && mayArchiveOrRestoreRole.value)
-const mayRestoreRole = computed<boolean>(() => isDeleted.value && mayArchiveOrRestoreRole.value)
+const mayArchiveRole = computed<boolean>(() => managementInfo.value.mayArchiveRole)
+const mayRestoreRole = computed<boolean>(() => managementInfo.value.mayRestoreRole)
 
 const {
 	"state": isBeingConfirmed,
@@ -140,11 +129,13 @@ const {
 } = makeSwitch(false)
 
 const nameFieldStatus = ref<FieldStatus>(mayUpdateRole.value ? "enabled" : "disabled")
+const flagSelectors = makeFlagSelectorInfos(roleData)
 const areFlagSelectorsDisabled = computed<boolean>(() => !mayUpdateRole.value)
 
 const hasSubmittedRole = ref<boolean>(true)
 
 const fetcher: Fetcher = new Fetcher()
+const password = ref<string>("")
 async function updateRole() {
 	hasSubmittedRole.value = false
 	await fetcher.update(role.value.data.id, {

diff --git a/pages/tag/read.page.vue b/pages/tag/read.page.vue
@@ -76,10 +76,7 @@ const pageContext = inject("pageContext") as PageContext<"deserialized", "tag">
 const { pageProps } = pageContext
 const { userProfile } = pageProps
 
-const tag = ref<DeserializedTagDocument<"read">>(
-	pageProps.tag as DeserializedTagDocument<"read">
-)
-const tags = ref<DeserializedTagDocument>(
+const tag = ref<DeserializedTagDocument>(
 	{
 		...pageProps.tag,
 		"data": {
@@ -89,7 +86,7 @@ const tags = ref<DeserializedTagDocument>(
 )
 
 const managementInfo = computed<TagManagementInfo>(
-	() => makeManagementInfo(userProfile, tags.value.data)
+	() => makeManagementInfo(userProfile, tag.value.data)
 )
 const mayArchiveTag = computed<boolean>(() => managementInfo.value.mayArchiveTag)
 const mayRestoreTag = computed<boolean>(() => managementInfo.value.mayRestoreTag)
@@ -138,7 +135,7 @@ function updateTag() {
 async function archiveTag() {
 	await fetcher.archive([ tag.value.data.id ])
 	.then(() => {
-		if (!tags.value.data.deletedAt) tags.value.data.deletedAt = new Date()
+		if (!tag.value.data.deletedAt) tag.value.data.deletedAt = new Date()
 
 		fillSuccessMessages(
 			receivedErrors,
@@ -153,7 +150,7 @@ async function archiveTag() {
 async function restoreTag() {
 	await fetcher.restore([ tag.value.data.id ])
 	.then(() => {
-		if (tags.value.data.deletedAt) tags.value.data.deletedAt = null
+		if (tag.value.data.deletedAt) tag.value.data.deletedAt = null
 
 		fillSuccessMessages(
 			receivedErrors,