Align lint fixes with main and resolve merge conflicts

- Convert biome-ignore to oxlint-disable-next-line across client app
- Fix no-base-to-string with type narrowing instead of suppressions
- Fix no-floating-promises with fireAndForget() in proxy app
- Fix restrict-template-expressions with String() wrapping
- Resolve leftover merge conflict markers in manager.rs
- Remove duplicate cmd_plugin_init_errors from lib.rs
- Add graphql as explicit dependency in yaak-client

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Gregory Schier
2026-03-13 13:02:29 -07:00
parent 7314aedc71
commit ee69db0f12
54 changed files with 272 additions and 264 deletions

View File

@@ -43,7 +43,7 @@ interface Props {
type ExplorerItem =
| { kind: "type"; type: GraphQLType; from: ExplorerItem }
// biome-ignore lint/suspicious/noExplicitAny: none
// oxlint-disable-next-line no-explicit-any -- none
| { kind: "field"; type: GraphQLField<any, any>; from: ExplorerItem }
| { kind: "input_field"; type: GraphQLInputField; from: ExplorerItem }
| null;
@@ -144,7 +144,7 @@ export const GraphQLDocsExplorer = memo(function GraphQLDocsExplorer({
</div>
) : (
<div
key={activeItem.type.toString()} // Reset scroll position to top
key={"name" in activeItem.type ? activeItem.type.name : String(activeItem.type)} // Reset scroll position to top
className="overflow-y-auto h-full w-full p-3 grid grid-cols-[minmax(0,1fr)]"
>
<GqlTypeInfo item={activeItem} setItem={setActiveItem} schema={schema} />
@@ -180,14 +180,14 @@ function GraphQLExplorerHeader({
<Icon icon="book_open_text" />
{crumbs.map((crumb, i) => {
return (
// biome-ignore lint/suspicious/noArrayIndexKey: none
// oxlint-disable-next-line no-array-index-key -- none
<Fragment key={i}>
{i > 0 && <Icon icon="chevron_right" className="text-text-subtlest" />}
{crumb === item || item == null ? (
<GqlTypeLabel noTruncate item={item} />
) : crumb === item ? null : (
<GqlTypeLink
// biome-ignore lint/suspicious/noArrayIndexKey: none
// oxlint-disable-next-line no-array-index-key -- none
key={i}
noTruncate
item={crumb}
@@ -200,7 +200,7 @@ function GraphQLExplorerHeader({
})}
</div>
<GqlSchemaSearch
key={item?.type.toString()} // Force reset when changing items
key={item != null && "name" in item.type ? item.type.name : "search"} // Force reset when changing items
maxHeight={containerHeight}
currentItem={item}
schema={schema}
@@ -268,7 +268,7 @@ function GqlTypeInfo({
{Object.entries(fields).map(([fieldName, field]) => {
const fieldItem: ExplorerItem = toExplorerItem(field, item);
return (
<div key={`${field.type}::${field.name}`} className="my-4">
<div key={`${String(field.type)}::${field.name}`} className="my-4">
<GqlTypeRow
item={fieldItem}
setItem={setItem}
@@ -361,7 +361,7 @@ function GqlTypeInfo({
<Subheading>Arguments</Subheading>
{item.type.args.map((a) => {
return (
<div key={`${a.type}::${a.name}`} className="my-4">
<div key={`${String(a.type)}::${a.name}`} className="my-4">
<GqlTypeRow
name={{ value: a.name, color: "info" }}
item={{ kind: "type", type: a.type, from: item }}
@@ -391,7 +391,7 @@ function GqlTypeInfo({
from: item,
};
return (
<div key={`${field.type}::${field.name}`} className="my-4">
<div key={`${String(field.type)}::${field.name}`} className="my-4">
<GqlTypeRow
item={fieldItem}
setItem={setItem}
@@ -429,7 +429,7 @@ function GqlTypeInfo({
if (field == null) return null;
const fieldItem: ExplorerItem = { kind: "field", type: field, from: item };
return (
<div key={`${field.type}::${field.name}`} className="my-4">
<div key={`${String(field.type)}::${field.name}`} className="my-4">
<GqlTypeRow
item={fieldItem}
setItem={setItem}
@@ -510,7 +510,7 @@ function GqlTypeRow({
<span className="text-text-subtle">(</span>
{item.type.args.map((arg) => (
<div
key={`${arg.type}::${arg.name}`}
key={`${String(arg.type)}::${arg.name}`}
className={classNames(item.type.args.length === 1 && "inline-flex")}
>
{item.type.args.length > 1 && <>&nbsp;&nbsp;</>}
@@ -672,7 +672,7 @@ function Subheading({ children, count }: { children: ReactNode; count?: number }
interface SearchResult {
name: string;
// biome-ignore lint/suspicious/noExplicitAny: none
// oxlint-disable-next-line no-explicit-any -- none
type: GraphQLNamedType | GraphQLField<any, any> | GraphQLInputField;
score: number;
from: GraphQLNamedType | null;
@@ -796,7 +796,11 @@ function GqlSchemaSearch({
label="search"
hideLabel
defaultValue={value}
placeholder={focused ? `Search ${currentItem?.type.toString() ?? "Schema"}` : "Search"}
placeholder={
focused
? `Search ${currentItem != null && "name" in currentItem.type ? currentItem.type.name : "Schema"}`
: "Search"
}
leftSlot={
<div className="w-10 flex justify-center items-center">
<Icon size="sm" icon="search" color="secondary" />
@@ -895,10 +899,10 @@ function DocMarkdown({ children, className }: { children: string | null; classNa
function walkTypeGraph(
schema: GraphQLSchema,
// biome-ignore lint/suspicious/noExplicitAny: none
// oxlint-disable-next-line no-explicit-any -- none
start: GraphQLType | GraphQLField<any, any> | GraphQLInputField | null,
cb: (
// biome-ignore lint/suspicious/noExplicitAny: none
// oxlint-disable-next-line no-explicit-any -- none
type: GraphQLNamedType | GraphQLField<any, any> | GraphQLInputField,
from: GraphQLNamedType | null,
path: string[],
@@ -906,7 +910,7 @@ function walkTypeGraph(
) {
const visited = new Set<string>();
const queue: Array<{
// biome-ignore lint/suspicious/noExplicitAny: none
// oxlint-disable-next-line no-explicit-any -- none
current: GraphQLType | GraphQLField<any, any> | GraphQLInputField;
from: GraphQLNamedType | null;
path: string[];
@@ -926,7 +930,7 @@ function walkTypeGraph(
}
while (queue.length > 0) {
// biome-ignore lint/style/noNonNullAssertion: none
// oxlint-disable-next-line no-non-null-assertion -- none
const { current, from, path } = queue.shift()!;
if (!isNamedType(current)) continue;
@@ -979,7 +983,7 @@ function walkTypeGraph(
}
}
// biome-ignore lint/suspicious/noExplicitAny: none
// oxlint-disable-next-line no-explicit-any -- none
function toExplorerItem(t: any, from: ExplorerItem | null): ExplorerItem | null {
if (t == null) return null;