LESA/custum-hyprpanel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Log undefined menu models and action groups. Fix null errors for workspaces and update array property accessors for services. (#583)

Browse Source 
* Handle null values for actionGroup.

* Add logs

* more logs

* Fix property accessors and workspace null errors.
This commit is contained in:
Jas Singh
2024-12-21 14:53:26 -08:00
committed by GitHub
parent 006e9543f0
commit da0299f06b
6 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/components/bar/modules/workspaces/helpers/index.ts
View File

@@ -33,9 +33,13 @@ export const getWorkspacesForMonitor = (
const monitorMap: MonitorMap = {};
const workspaceMonitorList = workspaceList.map((m) => {
return { id: m.monitor.id, name: m.monitor.name };
});
const wsList = workspaceList ?? [];
const workspaceMonitorList = wsList
.filter((m) => m !== null)
.map((m) => {
return { id: m.monitor?.id, name: m.monitor?.name };
});
const monitors = [...new Map([...workspaceMonitorList, ...monitorList].map((item) => [item.id, item])).values()];
@@ -150,7 +154,7 @@ const navigateWorkspace = (
if (workspacesList.length === 0) return;
const currentIndex = workspacesList.indexOf(hyprlandService.focusedWorkspace.id);
const currentIndex = workspacesList.indexOf(hyprlandService.focusedWorkspace?.id);
const step = direction === 'next' ? 1 : -1;
let newIndex = (currentIndex + step + workspacesList.length) % workspacesList.length;
let attempts = 0;
@@ -283,7 +287,8 @@ export const getWorkspacesToRender = (
let allWorkspaces = range(totalWorkspaces || 8);
const activeWorkspaces = workspaceList.map((ws) => ws.id);
const workspaceMonitorList = workspaceList.map((ws) => {
const wsList = workspaceList ?? [];
const workspaceMonitorList = wsList.map((ws) => {
return {
id: ws.monitor?.id || -1,
name: ws.monitor?.name || '',
@@ -310,7 +315,7 @@ export const getWorkspacesToRender = (
if (isMonitorSpecific) {
const workspacesInRange = range(totalWorkspaces).filter((ws) => {
return getWorkspacesForMonitor(ws, workspaceRules, monitor, workspaceList, monitorList);
return getWorkspacesForMonitor(ws, workspaceRules, monitor, wsList, monitorList);
});
allWorkspaces = [...new Set([...activesForMonitor, ...workspacesInRange])];