Remove outdated aside (#7405)

This commit is contained in:
Denis Bykhov
2024-12-10 10:05:45 +07:00
committed by GitHub
parent bec1c70f21
commit fcfaba492e
4 changed files with 2 additions and 68 deletions
@@ -136,7 +136,6 @@
let currentSpecial: string | undefined
let currentQuery: Record<string, string | null> | undefined
let specialComponent: SpecialNavModel | undefined
let asideId: string | undefined
let currentFragment: string | undefined = ''
let currentApplication: Application | undefined
@@ -374,8 +373,6 @@
loc.path[4] = currentSpecial
} else if (loc.path[3] === resolved.defaultLocation.path[3]) {
loc.path[4] = resolved.defaultLocation.path[4]
} else {
loc.path[4] = asideId as string
}
} else {
loc.path.length = 4
@@ -512,10 +509,6 @@
}
}
if (special !== currentSpecial && (navigatorModel?.aside || currentApplication?.aside)) {
asideId = special
}
if (app !== undefined) {
localStorage.setItem(`${locationStorageKeyId}_${app}`, originalLoc)
}
@@ -589,21 +582,12 @@
specialComponent = undefined
// eslint-disable-next-line no-fallthrough
case 3:
asideId = undefined
if (currentSpace !== undefined) {
specialComponent = undefined
}
}
}
function closeAside (): void {
const loc = getLocation()
loc.path.length = 4
asideId = undefined
checkOnHide()
navigate(loc)
}
async function updateSpace (spaceId?: Ref<Space>): Promise<void> {
if (spaceId === currentSpace) return
clear(2)
@@ -620,14 +604,11 @@
function setSpaceSpecial (spaceSpecial: string | undefined): void {
if (currentSpecial !== undefined && spaceSpecial === currentSpecial) return
if (asideId !== undefined && spaceSpecial === asideId) return
clear(3)
if (spaceSpecial === undefined) return
specialComponent = getSpecialComponent(spaceSpecial)
if (specialComponent !== undefined) {
currentSpecial = spaceSpecial
} else if (navigatorModel?.aside !== undefined || currentApplication?.aside !== undefined) {
asideId = spaceSpecial
}
}
@@ -647,7 +628,6 @@
}
}
let aside: HTMLElement
let cover: HTMLElement
let workbenchWidth: number = $deviceInfo.docWidth
@@ -762,14 +742,6 @@
person && client.getHierarchy().hasMixin(person, contact.mixin.Employee)
? !client.getHierarchy().as(person, contact.mixin.Employee).active
: false
let asideComponent: AnyComponent | undefined
$: if (asideId !== undefined && navigatorModel !== undefined) {
asideComponent = navigatorModel?.aside ?? currentApplication?.aside
} else {
asideComponent = undefined
}
</script>
{#if person && deactivated && !isAdminUser()}
@@ -1001,11 +973,8 @@
<Component
is={currentApplication.component}
props={{
currentSpace,
asideId,
asideComponent: currentApplication?.aside
currentSpace
}}
on:close={closeAside}
/>
{:else if specialComponent}
<Component
@@ -1035,12 +1004,6 @@
<SpaceView {currentSpace} {currentView} {createItemDialog} {createItemLabel} />
{/if}
</div>
{#if asideComponent !== undefined}
<Separator name={'workbench'} index={1} color={'transparent'} separatorSize={0} short />
<div class="antiPanel-component antiComponent aside" bind:this={aside}>
<Component is={asideComponent} props={{ currentSpace, _id: asideId }} on:close={closeAside} />
</div>
{/if}
</div>
{#if !$deviceInfo.aside.float}
{#if $sidebarStore.variant === SidebarVariant.EXPANDED}