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

Feature partner id #425

Merged
merged 2 commits into from
Mar 11, 2024
Merged

Feature partner id #425

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
2c19746
add valid partner ids
benderl Dec 18, 2023
fa1ac06
style partner id input
benderl Dec 18, 2023
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
30 changes: 20 additions & 10 deletions src/components/OpenwbBaseArrayInput.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,12 @@
<div class="input-group">
<div class="input-group-prepend">
<div class="input-group-text">
<font-awesome-icon
fixed-width
:icon="['fas', 'tag']"
/>
<slot name="input-prefix">
<font-awesome-icon
fixed-width
:icon="['fas', 'tag']"
/>
</slot>
</div>
</div>
<input
Expand All @@ -41,10 +43,12 @@
"
@click="addTag"
>
<font-awesome-icon
fixed-width
:icon="['fas', 'plus']"
/>
<slot name="input-add">
<font-awesome-icon
fixed-width
:icon="['fas', 'plus']"
/>
</slot>
</div>
</div>
</div>
Expand All @@ -59,10 +63,12 @@
v-for="(tag, index) in value"
v-bind:key="index"
>
<font-awesome-icon :icon="['fas', 'tag']" />
<slot name="element-prefix">
<font-awesome-icon :icon="['fas', 'tag']" />
</slot>
{{ tag }}
<font-awesome-icon
class="clickable"
class="clickable remove-element"
:icon="['fas', 'times-circle']"
@click="removeTag(index)"
/>
Expand Down Expand Up @@ -174,6 +180,10 @@ export default {
cursor: not-allowed;
}

.remove-element:hover {
color: var(--danger);
}

input.invalid,
input:invalid {
border: 2px solid var(--danger);
Expand Down
122 changes: 122 additions & 0 deletions src/views/CloudConfig.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,42 @@
freigegeben werden.
</template>
</openwb-base-button-group-input>
<openwb-base-array-input
v-if="newCloudData.partner"
title="Gültige Partner-IDs"
noElementsMessage="Keine Partner-ID zugeordnet."
:model-value="
$store.state.mqtt[
'openWB/system/mqtt/valid_partner_ids'
]
"
@update:model-value="
updateState(
'openWB/system/mqtt/valid_partner_ids',
$event
)
"
>
<template #input-prefix>
<font-awesome-icon
fixed-width
:icon="['fas', 'user-gear']"
/>
</template>
<template #element-prefix>
<font-awesome-icon
fixed-width
:icon="['fas', 'user-gear']"
/>
</template>
<template #help>
Die Partner-ID erhältst Du von Deinem
Installateur. Ist hier keine Partner-ID
eingetragen, dann kann auch niemand - trotz
aktiviertem Zugang für Partner - über das
Partner-Portal auf diese openWB zugreifen!
</template>
</openwb-base-array-input>
</div>
<template
#footer
Expand Down Expand Up @@ -198,6 +234,42 @@
freigegeben werden.
</template>
</openwb-base-button-group-input>
<openwb-base-array-input
v-if="connectCloudData.partner"
title="Gültige Partner-IDs"
noElementsMessage="Keine Partner-ID zugeordnet."
:model-value="
$store.state.mqtt[
'openWB/system/mqtt/valid_partner_ids'
]
"
@update:model-value="
updateState(
'openWB/system/mqtt/valid_partner_ids',
$event
)
"
>
<template #input-prefix>
<font-awesome-icon
fixed-width
:icon="['fas', 'user-gear']"
/>
</template>
<template #element-prefix>
<font-awesome-icon
fixed-width
:icon="['fas', 'user-gear']"
/>
</template>
<template #help>
Die Partner-ID erhältst Du von Deinem
Installateur. Ist hier keine Partner-ID
eingetragen, dann kann auch niemand - trotz
aktiviertem Zugang für Partner - über das
Partner-Portal auf diese openWB zugreifen!
</template>
</openwb-base-array-input>
</div>
<template
#footer
Expand Down Expand Up @@ -292,6 +364,42 @@
werden.
</template>
</openwb-base-button-group-input>
<openwb-base-array-input
v-if="cloudSettings.partner"
title="Gültige Partner-IDs"
noElementsMessage="Keine Partner-ID zugeordnet."
:model-value="
$store.state.mqtt[
'openWB/system/mqtt/valid_partner_ids'
]
"
@update:model-value="
updateState(
'openWB/system/mqtt/valid_partner_ids',
$event
)
"
>
<template #input-prefix>
<font-awesome-icon
fixed-width
:icon="['fas', 'user-gear']"
/>
</template>
<template #element-prefix>
<font-awesome-icon
fixed-width
:icon="['fas', 'user-gear']"
/>
</template>
<template #help>
Die Partner-ID erhältst Du von Deinem Installateur.
Ist hier keine Partner-ID eingetragen, dann kann
auch niemand - trotz aktiviertem Zugang für Partner
- über das Partner-Portal auf diese openWB
zugreifen!
</template>
</openwb-base-array-input>
<template #footer>
<div class="row justify-content-center">
<openwb-base-click-button
Expand Down Expand Up @@ -322,18 +430,28 @@
</template>

<script>
import { library } from "@fortawesome/fontawesome-svg-core";
import { faUserGear as fasUserGear } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";

library.add(fasUserGear);

import ComponentState from "../components/mixins/ComponentState.vue";

export default {
name: "OpenwbCloudConfig",
mixins: [ComponentState],
emits: ["sendCommand"],
components: {
FontAwesomeIcon,
},
data() {
return {
mqttTopicsToSubscribe: [
"openWB/general/extern",
"openWB/system/dataprotection_acknowledged",
"openWB/system/mqtt/bridge/+",
"openWB/system/mqtt/valid_partner_ids",
],
enableNewCloudButton: true,
newCloudData: {
Expand Down Expand Up @@ -395,6 +513,7 @@ export default {
},
createCloud() {
if (document.forms.cloudConfigCreateForm.reportValidity()) {
this.$emit("save");
this.$emit("sendCommand", {
command: "initCloud",
data: this.newCloudData,
Expand All @@ -404,6 +523,7 @@ export default {
},
connectCloud() {
if (document.forms.cloudConfigConnectForm.reportValidity()) {
this.$emit("save");
this.$emit("sendCommand", {
command: "connectCloud",
data: this.connectCloudData,
Expand All @@ -420,6 +540,8 @@ export default {
this.showCloudRemoveModal = false;
if (event == "confirm") {
console.info("request removal of cloud");
// clear valid_partner_ids
this.updateState("openWB/system/mqtt/valid_partner_ids", []);
this.$emit("sendCommand", {
command: "removeMqttBridge",
data: {
Expand Down
Loading