Skip to content

Fix Prettier Lint Issues and Issues with Faro Initialization #211

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

Merged
SeamusGrafana merged 5 commits into from
May 16, 2025
Merged

Fix Prettier Lint Issues and Issues with Faro Initialization #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8c0afff
Fix Prettier Lint Issues
SeamusGrafana May 16, 2025
17098d9
Improve Faro Initialization, when not Configured
SeamusGrafana May 16, 2025
5b7651c
Fix Prettier
SeamusGrafana May 16, 2025
3359bba
Tweak Logging
SeamusGrafana May 16, 2025
c1c2576
Improve Faro Initialization
SeamusGrafana May 16, 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: 2 additions & 3 deletions pkg/web/src/hooks.client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@ function setupFaro() {
.then((config) => {
const url = config.faro_url;
if (!url) {
console.warn('Grafana faro is not configured.');
return;
console.warn('Grafana Faro is not configured.');
}

console.log(`Initializing Grafana Faro to ${url}`);
console.log(`Initializing Grafana Faro to '${url}'`);
initializeFaro({
url,
app: {
Expand Down
8 changes: 4 additions & 4 deletions pkg/web/src/routes/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
customName: ''
};

var ratingStars = 5;

Check warning on line 19 in pkg/web/src/routes/+page.svelte

View workflow job for this annotation

GitHub Actions / runner-job 

'ratingStars' is assigned a value but never used

// A randomly-generated integer used to track identity of WebSocket connections.
// Completely unrelated to users, user tokens, authentication, etc.
Expand Down Expand Up @@ -100,7 +100,7 @@
});

async function ratePizza(stars) {
faro.api.pushEvent('Submit Pizza Rating', {pizza_id: pizza['pizza']['id'], stars: stars});
faro.api.pushEvent('Submit Pizza Rating', { pizza_id: pizza['pizza']['id'], stars: stars });
const res = await fetch(`${PUBLIC_BACKEND_ENDPOINT}/api/ratings`, {
method: 'POST',
body: JSON.stringify({
Expand All @@ -120,7 +120,7 @@
}

async function getPizza() {
faro.api.pushEvent('Get Pizza Recommendation', {restrictions: restrictions});
faro.api.pushEvent('Get Pizza Recommendation', { restrictions: restrictions });
if (restrictions.minNumberOfToppings > restrictions.maxNumberOfToppings) {
faro.api.pushError(new Error('Invalid Restrictions, Min > Max'));
}
Expand All @@ -147,13 +147,13 @@
})
);
}
if (pizza['pizza']['ingredients'].find(e => e.name === 'Pineapple')) {
if (pizza['pizza']['ingredients'].find((e) => e.name === 'Pineapple')) {
faro.api.pushError(new Error('Bad Pizza Recommendation'));
}
}

async function getTools() {
faro.api.pushEvent('Get Pizza Tools', {tools: tools});
faro.api.pushEvent('Get Pizza Tools', { tools: tools });
const res = await fetch(`${PUBLIC_BACKEND_ENDPOINT}/api/tools`, {
headers: {
Authorization: 'Token ' + userToken
Expand Down
6 changes: 3 additions & 3 deletions pkg/web/src/routes/admin/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@
);
if (!res.ok) {
loginError = 'Login failed: ' + res.statusText;
faro.api.pushEvent('Unsuccessful Admin Login', {username: username});
faro.api.pushEvent('Unsuccessful Admin Login', { username: username });
faro.api.pushError(new Error('Admin Login Error: ' + res.statusText));
return;
}

faro.api.pushEvent('Successful Admin Login', {username: username});
faro.api.pushEvent('Successful Admin Login', { username: username });
adminLoggedIn = checkAdminLoggedIn();
}

Expand All @@ -59,7 +59,7 @@
})
.then((res) => res.json())
.then((json) => {
faro.api.pushEvent('Update Recent Pizza Recommendations',);
faro.api.pushEvent('Update Recent Pizza Recommendations');
var newRec: string[] = [];
json.pizzas.forEach((pizza: string) => {
newRec.push(`
Expand Down
4 changes: 2 additions & 2 deletions pkg/web/src/routes/login/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@
});
if (!res.ok) {
loginError = 'Login failed: ' + res.statusText;
faro.api.pushEvent('Unsuccessful Login', {username: username});
faro.api.pushEvent('Unsuccessful Login', { username: username });
faro.api.pushError(new Error('Login Error: ' + res.statusText));
return;
}

faro.api.pushEvent('Successful Login', {username: username});
faro.api.pushEvent('Successful Login', { username: username });
qpUserLoggedIn = checkQPUserLoggedIn();
}

Expand Down