fix: field usage when arguments have the same name as root fields

connect/src/wg/cosmo/platform/v1/platform_pb.ts

@@ -16032,6 +16032,16 @@ export class GetFieldUsageRequest extends Message<GetFieldUsageRequest> {
    */
   featureFlagName?: string;
 
+  /**
+   * @generated from field: bool is_argument = 9;
+   */
+  isArgument = false;
+
+  /**
+   * @generated from field: bool is_input = 10;
+   */
+  isInput = false;
+
   constructor(data?: PartialMessage<GetFieldUsageRequest>) {
     super();
     proto3.util.initPartial(data, this);
@@ -16048,6 +16058,8 @@ export class GetFieldUsageRequest extends Message<GetFieldUsageRequest> {
     { no: 6, name: "dateRange", kind: "message", T: DateRange },
     { no: 7, name: "namespace", kind: "scalar", T: 9 /* ScalarType.STRING */ },
     { no: 8, name: "feature_flag_name", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
+    { no: 9, name: "is_argument", kind: "scalar", T: 8 /* ScalarType.BOOL */ },
+    { no: 10, name: "is_input", kind: "scalar", T: 8 /* ScalarType.BOOL */ },
   ]);
 
   static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): GetFieldUsageRequest {

controlplane/src/core/bufservices/analytics/getFieldUsage.ts

@@ -76,6 +76,8 @@ export function getFieldUsage(
       namedType: req.namedType,
       range: req.range,
       dateRange: dr,
+      isArgument: req.isArgument ?? false, // default to false if not provided
+      isInput: req.isInput ?? false, // default to false if not provided
     });
 
     return {

controlplane/src/core/repositories/analytics/UsageRepository.ts

@@ -155,6 +155,8 @@ export class UsageRepository {
     dateRange?: DateRange;
     organizationId: string;
     federatedGraphId: string;
+    isArgument: boolean;
+    isInput: boolean;
   }) {
     const timeFilters = parseTimeFilters(input.dateRange, input.range);
 
@@ -177,6 +179,13 @@ export class UsageRepository {
       params.namedType = input.namedType;
       whereSql += ` AND NamedType = {namedType:String}`;
     }
+
+    params.isArgument = input.isArgument;
+    whereSql += ` AND IsArgument = {isArgument:Boolean}`;
+
+    params.isInput = input.isInput;
+    whereSql += ` AND IsInput = {isInput:Boolean}`;
+
     whereSql += ` AND IsIndirectFieldUsage = false AND IsNull = false`;
 
     const [requestSeries, clients, meta] = await Promise.all([

proto/wg/cosmo/platform/v1/platform.proto

@@ -2065,6 +2065,8 @@ message GetFieldUsageRequest {
   DateRange dateRange = 6;
   string namespace = 7;
   optional string feature_flag_name = 8;
+  bool is_argument = 9;
+  bool is_input = 10;
 }
 
 message ClientWithOperations {

studio/src/components/analytics/field-usage.tsx

@@ -356,6 +356,9 @@ export const FieldUsageSheet = () => {
   const graph = useContext(GraphContext);
   const featureFlagName = router.query.featureFlag as string;
 
+  const category = router.query.category as string;
+  const isInput = category === "inputs";
+
   const { data, error, isLoading, refetch } = useQuery(
     getFieldUsage,
     {
@@ -370,6 +373,7 @@ export const FieldUsageSheet = () => {
         end: formatISO(dateRange.end),
       },
       featureFlagName,
+      isInput,
     },
     {
       enabled: !!showUsage && !!graph?.graph?.name,

studio/src/pages/[organizationSlug]/[namespace]/graph/[slug]/schema/index.tsx

@@ -194,6 +194,10 @@ const FieldUsageColumn = ({
   const graph = useContext(GraphContext);
   const router = useRouter();
   const featureFlagName = router.query.featureFlag as string;
+  const { ast } = useContext(ExplorerContext);
+
+  const category = getCategoryForType(ast, typename);
+  const isInput = category === "inputs";
 
   const { data: usageData } = useQuery(
     getFieldUsage,
@@ -208,6 +212,7 @@ const FieldUsageColumn = ({
         end: formatISO(dateRange.end),
       },
       featureFlagName,
+      isInput,
     },
     {
       enabled: !!graph?.graph?.name,
@@ -494,7 +499,8 @@ const Type = (props: {
   endLineNo?: number;
 }) => {
   const router = useRouter();
-  const isAuthenticatedType = props.authenticated || !!props.requiresScopes?.length;
+  const isAuthenticatedType =
+    props.authenticated || !!props.requiresScopes?.length;
 
   return (
     <div className="flex h-full flex-col">
@@ -546,7 +552,12 @@ const Type = (props: {
 
             {props.requiresScopes?.length && (
               <AuthenticatedScopes isType scopes={props.requiresScopes} asChild>
-                <button type="button" className={badgeVariants({ className: "w-max" })}>View scopes</button>
+                <button
+                  type="button"
+                  className={badgeVariants({ className: "w-max" })}
+                >
+                  View scopes
+                </button>
               </AuthenticatedScopes>
             )}
           </div>
@@ -763,7 +774,11 @@ const DeprecatedBadge = ({ reason }: { reason: string | undefined | null }) => {
   );
 };
 
-const AuthenticatedBadge = ({ isType, authenticated, requiresScopes }: {
+const AuthenticatedBadge = ({
+  isType,
+  authenticated,
+  requiresScopes,
+}: {
   isType: boolean;
   authenticated?: boolean;
   requiresScopes?: string[][];
@@ -778,7 +793,9 @@ const AuthenticatedBadge = ({ isType, authenticated, requiresScopes }: {
         <LockClosedIcon className="h-3 w-3 flex-shrink-0" />
         Authenticated
       </span>
-      {!!requiresScopes?.length && <AuthenticatedScopes isType={isType} scopes={requiresScopes} />}
+      {!!requiresScopes?.length && (
+        <AuthenticatedScopes isType={isType} scopes={requiresScopes} />
+      )}
     </p>
   );
 };
@@ -797,17 +814,18 @@ const AuthenticatedScopes = ({
   return (
     <Popover>
       <PopoverTrigger asChild={asChild}>
-        {children
-          ? children
-          : (
-            <Button variant="link" size="sm" className="h-auto p-0">
-              View scopes
-            </Button>
-          )}
+        {children ? (
+          children
+        ) : (
+          <Button variant="link" size="sm" className="h-auto p-0">
+            View scopes
+          </Button>
+        )}
       </PopoverTrigger>
       <PopoverContent className="px-0">
         <div className="mb-3 border-b border-border px-4 pb-3">
-          The following scope(s) are required to access this {isType ? "type" : "field"}:
+          The following scope(s) are required to access this{" "}
+          {isType ? "type" : "field"}:
         </div>
 
         {scopes
@@ -1408,7 +1426,9 @@ const SchemaExplorerPage: NextPageWithLayout = () => {
   const user = useUser();
 
   const organizationSlug = user?.currentOrganization.slug;
-  const { namespace: { name: namespace } } = useWorkspace();
+  const {
+    namespace: { name: namespace },
+  } = useWorkspace();
   const graphName = router.query.slug as string;
   const selectedCategory = (router.query.category as string) ?? "query";
   const typename = router.query.typename as string;
@@ -1431,9 +1451,18 @@ const SchemaExplorerPage: NextPageWithLayout = () => {
   const { ast, doc, isParsing } = useParseSchema(schema);
   const parsedTypes = useMemo(() => (doc ? getParsedTypes(doc) : []), [doc]);
 
-  const typeCounts = useMemo(() => (ast ? getTypeCounts(ast) : undefined), [ast],);
-  const [deprecatedTypesCount, deprecatedTypes] = useMemo(() => getDeprecatedTypes(parsedTypes), [parsedTypes]);
-  const [authenticatedTypesCount, authenticatedTypes] = useMemo(() => getAuthenticatedTypes(parsedTypes), [parsedTypes]);
+  const typeCounts = useMemo(
+    () => (ast ? getTypeCounts(ast) : undefined),
+    [ast],
+  );
+  const [deprecatedTypesCount, deprecatedTypes] = useMemo(
+    () => getDeprecatedTypes(parsedTypes),
+    [parsedTypes],
+  );
+  const [authenticatedTypesCount, authenticatedTypes] = useMemo(
+    () => getAuthenticatedTypes(parsedTypes),
+    [parsedTypes],
+  );
 
   const isLoadingAST = isLoading || isParsing;