Merge tag '0.123.9' into feature/lastmanagement

# Conflicts: # cmd/setup.go # core/loadpoint_test.go # core/site.go
hoermto · Feb 12, 2024 · f0c8829 · f0c8829
2 parents e9ce21d + ffc3ccd
commit f0c8829
Show file tree

Hide file tree

Showing 206 changed files with 3,052 additions and 1,988 deletions.
diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
@@ -18,7 +18,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      # - uses: actions/setup-go@v4
+      # - uses: actions/setup-go@v5
       - uses: erezrokah/setup-go@feat/add_cache_prefix
         with:
           go-version: ${{ env.GO_VERSION }}
@@ -70,7 +70,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      # - uses: actions/setup-go@v4
+      # - uses: actions/setup-go@v5
       - uses: erezrokah/setup-go@feat/add_cache_prefix
         with:
           go-version: ${{ env.GO_VERSION }}
@@ -87,7 +87,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: ${{ env.GO_VERSION }}
           cache: false # avoid cache thrashing
@@ -166,7 +166,7 @@ jobs:
       - name: Run tests
         run: npx playwright test
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: playwright-report

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: ${{ env.GO_VERSION }}
         id: go

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -82,7 +82,7 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: ${{ env.GO_VERSION }}
         id: go

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -61,7 +61,7 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: ${{ env.GO_VERSION }}
         id: go

diff --git a/.github/workflows/stale.yaml b/.github/workflows/stale.yaml
@@ -9,7 +9,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@v9
         id: stale
         with:
           days-before-stale: 20

diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml
@@ -6,7 +6,7 @@ env:
 on:
   push:
     branches: [master]
-    paths: ["templates/evcc.io/**"]
+    paths: ["templates/**"]
   workflow_dispatch:
 
 jobs:
@@ -17,14 +17,17 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: ${{ env.GO_VERSION }}
         id: go
 
       - name: Build docs
         run: make install docs
 
+      - name: Remove .gitignore to allow brands.json to be committed
+        run: rm templates/evcc.io/.gitignore
+
       - name: Deploy to evcc.io repo
         uses: peaceiris/actions-gh-pages@v3
         with:

diff --git a/api/api.go b/api/api.go
@@ -9,7 +9,7 @@ import (
 	"time"
 )
 
-//go:generate mockgen -package api -destination mock.go github.com/evcc-io/evcc/api Charger,ChargeState,PhaseSwitcher,Identifier,Meter,MeterEnergy,Vehicle,ChargeRater,Battery,Tariff,BatteryController
+//go:generate mockgen -package api -destination mock.go github.com/evcc-io/evcc/api Charger,ChargeState,CurrentLimiter,PhaseSwitcher,Identifier,Meter,MeterEnergy,Vehicle,ChargeRater,Battery,Tariff,BatteryController
 
 // ChargeMode is the charge operation mode. Valid values are off, now, minpv and pv
 type ChargeMode string

diff --git a/api/mock.go b/api/mock.go
diff --git a/assets/css/app.css b/assets/css/app.css
@@ -78,6 +78,7 @@
 	--evcc-accent2: var(--evcc-dark-green);
 	--evcc-accent3: var(--evcc-darker-green);
 	--bs-primary: var(--evcc-dark-green);
