Skip to content
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

Jump to bottom

Tenant UI dependency updates #1373

Merged
merged 2 commits into from
Sep 27, 2024
Merged

Tenant UI dependency updates #1373

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
124b70f
Library updates
loneil Sep 26, 2024
2eda221
Compatibility/deprecation fixes
loneil Sep 26, 2024
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
1,242 changes: 650 additions & 592 deletions services/tenant-ui/frontend/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions services/tenant-ui/frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,25 @@
},
"dependencies": {
"@intlify/unplugin-vue-i18n": "^4.0.0",
"@jsonforms/vue": "^3.3.0",
"@jsonforms/vue-vanilla": "^3.3.0",
"@jsonforms/vue": "^3.4.0",
"@jsonforms/vue-vanilla": "^3.4.0",
"@vuelidate/core": "^2.0.3",
"@vuelidate/validators": "^2.0.4",
"axios": "^1.7.5",
"date-fns": "^3.6.0",
"axios": "^1.7.7",
"date-fns": "^4.1.0",
"dompurify": "^3.1.6",
"json-editor-vue": "^0.15.2",
"marked": "^14.1.0",
"json-editor-vue": "^0.17.0",
"marked": "^14.1.2",
"oidc-client-ts": "^3.0.1",
"pinia": "^2.2.2",
"primeflex": "^3.3.1",
"primeicons": "^7.0.0",
"primevue": "^3.53.0",
"qrcode.vue": "^3.4.1",
"vue": "^3.4.38",
"vue": "^3.5.8",
"vue-i18n": "^9.13.1",
"vue-json-pretty": "^2.4.0",
"vue-router": "^4.4.3",
"vue-router": "^4.4.5",
"vue-toastification": "^2.0.0-rc.5"
},
"devDependencies": {
Expand All @@ -44,24 +44,24 @@
"@types/dompurify": "^3.0.5",
"@typescript-eslint/eslint-plugin": "^7.18.0",
"@typescript-eslint/parser": "^7.18.0",
"@vitejs/plugin-vue": "^5.1.2",
"@vitest/coverage-v8": "^2.0.5",
"@vitejs/plugin-vue": "^5.1.4",
"@vitest/coverage-v8": "^2.1.1",
"@vue/eslint-config-prettier": "^9.0.0",
"@vue/eslint-config-typescript": "^13.0.0",
"@vue/test-utils": "^2.4.6",
"eslint": "^8.57.0",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-vue": "^9.27.0",
"eslint-plugin-vue": "^9.28.0",
"flat": "^6.0.1",
"glob": "^11.0.0",
"jsdom": "^24.1.1",
"msw": "^2.3.5",
"jsdom": "^25.0.1",
"msw": "^2.4.9",
"prettier": "^3.3.3",
"sass": "^1.77.8",
"typescript": "^5.5.4",
"vite": "^5.4.2",
"vitest": "^2.0.5",
"vue-tsc": "^2.0.29",
"sass": "^1.79.3",
"typescript": "^5.6.2",
"vite": "^5.4.8",
"vitest": "^2.1.1",
"vue-tsc": "^2.1.6",
"whatwg-fetch": "^3.6.20"
}
}
10 changes: 6 additions & 4 deletions services/tenant-ui/frontend/src/assets/primevueOverrides/inputSwitch.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
@use "sass:color";

@import '../variables.scss';

// Input Switches
.p-inputswitch {
&[data-p-highlight="true"] .p-inputswitch-slider {
background: darken($tenant-ui-status-green-background, 20%);
background: color.adjust($tenant-ui-status-green-background, $lightness: -20%);;
&::before {
background-color: white !important;
}
}
&[data-p-highlight="false"] .p-inputswitch-slider {
background: darken($tenant-ui-status-red-background, 20%);
background: color.adjust($tenant-ui-status-red-background, $lightness: -20%);
}
&:hover {
&[data-p-highlight="true"] .p-inputswitch-slider {
background: darken($tenant-ui-status-green-background, 40%) !important;
background: color.adjust($tenant-ui-status-green-background, $lightness: -40%) !important;
}
&[data-p-highlight="false"] .p-inputswitch-slider {
background: darken($tenant-ui-status-red-background, 40%) !important;
background: color.adjust($tenant-ui-status-red-background, $lightness: -40%) !important;
}
}
}
6 changes: 4 additions & 2 deletions services/tenant-ui/frontend/src/assets/variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
@use "sass:color";

// Theme variables
$tenant-ui-primary-color: #003366; // Main color blocks
$tenant-ui-text-on-primary: #ffffff;
$tenant-ui-secondary-color: #3c5973; // Buttons, actions
$tenant-ui-accent-color: #fcba19;
$tenant-ui-secondary-active: darken( $tenant-ui-secondary-color, 10% );
$tenant-ui-shadow: lighten( $tenant-ui-secondary-color, 30% );
$tenant-ui-secondary-active: color.adjust($tenant-ui-secondary-color, $lightness: -10%);
$tenant-ui-shadow: color.adjust($tenant-ui-secondary-color, $lightness: 30%);
$tenant-ui-flat-highlight: #ebeef3;

