Skip to content

Commit

Permalink
Change button type in disabled state, add missing disabled prop
Browse files Browse the repository at this point in the history
  • Loading branch information
SamuelWei committed Jan 24, 2025
1 parent bfaabb4 commit b0144b4
Show file tree
Hide file tree
Showing 21 changed files with 129 additions and 71 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Broken banner link style 'warning' ([#1759], [#1760])
- Inconsistent select/multiselect loading states ([#1772])
- Input fields not disabled correctly on login page ([#1791], [#1794])
- Style of 'clear' button of the room replacement selector in the 'Delete room type' dialog ([#1784], [#1787])
- Missing form validation feedback on forgot password page ([#1802])
- Missing form validation feedback for password fields on login page ([#1801])

## [v4.2.0] - 2025-01-06

Expand Down Expand Up @@ -335,8 +338,8 @@ You can find the changelog for older versions there [here](https://github.com/TH
[#1616]: https://github.com/THM-Health/PILOS/pull/1616
[#1617]: https://github.com/THM-Health/PILOS/pull/1617
[#1618]: https://github.com/THM-Health/PILOS/pull/1618
[#1679]: https://github.com/THM-Health/PILOS/issues/1679
[#1651]: https://github.com/THM-Health/PILOS/issues/1651
[#1679]: https://github.com/THM-Health/PILOS/issues/1679
[#1702]: https://github.com/THM-Health/PILOS/pull/1702
[#1704]: https://github.com/THM-Health/PILOS/pull/1704
[#1721]: https://github.com/THM-Health/PILOS/issues/1721
Expand All @@ -348,6 +351,8 @@ You can find the changelog for older versions there [here](https://github.com/TH
[#1772]: https://github.com/THM-Health/PILOS/pull/1772
[#1791]: https://github.com/THM-Health/PILOS/issues/1791
[#1794]: https://github.com/THM-Health/PILOS/pull/1794
[#1801]: https://github.com/THM-Health/PILOS/pull/1801
[#1802]: https://github.com/THM-Health/PILOS/pull/1802
[unreleased]: https://github.com/THM-Health/PILOS/compare/v4.2.0...develop
[v3.0.0]: https://github.com/THM-Health/PILOS/releases/tag/v3.0.0
[v3.0.1]: https://github.com/THM-Health/PILOS/releases/tag/v3.0.1
Expand Down
47 changes: 26 additions & 21 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

39 changes: 22 additions & 17 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
"@cypress/code-coverage": "^3.13.10",
"@eslint/eslintrc": "^3.1.0",
"@eslint/js": "^9.18.0",
"@eslint/json": "^0.9.1",
"@eslint/json": "^0.10.0",
"@intlify/eslint-plugin-vue-i18n": "^3.2.0",
"cypress": "^14.0.0",
"eslint": "^9.18.0",
"eslint-config-prettier": "^10.0.1",
"eslint-plugin-cypress": "^4.1.0",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-jsonc": "^2.18.2",
"eslint-plugin-jsonc": "^2.19.0",
"eslint-plugin-mocha": "^10.5.0",
"eslint-plugin-vue": "^9.32.0",
"globals": "^15.14.0",
Expand All @@ -36,7 +36,7 @@
"happo.io": "^11.0.1",
"nyc": "^17.1.0",
"prettier": "^3.4.2",
"prettier-plugin-tailwindcss": "^0.6.10",
"prettier-plugin-tailwindcss": "^0.6.11",
"vite-plugin-istanbul": "^6.0.2",
"vue-eslint-parser": "^9.4.3"
},
Expand Down Expand Up @@ -84,7 +84,7 @@
"vue-chartjs": "^5.3.2",
"vue-cropperjs": "^5.0.0",
"vue-i18n": "^11.0",
"vue-multiselect": "^3.1.0",
"vue-multiselect": "^3.2.0",
"vue-router": "^4.5.0"
},
"engines": {
Expand Down
5 changes: 1 addition & 4 deletions resources/js/components/RoomTabRecordingsDownloadButton.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<Button
v-tooltip:top="$t('rooms.recordings.download')"
as="a"
:as="props.disabled ? 'button' : 'a'"
target="_blank"
:href="downloadUrl"
severity="help"
Expand Down Expand Up @@ -29,9 +29,6 @@ const props = defineProps({
});
const downloadUrl = computed(() => {
if (props.disabled) {
return null;
}
return (
settingsStore.getSetting("general.base_url") +
"/download/recording/" +
Expand Down
6 changes: 5 additions & 1 deletion resources/js/components/SettingsRolesDeleteButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Button
v-tooltip="$t('admin.roles.delete.item', { id: props.name })"
:aria-label="$t('admin.roles.delete.item', { id: props.name })"
:disabled="isBusy"
:disabled="isBusy || props.disabled"
severity="danger"
icon="fa-solid fa-trash"
@click="showModal"
Expand Down Expand Up @@ -53,6 +53,10 @@ const props = defineProps({
type: String,
required: true,
},
disabled: {
type: Boolean,
default: false,
},
});
const emit = defineEmits(["deleted"]);
Expand Down
6 changes: 5 additions & 1 deletion resources/js/components/SettingsRoomTypesDeleteButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Button
v-tooltip="$t('admin.room_types.delete.item', { id: props.name })"
:aria-label="$t('admin.room_types.delete.item', { id: props.name })"
:disabled="isBusy"
:disabled="isBusy || props.disabled"
severity="danger"
icon="fa-solid fa-trash"
@click="showModal"
Expand Down Expand Up @@ -92,6 +92,10 @@ const props = defineProps({
type: String,
required: true,
},
disabled: {
type: Boolean,
default: false,
},
});
const emit = defineEmits(["deleted", "notFound"]);
Expand Down
6 changes: 5 additions & 1 deletion resources/js/components/SettingsServerPoolsDeleteButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Button
v-tooltip="$t('admin.server_pools.delete.item', { name: props.name })"
:aria-label="$t('admin.server_pools.delete.item', { name: props.name })"
:disabled="isBusy"
:disabled="isBusy || props.disabled"
icon="fa-solid fa-trash"
severity="danger"
@click="showModal"
Expand Down Expand Up @@ -70,6 +70,10 @@ const props = defineProps({
type: String,
required: true,
},
disabled: {
type: Boolean,
default: false,
},
});
const emit = defineEmits(["deleted"]);
Expand Down
6 changes: 5 additions & 1 deletion resources/js/components/SettingsServersDeleteButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
v-tooltip="$t('admin.servers.delete.item', { name: props.name })"
severity="danger"
icon="fa-solid fa-trash"
:disabled="isBusy"
:disabled="isBusy || props.disabled"
:aria-label="$t('admin.servers.delete.item', { name: props.name })"
@click="showModal()"
/>
Expand Down Expand Up @@ -51,6 +51,10 @@ const props = defineProps({
type: String,
required: true,
},
disabled: {
type: Boolean,
default: false,
},
});
const emit = defineEmits(["deleted"]);
Expand Down
6 changes: 5 additions & 1 deletion resources/js/components/SettingsUsersDeleteButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
lastname: props.lastname,
})
"
:disabled="isBusy"
:disabled="isBusy || props.disabled"
severity="danger"
icon="fa-solid fa-trash"
@click="showModal"
Expand Down Expand Up @@ -71,6 +71,10 @@ const props = defineProps({
type: String,
required: true,
},
disabled: {
type: Boolean,
default: false,
},
});
const emit = defineEmits(["deleted"]);
Expand Down
Loading

0 comments on commit b0144b4

Please sign in to comment.