From 2265ecc97917b58e84f2cbf6dcf0ef00284e9df6 Mon Sep 17 00:00:00 2001 From: Samuel Imolorhe Date: Sun, 3 Dec 2023 20:01:27 +0100 Subject: [PATCH 1/2] Added setting to enable scrollbar in tab list --- .../components/header/header.component.html | 3 +- .../components/header/header.component.ts | 3 +- .../window-switcher.component.html | 1 + .../window-switcher.component.ts | 6 + .../containers/altair/altair.component.html | 2 +- .../modules/altair/utils/settings.schema.json | 4 + .../altair/utils/validate_settings_schema.js | 300 ++++++++++-------- .../src/scss/components/_window-switcher.scss | 12 +- .../src/types/state/settings.interfaces.ts | 5 + 9 files changed, 190 insertions(+), 146 deletions(-) diff --git a/packages/altair-app/src/app/modules/altair/components/header/header.component.html b/packages/altair-app/src/app/modules/altair/components/header/header.component.html index 01eb626dd4..d7c12ac7e7 100644 --- a/packages/altair-app/src/app/modules/altair/components/header/header.component.html +++ b/packages/altair-app/src/app/modules/altair/components/header/header.component.html @@ -1,6 +1,6 @@
@@ -11,6 +11,7 @@ [activeWindowId]="activeWindowId" [closedWindows]="closedWindows" [isElectron]="isElectron" + [enableScrollbar]="settings?.enableTablistScrollbar" (newWindowChange)="newWindowChange.emit($event)" (activeWindowChange)="activeWindowChange.emit($event)" (removeWindowChange)="removeWindowChange.emit($event)" diff --git a/packages/altair-app/src/app/modules/altair/components/header/header.component.ts b/packages/altair-app/src/app/modules/altair/components/header/header.component.ts index 66391a5c8d..37d50c4381 100644 --- a/packages/altair-app/src/app/modules/altair/components/header/header.component.ts +++ b/packages/altair-app/src/app/modules/altair/components/header/header.component.ts @@ -5,6 +5,7 @@ import { EnvironmentState, } from 'altair-graphql-core/build/types/state/environments.interfaces'; import { PerWindowState } from 'altair-graphql-core/build/types/state/per-window.interfaces'; +import { SettingsState } from 'altair-graphql-core/build/types/state/settings.interfaces'; import { WindowState } from 'altair-graphql-core/build/types/state/window.interfaces'; import { externalLink } from '../../utils'; @@ -14,7 +15,6 @@ import { externalLink } from '../../utils'; styles: [], }) export class HeaderComponent { - @Input() experimentalEnabled = false; @Input() windows: WindowState = {}; @Input() windowIds: string[] = []; @Input() closedWindows: PerWindowState[] = []; @@ -23,6 +23,7 @@ export class HeaderComponent { @Input() headerPanels: AltairPanel[] = []; @Input() activeEnvironment?: EnvironmentState; @Input() environments?: EnvironmentsState; + @Input() settings?: SettingsState; @Output() activeWindowChange = new EventEmitter(); @Output() newWindowChange = new EventEmitter(); @Output() removeWindowChange = new EventEmitter(); diff --git a/packages/altair-app/src/app/modules/altair/components/window-switcher/window-switcher.component.html b/packages/altair-app/src/app/modules/altair/components/window-switcher/window-switcher.component.html index 4f220f4d86..ee6c06f396 100644 --- a/packages/altair-app/src/app/modules/altair/components/window-switcher/window-switcher.component.html +++ b/packages/altair-app/src/app/modules/altair/components/window-switcher/window-switcher.component.html @@ -2,6 +2,7 @@ sortablejs [sortablejsOptions]="sortableOptions" class="window-switcher__list" + [ngClass]="{'window-switcher__no-scrollbar': !enableScrollbar}" >
  • Date: Sun, 3 Dec 2023 22:17:37 +0100 Subject: [PATCH 2/2] updated snapshots --- .../__snapshots__/window-switcher.component.spec.ts.snap | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/altair-app/src/app/modules/altair/components/window-switcher/__snapshots__/window-switcher.component.spec.ts.snap b/packages/altair-app/src/app/modules/altair/components/window-switcher/__snapshots__/window-switcher.component.spec.ts.snap index e50f84ce5d..dbaa0db6e1 100644 --- a/packages/altair-app/src/app/modules/altair/components/window-switcher/__snapshots__/window-switcher.component.spec.ts.snap +++ b/packages/altair-app/src/app/modules/altair/components/window-switcher/__snapshots__/window-switcher.component.spec.ts.snap @@ -1,9 +1,11 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`WindowSwitcherComponent should render correctly 1`] = ` - +