+	--bs-border-color-translucent: rgba(255, 255, 255, 0.175);
 }
 
 html {

diff --git a/assets/js/api.js b/assets/js/api.js
@@ -15,10 +15,14 @@ const api = axios.create({
 api.interceptors.response.use(
   (response) => response,
   (error) => {
-    let message = error.message;
+    const message = [`${error.message}.`];
+    if (error.response?.data?.error) {
+      message.push(`${error.response.data.error}.`);
+    }
     if (error.config) {
+      const method = error.config.method.toUpperCase();
       const url = error.config.baseURL + error.config.url;
-      message += `: API request failed ${url}`;
+      message.push(`${method} ${url}`);
     }
     window.app.raise({ message });
     return Promise.reject(error);

diff --git a/assets/js/components/BatterySettingsModal.vue b/assets/js/components/BatterySettingsModal.vue
@@ -216,40 +216,35 @@
 										</small>
 									</span>
 								</p>
-								<p>
-									<small>
-										{{ $t("batterySettings.note") }}
-									</small>
+								<p class="small text-muted">
+									<strong class="text-evcc">
+										{{ $t("batterySettings.disclaimerHint") }}
+									</strong>
+									{{ $t("batterySettings.disclaimerText") }}
 								</p>
 							</div>
 						</div>
-						<div v-if="$hiddenFeatures()">
-							<FormRow
-								v-if="controllable"
-								id="batteryDischargeControl"
-								:label="`${$t('batterySettings.control')}`"
-							>
-								<div class="form-check form-switch col-form-label">
-									<input
-										id="batteryDischargeControl"
-										:checked="batteryDischargeControl"
-										class="form-check-input"
-										type="checkbox"
-										role="switch"
-										@change="changeDischargeControl"
-									/>
-									<div class="form-check-label">
-										<label for="batteryDischargeControl">
-											{{ $t("batterySettings.discharge") }}
-											<span title="experimental">🧪</span>
-										</label>
-									</div>
+						<FormRow
+							v-if="controllable"
+							id="batteryDischargeControl"
+							:label="`${$t('batterySettings.control')}`"
+						>
+							<div class="form-check form-switch col-form-label">
+								<input
+									id="batteryDischargeControl"
+									:checked="batteryDischargeControl"
+									class="form-check-input"
+									type="checkbox"
+									role="switch"
+									@change="changeDischargeControl"
+								/>
+								<div class="form-check-label">
+									<label for="batteryDischargeControl">
+										{{ $t("batterySettings.discharge") }}
+									</label>
 								</div>
-							</FormRow>
-							<p v-else>
-								<small>{{ $t("batterySettings.notControllable") }}</small>
-							</p>
-						</div>
+							</div>
+						</FormRow>
 					</div>
 				</div>
 			</div>

diff --git a/assets/js/components/ChargingPlan.vue b/assets/js/components/ChargingPlan.vue
@@ -43,7 +43,9 @@
 						<div class="modal-header">
 							<h5 class="modal-title">
 								{{ $t("main.chargingPlan.modalTitle")
-								}}<span v-if="socBasedPlanning">: {{ vehicle.title }}</span>
+								}}<span v-if="socBasedPlanning && vehicle"
+									>: {{ vehicle.title }}</span
+								>
 							</h5>
 							<button
 								type="button"
@@ -203,7 +205,7 @@ export default {
 			);
 		},
 		apiVehicle: function () {
-			return `vehicles/${this.vehicle.name}/`;
+			return `vehicles/${this.vehicle?.name}/`;
 		},
 		apiLoadpoint: function () {
 			return `loadpoints/${this.id}/`;

diff --git a/assets/js/components/ChargingPlanArrival.vue b/assets/js/components/ChargingPlanArrival.vue
@@ -1,7 +1,4 @@
 <template>
-	<div v-if="!socBasedCharging" class="alert alert-secondary my-4" role="alert">
-		{{ $t("main.loadpointSettings.onlyForSocBasedCharging") }}
-	</div>
 	<div class="mt-4 container">
 		<div class="row">
 			<div class="col-6 col-lg-3 col-form-label">
@@ -50,6 +47,12 @@
 			</small>
 		</div>
 	</div>
+	<div v-if="!socBasedCharging" class="mx-2 small text-muted">
+		<strong class="text-evcc">
+			{{ $t("main.loadpointSettings.disclaimerHint") }}
+		</strong>
+		{{ $t("main.loadpointSettings.onlyForSocBasedCharging") }}
+	</div>
 </template>
 
 <script>

diff --git a/assets/js/components/ChargingSessionModal.vue b/assets/js/components/ChargingSessionModal.vue
@@ -39,6 +39,7 @@
 											class="options"
 											:vehicles="vehicles"
 											:is-unknown="false"
+											connected
 											@change-vehicle="changeVehicle"
 											@remove-vehicle="removeVehicle"
 										>