Skip to content

Taking EVSE chargepoints off of Meters category by refactoring getFactoriesByNature to support multiple exclusions #3672

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

Open
janklostermann wants to merge 1 commit into
base: develop
Choose a base branch
from
+8 −4
Open

Taking EVSE chargepoints off of Meters category by refactoring getFactoriesByNature to support multiple exclusions #3672

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
12 changes: 8 additions & 4 deletions ui/src/app/shared/components/edge/edgeconfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,10 @@ export class EdgeConfig {
category: { title: translate.instant("SETTINGS.CATEGORY.TITLE.METER"), icon: "speedometer-outline" },
factories: [
EdgeConfig.getFactoriesByNature(factories, "io.openems.edge.meter.api.SymmetricMeter"), // TODO replaced by ElectricityMeter
EdgeConfig.getFactoriesByNature(factories, "io.openems.edge.meter.api.ElectricityMeter", "io.openems.edge.evcs.api.Evcs"),
EdgeConfig.getFactoriesByNature(factories, "io.openems.edge.meter.api.ElectricityMeter", [
"io.openems.edge.evcs.api.Evcs",
"io.openems.edge.evse.api.chargepoint.EvseChargePoint",
]),
EdgeConfig.getFactoriesByNature(factories, "io.openems.edge.ess.dccharger.api.EssDcCharger"),
].flat(2),
},
Expand Down Expand Up @@ -281,13 +284,14 @@ export class EdgeConfig {
*
* @param factories the given EdgeConfig.Factory
* @param includeNature the name of the Nature to be included
* @param excludeNature an optional name of a Nature to be excluded
* @param excludeNature an optional name of a Nature (or list of Natures) to be excluded
*/
public static getFactoriesByNature(factories: { [id: string]: EdgeConfig.Factory }, includeNature: string, excludeNature?: string): EdgeConfig.Factory[] {
public static getFactoriesByNature(factories: { [id: string]: EdgeConfig.Factory }, includeNature: string, excludeNature?: string | string[]): EdgeConfig.Factory[] {
Copy link
Copy Markdown
Contributor

@lukasrgr lukasrgr May 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

includeNature and excludeNature could be two different types then, i would probably only expect a string if includeNature is a string,

if you just use string[] as param type, you could also save yourself from checking if it is an array or not

const result = [];
const natures = EdgeConfig.getNaturesOfFactories(factories);
const include = natures[includeNature];
const excludes = excludeNature != null && excludeNature in natures ? natures[excludeNature].factoryIds : [];
const const excludeNatures = excludeNature == null ? [] : Array.isArray(excludeNature) ? excludeNature : [excludeNature];
const excludes = excludeNatures.flatMap(n => n in natures ? natures[n].factoryIds : []);
if (include) {
for (const factoryId of include.factoryIds) {
if (excludes.includes(factoryId)) {
Expand Down
Loading