Skip to content

Commit d17bcb4

Browse files
authored
Merge pull request #786 from nextcloud/chore/improve-haproxy-password-ux
chore: improve haproxy password UX in daemon details modal
2 parents 822b9b4 + 857eece commit d17bcb4

File tree

3 files changed

+3
-24
lines changed

3 files changed

+3
-24
lines changed

js/app_api-adminSettings.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/app_api-adminSettings.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/components/DaemonConfig/DaemonConfigDetailsModal.vue

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,7 @@
3030
<h3>{{ t('app_api', 'Deploy options') }}</h3>
3131
<p><b>{{ t('app_api', 'Docker network') }}: </b>{{ daemon.deploy_config.net }}</p>
3232
<p><b>{{ t('app_api', 'Nextcloud URL') }}: </b>{{ daemon.deploy_config.nextcloud_url }}</p>
33-
<p v-if="daemon.deploy_config.haproxy_password" class="external-label">
34-
<label for="haproxy_password"><b>{{ t('app_api', 'HaProxy password') }}: </b></label>
35-
<NcPasswordField
36-
id="haproxy_password"
37-
:model-value="daemon.deploy_config?.haproxy_password"
38-
:disable="true"
39-
style="width: fit-content;"
40-
readonly
41-
autocomplete="off" />
42-
</p>
33+
<p><b>{{ t('app_api', 'HaProxy password') }}: </b>{{ daemon.deploy_config?.haproxy_password ? '**************' : t('app_api', '(not set)') }}</p>
4334
<p>
4435
<b>{{ t('app_api', 'GPU support') }}:</b> {{ daemon.deploy_config.computeDevice && daemon.deploy_config?.computeDevice?.id !== 'cpu' || false }}
4536
</p>
@@ -79,7 +70,6 @@ import { showSuccess, showError } from '@nextcloud/dialogs'
7970
import NcModal from '@nextcloud/vue/components/NcModal'
8071
import NcButton from '@nextcloud/vue/components/NcButton'
8172
import NcNoteCard from '@nextcloud/vue/components/NcNoteCard'
82-
import NcPasswordField from '@nextcloud/vue/components/NcPasswordField'
8373
8474
import NcLoadingIcon from '@nextcloud/vue/components/NcLoadingIcon'
8575
import Connection from 'vue-material-design-icons/Connection.vue'
@@ -91,7 +81,6 @@ export default {
9181
NcButton,
9282
NcNoteCard,
9383
NcLoadingIcon,
94-
NcPasswordField,
9584
Connection,
9685
},
9786
props: {
@@ -173,14 +162,4 @@ export default {
173162
justify-content: space-between;
174163
margin: 20px 0;
175164
}
176-
177-
.external-label {
178-
display: flex;
179-
align-items: center;
180-
width: 100%;
181-
182-
label {
183-
margin-right: 5px;
184-
}
185-
}
186165
</style>

0 commit comments

Comments
 (0)