[System Monitor] Improve onAction()

extensions/system-monitor/CHANGELOG.md

@@ -1,5 +1,9 @@
 # System Monitor Changelog
 
+## [Improvements] - {PR_MERGE_DATE}
+
+- Improve the `onAction()` so it can open the Activity Monitor directly without selecting a tab
+
 ## [New Additions] - 2025-03-11
 
 - Add a new menubar feature to display system monitor information in the menubar

extensions/system-monitor/src/SystemInfo/SystemInfo.tsx

@@ -12,7 +12,7 @@ export default function SystemInfo() {
       title="System Info"
       icon={Icon.Finder}
       detail={<SystemInfoDetail />}
-      actions={<Actions radioButtonNumber={4} />}
+      actions={<Actions />}
     />
   );
 }

extensions/system-monitor/src/components/Actions.tsx

@@ -3,13 +3,13 @@ import { runAppleScript } from "@raycast/utils";
 import { openActivityMonitorAppleScript } from "../utils";
 
 interface ActionsProps {
-  radioButtonNumber: number;
+  radioButtonNumber?: number;
 }
 
 export const Actions = ({ radioButtonNumber }: ActionsProps) => {
   const handleRunAppleScript = async () => {
     try {
-      await runAppleScript(openActivityMonitorAppleScript(radioButtonNumber));
+      await runAppleScript(openActivityMonitorAppleScript(radioButtonNumber ?? null));
       await closeMainWindow();
     } catch (error) {
       await showToast({

extensions/system-monitor/src/menubar-system-monitor.tsx

@@ -20,6 +20,7 @@ export default function Command() {
   } = usePromise(async () => {
     const osInfo = await getOSInfo();
     const storage = await calculateDiskStorage();
+
     return { osInfo, storage };
   });
 
@@ -102,9 +103,10 @@ export default function Command() {
           title="macOS"
           subtitle={`${systemInfo?.osInfo.release}` || "Loading..."}
           icon={Icon.Finder}
-          onAction={() => {}}
+          onAction={() => runAppleScript(openActivityMonitorAppleScript())}
         />
       </MenuBarExtra.Section>
+
       <MenuBarExtra.Section title="Storage">
         {systemInfo?.storage.map((disk, index) => (
           <MenuBarExtra.Item
@@ -116,6 +118,7 @@ export default function Command() {
           />
         ))}
       </MenuBarExtra.Section>
+
       <MenuBarExtra.Section title="CPU">
         <MenuBarExtra.Item
           title="CPU Usage"
@@ -124,6 +127,7 @@ export default function Command() {
           onAction={() => runAppleScript(openActivityMonitorAppleScript(1))}
         />
       </MenuBarExtra.Section>
+
       <MenuBarExtra.Section title="Memory">
         <MenuBarExtra.Item
           title="Memory Usage"
@@ -132,21 +136,24 @@ export default function Command() {
           onAction={() => runAppleScript(openActivityMonitorAppleScript(2))}
         />
       </MenuBarExtra.Section>
+
       <MenuBarExtra.Section title="Network">
         <MenuBarExtra.Item
           title="Network Usage"
           subtitle={
-            `↓ ${networkUsage?.download !== undefined ? formatBytes(networkUsage.download) : "0 B"}/s ↑ ${networkUsage?.upload !== undefined ? formatBytes(networkUsage.upload) : "0 B"}/s` ||
-            "Loading..."
+            `↓ ${networkUsage?.download !== undefined ? formatBytes(networkUsage.download) : "0 B"}/s ↑ ${
+              networkUsage?.upload !== undefined ? formatBytes(networkUsage.upload) : "0 B"
+            }/s` || "Loading..."
           }
           icon={Icon.Network}
           onAction={() => runAppleScript(openActivityMonitorAppleScript(5))}
         />
       </MenuBarExtra.Section>
+
       <MenuBarExtra.Section title="Power">
         <MenuBarExtra.Item
           title="Battery"
-          subtitle={batteryData?.batteryData ? `${batteryData?.batteryData?.batteryLevel} %` : "Loading…"}
+          subtitle={batteryData?.batteryData ? `${batteryData?.batteryData?.batteryLevel} %` : "Loading..."}
           icon={Icon.Plug}
           onAction={() => runAppleScript(openActivityMonitorAppleScript(3))}
         />

extensions/system-monitor/src/utils.ts

@@ -49,7 +49,15 @@ export const convertMinutesToHours = (minutes: number): string => {
   return `${`0${(minutes / 60) ^ 0}`.slice(-2)}:${`0${minutes % 60}`.slice(-2)}`;
 };
 
-export const openActivityMonitorAppleScript = (radioButtonNumber: number) => {
+export const openActivityMonitorAppleScript = (radioButtonNumber?: number | null): string => {
+  if (!radioButtonNumber) {
+    return `
+    tell application "Activity Monitor"
+      activate
+    end tell
+  `;
+  }
+
   return `
   tell application "Activity Monitor"
     activate