Skip to content

fix: convert makeRequest() to async/await with proper error propagation #852

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
GaneshPatil7517 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: convert makeRequest() to async/await with proper error propagation #852

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b770da
fix: convert makeRequest() to async/await with proper error propagation
GaneshPatil7517 Mar 26, 2026
a931751
refactor: include URL in error log and use res.arrayBuffer() directly
GaneshPatil7517 Mar 26, 2026
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
8 changes: 4 additions & 4 deletions ...nu/event-data-explorer/event-data-explorer-dialog/event-data-explorer-dialog.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ export class EventDataExplorerDialogComponent {
);
}

loadEvent(file: FileEvent) {
async loadEvent(file: FileEvent) {
this.loading = true;
this.error = this.fileLoader.loadEvent(
this.error = await this.fileLoader.loadEvent(
file.url,
this.eventDisplay,
file.nocache ? { cache: 'no-cache' } : {},
Expand All @@ -72,9 +72,9 @@ export class EventDataExplorerDialogComponent {
if (!this.error) this.onClose();
}

loadConfig(file: FileEvent) {
async loadConfig(file: FileEvent) {
this.loading = true;
this.error = this.fileLoader.makeRequest(
this.error = await this.fileLoader.makeRequest(
`${this.dialogData.apiURL}?type=config&f=${file.url}`,
'text',
(config) => {
Expand Down
42 changes: 22 additions & 20 deletions packages/phoenix-ng/projects/phoenix-ui-components/lib/services/file-loader.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,29 +32,31 @@ export class FileLoaderService {
}

// returns whether an error was found
makeRequest(
async makeRequest(
urlPath: string,
responseType: 'json' | 'text' | 'blob',
onData: (data: any) => void,
options: any = {},
) {
fetch(urlPath, options)
.then((res) => res[responseType]())
.then((data) => {
if (responseType === 'blob') {
data
.arrayBuffer()
.then((buf) => this.unzip(buf))
.then((d) => onData(d));
} else {
onData(data);
}
})
.catch((error) => {
console.error(error);
): Promise<boolean> {
try {
const res = await fetch(urlPath, options);
if (!res.ok) {
console.error(`Request failed: ${res.status} ${res.statusText}`);
return true;
Comment thread
GaneshPatil7517 marked this conversation as resolved.
});
return false;
}
const data = await res[responseType]();
if (responseType === 'blob') {
const buf = await (data as Blob).arrayBuffer();
const unzipped = await this.unzip(buf);
onData(unzipped);
} else {
Comment thread
GaneshPatil7517 marked this conversation as resolved.
Outdated
onData(data);
}
return false;
} catch (error) {
console.error(error);
return true;
}
}

loadJSONEvent(eventData: string, eventDisplay: EventDisplayService) {
Expand All @@ -76,11 +78,11 @@ export class FileLoaderService {
eventDisplay.buildEventDataFromJSON(processedEventData);
}

loadEvent(
async loadEvent(
file: string,
eventDisplay: EventDisplayService,
options: any = {},
) {
): Promise<boolean> {
this.lastEventsURL = file;
this.lastEventsOptions = options;
const isZip = file.split('.').pop() === 'zip';
Expand Down
Loading