@parca/profile 0.16.410 → 0.16.411

package/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.16.411](https://github.com/parca-dev/parca/compare/@parca/profile@0.16.410...@parca/profile@0.16.411) (2024-07-15)
+
+**Note:** Version bump only for package @parca/profile
+
 ## [0.16.410](https://github.com/parca-dev/parca/compare/@parca/profile@0.16.409...@parca/profile@0.16.410) (2024-07-11)
 
 **Note:** Version bump only for package @parca/profile

package/dist/ProfileMetricsGraph/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/ProfileMetricsGraph/index.tsx"],"names":[],"mappings":"AAeA,OAAO,EAAC,QAAQ,EAAC,MAAM,0BAA0B,CAAC;AAGlD,OAAO,EAAW,KAAK,EAAE,kBAAkB,EAAE,kBAAkB,EAAY,MAAM,eAAe,CAAC;AACjG,OAAO,EACL,aAAa,EAKd,MAAM,mBAAmB,CAAC;AAI3B,OAAO,EAAyB,gBAAgB,EAAC,MAAM,IAAI,CAAC;AAQ5D,UAAU,6BAA6B;IACrC,OAAO,EAAE,MAAM,CAAC;CACjB;AAaD,eAAO,MAAM,wBAAwB,gBAAe,6BAA6B,KAAG,GAAG,CAAC,OAMvF,CAAC;AAEF,UAAU,wBAAwB;IAChC,WAAW,EAAE,kBAAkB,CAAC;IAChC,eAAe,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;IAC7C,eAAe,EAAE,CACf,MAAM,EAAE;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAC,GAAG,KAAK,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAC,CAAC,KACvE,IAAI,CAAC;IACV,YAAY,EAAE,CACZ,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,KAAK,EAAE,EACf,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,MAAM,KACb,IAAI,CAAC;IACV,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,kBAAkB,GAAG,IAAI,CAAC;IACpC,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,QAAQ,GAAG,IAAI,CAAC;CACxB;AAYD,eAAO,MAAM,aAAa,WAChB,kBAAkB,mBACT,MAAM,SAChB,MAAM,OACR,MAAM,UACJ,MAAM,EAAE,qBAEd,gBA+CF,CAAC;AAEF,QAAA,MAAM,mBAAmB,iHAUtB,wBAAwB,KAAG,GAAG,CAAC,OA2GjC,CAAC;AAEF,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/ProfileMetricsGraph/index.tsx"],"names":[],"mappings":"AAeA,OAAO,EAAC,QAAQ,EAAC,MAAM,0BAA0B,CAAC;AAGlD,OAAO,EAAW,KAAK,EAAE,kBAAkB,EAAE,kBAAkB,EAAY,MAAM,eAAe,CAAC;AACjG,OAAO,EACL,aAAa,EAKd,MAAM,mBAAmB,CAAC;AAI3B,OAAO,EAAyB,gBAAgB,EAAC,MAAM,IAAI,CAAC;AAQ5D,UAAU,6BAA6B;IACrC,OAAO,EAAE,MAAM,CAAC;CACjB;AAaD,eAAO,MAAM,wBAAwB,gBAAe,6BAA6B,KAAG,GAAG,CAAC,OAMvF,CAAC;AAEF,UAAU,wBAAwB;IAChC,WAAW,EAAE,kBAAkB,CAAC;IAChC,eAAe,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;IAC7C,eAAe,EAAE,CACf,MAAM,EAAE;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAC,GAAG,KAAK,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAC,CAAC,KACvE,IAAI,CAAC;IACV,YAAY,EAAE,CACZ,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,KAAK,EAAE,EACf,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,MAAM,KACb,IAAI,CAAC;IACV,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,kBAAkB,GAAG,IAAI,CAAC;IACpC,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,QAAQ,GAAG,IAAI,CAAC;CACxB;AAYD,eAAO,MAAM,aAAa,WAChB,kBAAkB,mBACT,MAAM,SAChB,MAAM,OACR,MAAM,UACJ,MAAM,EAAE,qBAEd,gBA+CF,CAAC;AAEF,QAAA,MAAM,mBAAmB,iHAUtB,wBAAwB,KAAG,GAAG,CAAC,OA4GjC,CAAC;AAEF,eAAe,mBAAmB,CAAC"}

package/dist/ProfileMetricsGraph/index.js

@@ -78,8 +78,11 @@ export const useQueryRange = (client, queryExpression, start, end, sumBy = DEFAU
     return { isLoading, error: error, response: data ?? null };
 };
 const ProfileMetricsGraph = ({ queryClient, queryExpression, profile, from, to, setTimeRange, addLabelMatcher, onPointClick, comparing = false, }) => {
-    const { loading: labelNamesLoading, result: labelNamesResult } = useLabelNames(queryClient, profile?.ProfileSource()?.ProfileType()?.toString() ?? '', from, to);
-    const [sumBy, setSumBy] = useSumBy(profile?.ProfileSource()?.ProfileType(), labelNamesResult.response?.labelNames);
+    const profileType = useMemo(() => {
+        return Query.parse(queryExpression).profileType();
+    }, [queryExpression]);
+    const { loading: labelNamesLoading, result: labelNamesResult } = useLabelNames(queryClient, profileType.toString() ?? '', from, to);
+    const [sumBy, setSumBy] = useSumBy(profileType, labelNamesResult.response?.labelNames);
     const { isLoading: metricsGraphLoading, response, error, } = useQueryRange(queryClient, queryExpression, from, to, sumBy, labelNamesLoading);
     const { onError, perf, authenticationErrorMessage, isDarkMode } = useParcaContext();
     const { width, height, margin, heightStyle } = useMetricsGraphDimensions(comparing);

package/dist/ProfileMetricsGraph/useSumBy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useSumBy.d.ts","sourceRoot":"","sources":["../../src/ProfileMetricsGraph/useSumBy.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAE1C,eAAO,MAAM,oBAAoB,EAAE,MAAM,EAAO,CAAC;AA6BjD,eAAO,MAAM,QAAQ,gBACN,WAAW,GAAG,SAAS,UAC5B,MAAM,EAAE,GAAG,SAAS,KAC3B,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,IAAI,CA+EvC,CAAC"}
+{"version":3,"file":"useSumBy.d.ts","sourceRoot":"","sources":["../../src/ProfileMetricsGraph/useSumBy.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAE1C,eAAO,MAAM,oBAAoB,EAAE,MAAM,EAAO,CAAC;AA6BjD,eAAO,MAAM,QAAQ,gBACN,WAAW,GAAG,SAAS,UAC5B,MAAM,EAAE,GAAG,SAAS,KAC3B,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,IAAI,CAkEvC,CAAC"}

package/dist/ProfileMetricsGraph/useSumBy.js

@@ -10,7 +10,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useParcaContext, useURLState } from '@parca/components';
 export const DEFAULT_EMPTY_SUM_BY = [];
 const getDefaultSumBy = (profile, labels) => {
@@ -18,7 +18,7 @@ const getDefaultSumBy = (profile, labels) => {
         return undefined;
     }
     if (!profile.delta) {
-        return undefined;
+        return [];
     }
     if (labels.includes('comm')) {
         return ['comm'];
@@ -37,8 +37,7 @@ export const useSumBy = (profileType, labels) => {
         param: 'sum_by',
         navigateTo,
     });
-    console.log('labels', labels);
-    console.log('userSelectedSumByParam', userSelectedSumByParam);
+    const previousProfileType = useRef(profileType);
     const userSelectedSumBy = useMemo(() => {
         if (userSelectedSumByParam?.length === 0) {
             return undefined;
@@ -51,7 +50,6 @@ export const useSumBy = (profileType, labels) => {
         }
         return userSelectedSumByParam;
     }, [userSelectedSumByParam]);
-    console.log('userSelectedSumBy', userSelectedSumBy);
     const setUserSelectedSumBy = useCallback((sumBy) => {
         if (sumBy.length === 0) {
             setUserSelectedSumByParam('__none__');
@@ -69,22 +67,14 @@ export const useSumBy = (profileType, labels) => {
         setDefaultSumBy(getDefaultSumBy(profileType, labels));
     }, [profileType, labels]);
     useEffect(() => {
-        if (profileType === undefined || labels === undefined) {
-            return;
-        }
-        if (userSelectedSumBy !== undefined && userSelectedSumBy.length === 0) {
-            // User has explicitly selected no sumBy, so don't reset it
+        if (profileType === undefined ||
+            profileType.toString() === previousProfileType.current?.toString()) {
             return;
         }
-        if (userSelectedSumBy !== undefined && userSelectedSumBy.length > 0) {
-            // If any of the user selected sumBy is present in the labels, then don't reset it
-            if (userSelectedSumBy.some(sumBy => labels?.includes(sumBy))) {
-                return;
-            }
-        }
         // Reset user selected sumBy if profile type changes
         setUserSelectedSumBy(['']);
+        previousProfileType.current = profileType;
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [profileType, labels]);
+    }, [profileType]);
     return [userSelectedSumBy ?? defaultSumBy ?? DEFAULT_EMPTY_SUM_BY, setUserSelectedSumBy];
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parca/profile",
-  "version": "0.16.410",
+  "version": "0.16.411",
   "description": "Profile viewing libraries",
   "dependencies": {
     "@headlessui/react": "^1.7.19",
@@ -73,5 +73,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "gitHead": "7fc4b0d3e5a29c4a79f8762185ec8b874dfdef2c"
+  "gitHead": "8885ee532a664069e946e488f60b24cdac9c80f0"
 }

package/src/ProfileMetricsGraph/index.tsx

@@ -160,16 +160,17 @@ const ProfileMetricsGraph = ({
   onPointClick,
   comparing = false,
 }: ProfileMetricsGraphProps): JSX.Element => {
+  const profileType = useMemo(() => {
+    return Query.parse(queryExpression).profileType();
+  }, [queryExpression]);
+
   const {loading: labelNamesLoading, result: labelNamesResult} = useLabelNames(
     queryClient,
-    profile?.ProfileSource()?.ProfileType()?.toString() ?? '',
+    profileType.toString() ?? '',
     from,
     to
   );
-  const [sumBy, setSumBy] = useSumBy(
-    profile?.ProfileSource()?.ProfileType(),
-    labelNamesResult.response?.labelNames
-  );
+  const [sumBy, setSumBy] = useSumBy(profileType, labelNamesResult.response?.labelNames);
 
   const {
     isLoading: metricsGraphLoading,

package/src/ProfileMetricsGraph/useSumBy.ts

@@ -11,7 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import {useCallback, useEffect, useMemo, useState} from 'react';
+import {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 
 import {useParcaContext, useURLState} from '@parca/components';
 import {ProfileType} from '@parca/parser';
@@ -27,7 +27,7 @@ const getDefaultSumBy = (
   }
 
   if (!profile.delta) {
-    return undefined;
+    return [];
   }
 
   if (labels.includes('comm')) {
@@ -54,10 +54,7 @@ export const useSumBy = (
     param: 'sum_by',
     navigateTo,
   });
-
-  console.log('labels', labels);
-
-  console.log('userSelectedSumByParam', userSelectedSumByParam);
+  const previousProfileType = useRef<ProfileType | undefined>(profileType);
 
   const userSelectedSumBy = useMemo<string[] | undefined>(() => {
     if (userSelectedSumByParam?.length === 0) {
@@ -75,8 +72,6 @@ export const useSumBy = (
     return userSelectedSumByParam;
   }, [userSelectedSumByParam]);
 
-  console.log('userSelectedSumBy', userSelectedSumBy);
-
   const setUserSelectedSumBy = useCallback(
     (sumBy: string[]) => {
       if (sumBy.length === 0) {
@@ -104,27 +99,19 @@ export const useSumBy = (
   }, [profileType, labels]);
 
   useEffect(() => {
-    if (profileType === undefined || labels === undefined) {
-      return;
-    }
-
-    if (userSelectedSumBy !== undefined && userSelectedSumBy.length === 0) {
-      // User has explicitly selected no sumBy, so don't reset it
+    if (
+      profileType === undefined ||
+      profileType.toString() === previousProfileType.current?.toString()
+    ) {
       return;
     }
 
-    if (userSelectedSumBy !== undefined && userSelectedSumBy.length > 0) {
-      // If any of the user selected sumBy is present in the labels, then don't reset it
-      if (userSelectedSumBy.some(sumBy => labels?.includes(sumBy))) {
-        return;
-      }
-    }
-
     // Reset user selected sumBy if profile type changes
     setUserSelectedSumBy(['']);
+    previousProfileType.current = profileType;
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [profileType, labels]);
+  }, [profileType]);
 
   return [userSelectedSumBy ?? defaultSumBy ?? DEFAULT_EMPTY_SUM_BY, setUserSelectedSumBy];
 };