Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion plugins/love-resources/src/components/Floor.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
</script>

<div class="hulyComponent">
<Header allowFullsize adaptive={'disabled'}>
<Header adaptive={'disabled'}>
<Breadcrumb title={selectedFloor?.name ?? ''} size={'large'} isCurrent />
<svelte:fragment slot="beforeTitle">
<ViewletSelector bind:viewlet bind:preference bind:loading viewletQuery={{ attachTo: lovePlg.class.Floor }} />
Expand Down
11 changes: 5 additions & 6 deletions plugins/workbench-resources/src/components/Applications.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
// limitations under the License.
-->
<script lang="ts">
import { createEventDispatcher } from 'svelte'
import core, { getCurrentAccount, type Ref } from '@hcengineering/core'
import { createQuery } from '@hcengineering/presentation'
import { Scroller, deviceOptionsStore as deviceInfo } from '@hcengineering/ui'
Expand All @@ -27,6 +28,8 @@
export let apps: Application[] = []
export let direction: 'vertical' | 'horizontal' = 'vertical'

const dispatch = createEventDispatcher()

let loaded: boolean = false
let hiddenAppsIds: Array<Ref<Application>> = []
const hiddenAppsIdsQuery = createQuery()
Expand Down Expand Up @@ -66,9 +69,7 @@
label={app.label}
navigator={app._id === active && $deviceInfo.navigator.visible}
on:click={() => {
if (app._id === active) {
$deviceInfo.navigator.visible = !$deviceInfo.navigator.visible
}
if (app._id === active) dispatch('toggleNav')
}}
/>
</NavLink>
Expand All @@ -82,9 +83,7 @@
label={app.label}
navigator={app._id === active && $deviceInfo.navigator.visible}
on:click={() => {
if (app._id === active) {
$deviceInfo.navigator.visible = !$deviceInfo.navigator.visible
}
if (app._id === active) dispatch('toggleNav')
}}
/>
</NavLink>
Expand Down
40 changes: 28 additions & 12 deletions plugins/workbench-resources/src/components/Workbench.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,26 @@

const linkProviders = client.getModel().findAllSync(view.mixin.LinkIdProvider, {})

$deviceInfo.navigator.visible = getMetadata(workbench.metadata.NavigationExpandedDefault) ?? true
$deviceInfo.aside.visible = getMetadata(workbench.metadata.NavigationExpandedDefault) ?? true
const defaultNavigator = !(getMetadata(workbench.metadata.NavigationExpandedDefault) ?? true)
const savedNavigator = localStorage.getItem('hiddenNavigator')
const savedAside = localStorage.getItem('hiddenAside')
let hiddenNavigator: boolean = savedNavigator !== null ? savedNavigator === 'true' : defaultNavigator
let hiddenAside: boolean = savedAside !== null ? savedAside === 'true' : defaultNavigator
$deviceInfo.navigator.visible = !hiddenNavigator
$deviceInfo.aside.visible = !hiddenAside
sidebarStore.subscribe((sidebar) => {
if (!$deviceInfo.aside.float) {
hiddenAside = sidebar.variant === SidebarVariant.MINI
localStorage.setItem('hiddenAside', `${hiddenAside}`)
}
})

async function toggleNav (): Promise<void> {
$deviceInfo.navigator.visible = !$deviceInfo.navigator.visible
if (!$deviceInfo.navigator.float) {
hiddenNavigator = !$deviceInfo.navigator.visible
localStorage.setItem('hiddenNavigator', `${hiddenNavigator}`)
}
closeTooltip()
if (currentApplication && navigatorModel) {
await tick()
Expand Down Expand Up @@ -638,25 +653,21 @@

$deviceInfo.navigator.float = workbenchWidth <= HIDE_NAVIGATOR
const checkWorkbenchWidth = (): void => {
if (workbenchWidth <= HIDE_NAVIGATOR && !$deviceInfo.navigator.float && $deviceInfo.navigator.visible) {
if (workbenchWidth <= HIDE_NAVIGATOR && !$deviceInfo.navigator.float) {
$deviceInfo.navigator.visible = false
$deviceInfo.navigator.float = true
} else if (workbenchWidth > HIDE_NAVIGATOR && $deviceInfo.navigator.float) {
if (getMetadata(workbench.metadata.NavigationExpandedDefault) === undefined) {
$deviceInfo.navigator.float = false
$deviceInfo.navigator.visible = true
}
$deviceInfo.navigator.float = false
$deviceInfo.navigator.visible = !hiddenNavigator
}
}
checkWorkbenchWidth()
$: if ($deviceInfo.docWidth <= HIDE_ASIDE && !$deviceInfo.aside.float) {
$deviceInfo.aside.visible = false
$deviceInfo.aside.float = true
} else if ($deviceInfo.docWidth > HIDE_ASIDE && $deviceInfo.aside.float) {
if (getMetadata(workbench.metadata.NavigationExpandedDefault) === undefined) {
$deviceInfo.aside.float = false
$deviceInfo.aside.visible = true
}
$deviceInfo.aside.float = false
$deviceInfo.aside.visible = !hiddenAside
}
const checkOnHide = (): void => {
if ($deviceInfo.navigator.visible && $deviceInfo.navigator.float) $deviceInfo.navigator.visible = false
Expand Down Expand Up @@ -847,7 +858,12 @@
notify={hasInboxNotifications}
/>
</NavLink>
<Applications {apps} active={currentApplication?._id} direction={$deviceInfo.navigator.direction} />
<Applications
{apps}
active={currentApplication?._id}
direction={$deviceInfo.navigator.direction}
on:toggleNav={toggleNav}
/>
</div>
<div
class="info-box {$deviceInfo.navigator.direction}"
Expand Down
4 changes: 0 additions & 4 deletions tests/sanity/tests/tracker/subissues.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,21 @@ import {
} from './tracker.utils'
import { Issue, NewIssue } from '../model/tracker/types'
import { IssuesDetailsPage } from '../model/tracker/issues-details-page'
import { CommonTrackerPage } from '../model/tracker/common-tracker-page'

test.use({
storageState: PlatformSetting
})
test.describe('Tracker sub-issues tests', () => {
let issuesPage: IssuesPage
let issuesDetailsPage: IssuesDetailsPage
let commonTrackerPage: CommonTrackerPage

test.beforeEach(async ({ page }) => {
issuesPage = new IssuesPage(page)
issuesDetailsPage = new IssuesDetailsPage(page)
commonTrackerPage = new CommonTrackerPage(page)
await (await page.goto(`${PlatformURI}/workbench/sanity-ws`))?.finished()
})

test('create sub-issue', async ({ page }) => {
await commonTrackerPage.clickOnApplicationButton()
const props = {
name: `issue-${generateId(5)}`,
description: 'description',
Expand Down
Loading