Skip to content

fix: Make zoom level a user preference (#7183) #8460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexmt merged 1 commit into from
Mar 10, 2022
Merged

fix: Make zoom level a user preference (#7183) #8460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 5 additions & 6 deletions ui/src/app/applications/components/application-details/application-details.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ interface ApplicationDetailsState {
revision?: string;
groupedResources?: ResourceStatus[];
slidingPanelPage?: number;
zoom?: number;
filteredGraph?: any[];
}

Expand Down Expand Up @@ -70,7 +69,7 @@ export class ApplicationDetails extends React.Component<RouteComponentProps<{nam

constructor(props: RouteComponentProps<{name: string}>) {
super(props);
this.state = {page: 0, groupedResources: [], slidingPanelPage: 0, zoom: 1.0, filteredGraph: []};
this.state = {page: 0, groupedResources: [], slidingPanelPage: 0, filteredGraph: []};
}

private get showOperationState() {
Expand Down Expand Up @@ -213,15 +212,15 @@ export class ApplicationDetails extends React.Component<RouteComponentProps<{nam
)
);
const {Tree, Pods, Network, List} = AppsDetailsViewKey;
const zoomNum = (this.state.zoom * 100).toFixed(0);
const zoomNum = ((pref.zoom || 1.0) * 100).toFixed(0);
const setZoom = (s: number) => {
let targetZoom: number = this.state.zoom + s;
let targetZoom: number = pref.zoom + s;
if (targetZoom <= 0.05) {
targetZoom = 0.1;
} else if (targetZoom > 2.0) {
targetZoom = 2.0;
}
this.setState({zoom: targetZoom});
services.viewPreferences.updatePreferences({appDetails: {...pref, zoom: targetZoom}});
};
const setFilterGraph = (filterGraph: any[]) => {
this.setState({filteredGraph: filterGraph});
Expand Down Expand Up @@ -322,7 +321,7 @@ export class ApplicationDetails extends React.Component<RouteComponentProps<{nam
useNetworkingHierarchy={pref.view === 'network'}
onClearFilter={clearFilter}
onGroupdNodeClick={groupdedNodeIds => openGroupNodeDetails(groupdedNodeIds)}
zoom={this.state.zoom}
zoom={pref.zoom || 1.0}
filters={pref.resourceFilter}
setTreeFilterGraph={setFilterGraph}
/>
Expand Down
4 changes: 3 additions & 1 deletion ui/src/app/shared/services/view-preferences-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export interface AppDetailsPreferences {
hideFilters: boolean;
wrapLines: boolean;
groupNodes?: boolean;
zoom?: number;
}

export interface PodViewPreferences {
Expand Down Expand Up @@ -110,7 +111,8 @@ const DEFAULT_PREFERENCES: ViewPreferences = {
},
darkMode: false,
followLogs: false,
wrapLines: false
wrapLines: false,
zoom: 1.0
},
appList: {
view: 'tiles' as AppsListViewType,
Expand Down