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

[stable30] fix(AdminSettings): allow to retry server checks #13988

Merged
merged 1 commit into from
Dec 12, 2024
Merged

[stable30] fix(AdminSettings): allow to retry server checks #13988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 22 additions & 9 deletions src/components/AdminSettings/RecordingServer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,26 +23,38 @@

<NcButton v-show="!loading"
type="tertiary"
:title="t('spreed', 'Delete this server')"
:aria-label="t('spreed', 'Delete this server')"
@click="removeServer">
<template #icon>
<Delete :size="20" />
<IconDelete :size="20" />
</template>
</NcButton>

<span v-if="server" class="test-connection">
<NcLoadingIcon v-if="!checked" :size="20" />
<AlertCircle v-else-if="errorMessage" :size="20" :fill-color="'#E9322D'" />
<Check v-else :size="20" :fill-color="'#46BA61'" />
<IconAlertCircle v-else-if="errorMessage" :size="20" fill-color="var(--color-error)" />
<IconCheck v-else :size="20" fill-color="var(--color-success)" />
{{ connectionState }}
</span>

<NcButton v-if="server && checked"
type="tertiary"
:title="t('spreed', 'Test this server')"
:aria-label="t('spreed', 'Test this server')"
@click="checkServerVersion">
<template #icon>
<IconReload :size="20" />
</template>
</NcButton>
</li>
</template>

<script>
import AlertCircle from 'vue-material-design-icons/AlertCircle.vue'
import Check from 'vue-material-design-icons/Check.vue'
import Delete from 'vue-material-design-icons/Delete.vue'
import IconAlertCircle from 'vue-material-design-icons/AlertCircle.vue'
import IconCheck from 'vue-material-design-icons/Check.vue'
import IconDelete from 'vue-material-design-icons/Delete.vue'
import IconReload from 'vue-material-design-icons/Reload.vue'

import { t } from '@nextcloud/l10n'

Expand All @@ -57,9 +69,10 @@ export default {
name: 'RecordingServer',

components: {
AlertCircle,
Check,
Delete,
IconAlertCircle,
IconCheck,
IconDelete,
IconReload,
NcButton,
NcCheckboxRadioSwitch,
NcLoadingIcon,
Expand Down
37 changes: 25 additions & 12 deletions src/components/AdminSettings/SignalingServer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,28 +22,40 @@

<NcButton v-show="!loading"
type="tertiary"
:title="t('spreed', 'Delete this server')"
:aria-label="t('spreed', 'Delete this server')"
@click="removeServer">
<template #icon>
<Delete :size="20" />
<IconDelete :size="20" />
</template>
</NcButton>

<span v-if="server" class="test-connection">
<NcLoadingIcon v-if="!checked" :size="20" />
<AlertCircle v-else-if="errorMessage" :size="20" :fill-color="'#D91812'" />
<AlertCircleOutline v-else-if="warningMessage" :size="20" :fill-color="'#C28900'" />
<Check v-else :size="20" :fill-color="'#2D7B41'" />
<IconAlertCircle v-else-if="errorMessage" :size="20" fill-color="var(--color-error)" />
<IconAlertCircleOutline v-else-if="warningMessage" :size="20" fill-color="var(--color-warning)" />
<IconCheck v-else :size="20" fill-color="var(--color-success)" />
{{ connectionState }}
</span>

<NcButton v-if="server && checked"
type="tertiary"
:title="t('spreed', 'Test this server')"
:aria-label="t('spreed', 'Test this server')"
@click="checkServerVersion">
<template #icon>
<IconReload :size="20" />
</template>
</NcButton>
</li>
</template>

<script>
import AlertCircle from 'vue-material-design-icons/AlertCircle.vue'
import AlertCircleOutline from 'vue-material-design-icons/AlertCircleOutline.vue'
import Check from 'vue-material-design-icons/Check.vue'
import Delete from 'vue-material-design-icons/Delete.vue'
import IconAlertCircle from 'vue-material-design-icons/AlertCircle.vue'
import IconAlertCircleOutline from 'vue-material-design-icons/AlertCircleOutline.vue'
import IconCheck from 'vue-material-design-icons/Check.vue'
import IconDelete from 'vue-material-design-icons/Delete.vue'
import IconReload from 'vue-material-design-icons/Reload.vue'

import { t } from '@nextcloud/l10n'

Expand All @@ -58,10 +70,11 @@ export default {
name: 'SignalingServer',

components: {
AlertCircle,
AlertCircleOutline,
Check,
Delete,
IconAlertCircle,
IconAlertCircleOutline,
IconCheck,
IconDelete,
IconReload,
NcButton,
NcCheckboxRadioSwitch,
NcLoadingIcon,
Expand Down
Loading