Skip to content

Commit

Permalink
Merge pull request #627 from intuitem/upgrade_echarts
Browse files Browse the repository at this point in the history
update frontend dependencies
  • Loading branch information
ab-smith authored Jul 8, 2024
2 parents f90c8ac + 2747af1 commit d5c534b
Show file tree
Hide file tree
Showing 10 changed files with 2,999 additions and 4,411 deletions.
7,267 changes: 2,922 additions & 4,345 deletions frontend/package-lock.json

Large diffs are not rendered by default.

108 changes: 54 additions & 54 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,65 +20,65 @@
"build-storybook": "storybook build"
},
"devDependencies": {
"@inlang/paraglide-js": "1.2.5",
"@playwright/test": "^1.40.1",
"@skeletonlabs/skeleton": "^2.3.0",
"@skeletonlabs/tw-plugin": "^0.2.2",
"@storybook/addon-essentials": "^7.6.17",
"@storybook/addon-interactions": "^7.6.17",
"@storybook/addon-links": "^7.6.17",
"@storybook/blocks": "^7.6.17",
"@storybook/svelte": "^7.6.17",
"@storybook/sveltekit": "^7.6.17",
"@storybook/test": "^7.6.17",
"@sveltejs/adapter-auto": "^3.0.0",
"@sveltejs/adapter-node": "^4.0.1",
"@sveltejs/kit": "^2.0.0",
"@sveltejs/vite-plugin-svelte": "^3.0.0",
"@tailwindcss/forms": "^0.5.3",
"@tailwindcss/typography": "^0.5.9",
"@testing-library/jest-dom": "^6.1.4",
"@testing-library/svelte": "^4.0.4",
"@types/node": "^20.8.7",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
"@vincjo/datatables": "^1.14.0",
"@vitest/coverage-v8": "^1.1.1",
"@vitest/ui": "^1.1.1",
"autoprefixer": "^10.4.14",
"eslint": "^8.53.0",
"eslint-config-prettier": "^8.5.0",
"@inlang/paraglide-js": "1.11.1",
"@playwright/test": "^1.45.1",
"@skeletonlabs/skeleton": "^2.10.1",
"@skeletonlabs/tw-plugin": "^0.4.0",
"@storybook/addon-essentials": "^8.1.11",
"@storybook/addon-interactions": "^8.1.11",
"@storybook/addon-links": "^8.1.11",
"@storybook/blocks": "^8.1.11",
"@storybook/svelte": "^8.1.11",
"@storybook/sveltekit": "^8.1.11",
"@storybook/test": "^8.1.11",
"@sveltejs/adapter-auto": "^3.2.2",
"@sveltejs/adapter-node": "^5.2.0",
"@sveltejs/kit": "^2.5.18",
"@sveltejs/vite-plugin-svelte": "^3.1.1",
"@tailwindcss/forms": "^0.5.7",
"@tailwindcss/typography": "^0.5.13",
"@testing-library/jest-dom": "^6.4.6",
"@testing-library/svelte": "^5.2.0",
"@types/node": "^20.14.10",
"@typescript-eslint/eslint-plugin": "^7.15.0",
"@typescript-eslint/parser": "^7.15.0",
"@vincjo/datatables": "^1.14.10",
"@vitest/coverage-v8": "^1.6.0",
"@vitest/ui": "^1.6.0",
"autoprefixer": "^10.4.19",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-storybook": "^0.8.0",
"eslint-plugin-svelte": "^2.35.1",
"jsdom": "^22.1.0",
"postcss": "^8.4.23",
"prettier": "^2.8.0",
"prettier-plugin-svelte": "^2.10.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"storybook": "^7.6.17",
"svelte": "^4.0.0",
"svelte-check": "^3.4.3",
"eslint-plugin-svelte": "^2.41.0",
"jsdom": "^24.1.0",
"postcss": "^8.4.39",
"prettier": "^3.3.2",
"prettier-plugin-svelte": "^3.2.5",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"storybook": "^8.1.11",
"svelte": "^4.2.18",
"svelte-check": "^3.8.4",
"svelte-typewriter": "^3.2.3",
"sveltekit-flash-message": "^2.2.1",
"sveltekit-rate-limiter": "^0.4.1",
"sveltekit-superforms": "^2.12.5",
"tailwindcss": "^3.3.2",
"tslib": "^2.4.1",
"typescript": "^5.0.0",
"vite": "^5.0.0",
"vite-plugin-tailwind-purgecss": "^0.2.0",
"vitest": "^1.1.1",
"zod": "^3.22.2"
"sveltekit-flash-message": "^2.4.4",
"sveltekit-rate-limiter": "^0.5.1",
"sveltekit-superforms": "^2.15.2",
"tailwindcss": "^3.4.4",
"tslib": "^2.6.3",
"typescript": "^5.5.3",
"vite": "^5.3.3",
"vite-plugin-tailwind-purgecss": "^0.3.3",
"vitest": "^1.6.0",
"zod": "^3.23.8"
},
"type": "module",
"dependencies": {
"@floating-ui/dom": "^1.5.1",
"@fortawesome/fontawesome-free": "^6.5.1",
"@inlang/paraglide-js-adapter-vite": "^1.2.14",
"dotenv": "^16.4.1",
"echarts": "^5.4.3",
"svelte-multiselect": "^10.2.0",
"@floating-ui/dom": "^1.6.7",
"@fortawesome/fontawesome-free": "^6.5.2",
"@inlang/paraglide-js-adapter-vite": "^1.2.40",
"dotenv": "^16.4.5",
"echarts": "^5.5.1",
"svelte-multiselect": "^10.3.0",
"svelte-persisted-store": "^0.11.0"
}
}
1 change: 1 addition & 0 deletions frontend/project.inlang/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cache
2 changes: 1 addition & 1 deletion frontend/src/app.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/lib/utils/crud.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ export const getOptions = ({
.map((field) => getValue(object, field))
.map((string) => `${string}`)
.join('/') +
'/' +
my_label
'/' +
my_label
: my_label,
value: object[value],
suggested: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
$: title = requirement.display_short
? requirement.display_short
: parent.display_short
? parent.display_short
: parent.description;
? parent.display_short
: parent.description;
// Function to handle the "Next" button click
function nextItem() {
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/routes/(app)/scoring-assistant/selector.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
<select class="select w-full" {id} bind:value {disabled}>
{#each choices as text, i}
<option class="text-{i}" value={i}
>{i}{#if text} - {localItems()[text]}{/if}</option
>{i}{#if text}
- {localItems()[text]}{/if}</option
>
{/each}
</select>
8 changes: 4 additions & 4 deletions frontend/src/routes/+layout.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@
$flash.type == 'success'
? 'variant-filled-success'
: $flash.type === 'error'
? 'variant-filled-error'
: $flash.type == 'warning'
? 'variant-filled-warning'
: 'variant-filled-primary'
? 'variant-filled-error'
: $flash.type == 'warning'
? 'variant-filled-warning'
: 'variant-filled-primary'
});
// Clearing the flash message could sometimes
Expand Down
6 changes: 5 additions & 1 deletion frontend/tests/utils/base-page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ export abstract class BasePage {
readonly modalTitle: Locator;
readonly breadcrumbs: Locator;

constructor(public readonly page: Page, url: string, name: string | RegExp) {
constructor(
public readonly page: Page,
url: string,
name: string | RegExp
) {
this.url = url;
this.name = name;
this.pageTitle = this.page.locator('#page-title');
Expand Down
7 changes: 6 additions & 1 deletion frontend/tests/utils/page-detail.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@ export class PageDetail extends BasePage {
item: string;
readonly editButton: Locator;

constructor(public readonly page: Page, url: string, form: FormContent, item: string) {
constructor(
public readonly page: Page,
url: string,
form: FormContent,
item: string
) {
super(page, url, item);
this.form = form;
this.item = item;
Expand Down

0 comments on commit d5c534b

Please sign in to comment.