Skip to content

fix(ui): handle escaped single-quoted strings in schema changes #7203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: adam/graphql-inspector-update
Choose a base branch
from
+10 −6
Open

fix(ui): handle escaped single-quoted strings in schema changes #7203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2397280
fix(ui): handle escaped single-quoted strings in schema changes
adambenhassen Oct 31, 2025
735beb4
Merge branch 'adam/graphql-inspector-update' into adam/1180
adambenhassen Nov 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/beige-chicken-wonder.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'hive': patch
---

handle escaped single-quoted strings in schema changes
2 changes: 1 addition & 1 deletion packages/services/api/src/modules/schema/providers/inspector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export class Inspector {
async diff(existing: GraphQLSchema, incoming: GraphQLSchema) {
this.logger.debug('Comparing Schemas');

const changes = await diff(existing, incoming);
const changes = await diff(existing, incoming, undefined, { escapeSingleQuotes: true });

return changes
.filter(dropTrimmedDescriptionChangedChange)
Expand Down
9 changes: 4 additions & 5 deletions packages/web/app/src/components/target/history/errors-and-changes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,10 @@ import { CheckCircledIcon, InfoCircledIcon } from '@radix-ui/react-icons';
import { Link } from '@tanstack/react-router';

export function labelize(message: string) {
// Turn " into '
// Replace '...' with <Label>...</Label>
return reactStringReplace(message.replace(/"/g, "'"), /'([^']+)'/gim, (match, i) => {
return <Label key={i}>{match}</Label>;
});
// Replace '...' and "..." with <Label>...</Label>
return reactStringReplace(message.replace(/"/g, "'"), /'((?:[^'\\]|\\.)+?)'/g, (match, i) => (
<Label key={i}>{match.replace(/\\'/g, "'")}</Label>
));
}

const severityLevelMapping = {
Expand Down
Loading