// General text colors
Expand Down
2 changes: 1 addition & 1 deletion services/tenant-ui/frontend/src/components/authentications/ApiKeys.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<MainCardContent :title="$t('apiKey.apiKeys')" :refresh-callback="loadTable">
<DataTable
v-model:expandedRows="expandedRows"
v-model:expanded-rows="expandedRows"
v-model:filters="filter"
:loading="loading"
:value="formattedApiKeys"
Expand Down
2 changes: 1 addition & 1 deletion services/tenant-ui/frontend/src/components/connections/Connections.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
:refresh-callback="loadTable"
>
<DataTable
v-model:expandedRows="expandedRows"
v-model:expanded-rows="expandedRows"
v-model:filters="filter"
:loading="loading"
:value="formattedConnections"
Expand Down
2 changes: 1 addition & 1 deletion services/tenant-ui/frontend/src/components/connections/Invitations.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
:refresh-callback="loadTable"
>
<DataTable
v-model:expandedRows="expandedRows"
v-model:expanded-rows="expandedRows"
v-model:filters="filter"
:loading="loading"
:value="formattedInvitations"
Expand Down
2 changes: 1 addition & 1 deletion services/tenant-ui/frontend/src/components/holder/CredentialsTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<DataTable
v-model:expandedRows="expandedRows"
v-model:expanded-rows="expandedRows"
v-model:filters="filter"
:loading="loading"
:value="formattedCredentialExchanges"
Expand Down
2 changes: 1 addition & 1 deletion services/tenant-ui/frontend/src/components/innkeeper/authentications/ApiKeys.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<MainCardContent :title="$t('apiKey.apiKeys')" :refresh-callback="loadTable">
<DataTable
v-model:expandedRows="expandedRows"
v-model:expanded-rows="expandedRows"
v-model:filters="filter"
:loading="loading"
:value="formattedApiKeys"
Expand Down
2 changes: 1 addition & 1 deletion services/tenant-ui/frontend/src/components/innkeeper/reservation/Reservations.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
:refresh-callback="loadTable"
>
<DataTable
v-model:expandedRows="expandedRows"
v-model:expanded-rows="expandedRows"
v-model:filters="filter"
:loading="loading"
:value="formattedReservations"
Expand Down
2 changes: 1 addition & 1 deletion services/tenant-ui/frontend/src/components/innkeeper/reservation/ReservationsHistory.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
:refresh-callback="loadTable"
>
<DataTable
v-model:expandedRows="expandedRows"
v-model:expanded-rows="expandedRows"
v-model:filters="filter"
:loading="loading"
:value="formattedReservationHistory"
Expand Down
2 changes: 1 addition & 1 deletion services/tenant-ui/frontend/src/components/innkeeper/tenants/Tenants.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<MainCardContent :title="$t('tenants.tenants')" :refresh-callback="loadTable">
<DataTable
v-model:expandedRows="expandedRows"
v-model:expanded-rows="expandedRows"
v-model:filters="filter"
:loading="loading"
:value="formattedTenants"
Expand Down
2 changes: 1 addition & 1 deletion ...enant-ui/frontend/src/components/issuance/credentialDefinitions/CredentialDefinitions.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
>
<DataTable
v-model:selection="selectedCredentialDefinition"
v-model:expandedRows="expandedRows"
v-model:expanded-rows="expandedRows"
v-model:filters="filter"
:loading="loading"
:value="formattedstoredCredDefs"
Expand Down
2 changes: 1 addition & 1 deletion services/tenant-ui/frontend/src/components/issuance/credentials/IssuedCredentials.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<DataTable
v-model:selection="selectedCredential"
v-model:filters="filter"
v-model:expandedRows="expandedRows"
v-model:expanded-rows="expandedRows"
:loading="loading"
:value="formattedIssuedCredentials"
:paginator="true"
Expand Down
2 changes: 1 addition & 1 deletion services/tenant-ui/frontend/src/components/issuance/schemas/Schemas.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
>
<DataTable
v-model:selection="selectedSchema"
v-model:expandedRows="expandedRows"
v-model:expanded-rows="expandedRows"
v-model:filters="filter"
:loading="loading"
:value="formattedSchemaList"
Expand Down
2 changes: 1 addition & 1 deletion services/tenant-ui/frontend/src/components/messages/Messages.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
{{ $t('messages.disclaimer') }}
</p>
<DataTable
v-model:expandedRows="expandedRows"
v-model:expanded-rows="expandedRows"
v-model:selection="selectedMessage"
v-model:filters="filter"
:loading="loading"
Expand Down
2 changes: 1 addition & 1 deletion services/tenant-ui/frontend/src/components/oca/Oca.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
:refresh-callback="loadTable"
>
<DataTable
v-model:expandedRows="expandedRows"
v-model:expanded-rows="expandedRows"
v-model:filters="filter"
:loading="loading"
:value="formattedOcas"
Expand Down
2 changes: 1 addition & 1 deletion services/tenant-ui/frontend/src/components/verifier/Presentations.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<DataTable
v-model:selection="selectedPresentation"
v-model:filters="filter"
v-model:expandedRows="expandedRows"
v-model:expanded-rows="expandedRows"
:loading="loading"
:value="presentations"
data-key="pres_ex_id"
Expand Down
1 change: 1 addition & 0 deletions services/tenant-ui/frontend/vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export default defineConfig({
preprocessorOptions: {
scss: {
additionalData: `@import "@/assets/variables.scss";`,
api: 'modern-compiler',
},
},
},
Expand Down
Loading