Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

UI updates: Bug fix for restricted user toggle in master realm

Rich Turner3a130a173ec7
diff --git a/container/src/main/java/org/openremote/container/persistence/PersistenceService.java b/container/src/main/java/org/openremote/container/persistence/PersistenceService.java
index b38073145..bee00483c 100644
--- a/container/src/main/java/org/openremote/container/persistence/PersistenceService.java
+++ b/container/src/main/java/org/openremote/container/persistence/PersistenceService.java
@@ -44,6 +44,7 @@ import org.openremote.model.provisioning.X509ProvisioningConfig;
import org.openremote.model.rules.AssetRuleset;
import org.openremote.model.rules.GlobalRuleset;
import org.openremote.model.rules.TenantRuleset;
+import org.openremote.model.security.RealmRole;
import org.openremote.model.security.Tenant;
import org.openremote.model.security.User;
import org.openremote.model.security.UserAttribute;
@@ -283,6 +284,7 @@ public class PersistenceService implements ContainerService {
entityClasses.add(Tenant.class.getName());
entityClasses.add(User.class.getName());
entityClasses.add(UserAttribute.class.getName());
+ entityClasses.add(RealmRole.class.getName());
entityClasses.add(GlobalRuleset.class.getName());
entityClasses.add(AssetRuleset.class.getName());
entityClasses.add(TenantRuleset.class.getName());
diff --git a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
index 89ed0ba5c..578ab4890 100644
--- a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
+++ b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
@@ -748,9 +748,7 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
@Override
public Tenant getTenant(String realm) {
try {
- RealmRepresentation realmRepresentation = getRealms(realmsResource ->
- realmsResource.realm(realm.toLowerCase(Locale.ROOT)).toRepresentation());
- return convert(realmRepresentation, Tenant.class);
+ return ManagerIdentityProvider.getTenantFromDb(persistenceService, realm);
} catch (Exception ex) {
LOG.log(Level.INFO, "Failed to get tenant for realm: " + realm, ex);
}
@@ -770,32 +768,57 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
tenant.setRealm(tenant.getRealm().toLowerCase(Locale.ROOT));
// Find existing realm by ID as realm name could have been changed
- RealmRepresentation existing = realmsResource.findAll().stream().filter(r -> r.getId().equals(tenant.getId())).findFirst().orElse(null);
- if (existing == null) {
+ RealmRepresentation realmRepresentation = realmsResource.findAll().stream().filter(r -> r.getId().equals(tenant.getId())).findFirst().orElse(null);
+
+ if (realmRepresentation == null) {
throw new IllegalStateException("Tenant must already exist, ID does not match an existing tenant");
}
- String realm = existing.getRealm();
- Tenant existingTenant = convert(existing, Tenant.class);
+ String realm = realmRepresentation.getRealm();
+ RealmResource realmResource = realmsResource.realm(realm);
+ Tenant existingTenant = getTenant(realm);
// Tenant only has a subset of realm representation so overlay on actual realm representation
- existing.setRealm(tenant.getRealm());
- existing.setDisplayName(tenant.getDisplayName());
- existing.setAccountTheme(tenant.getAccountTheme());
- existing.setAdminTheme(tenant.getAdminTheme());
- existing.setEmailTheme(tenant.getEmailTheme());
- existing.setLoginTheme(tenant.getLoginTheme());
- existing.setRememberMe(tenant.getRememberMe());
- existing.setRegistrationAllowed(tenant.getRegistrationAllowed());
- existing.setRegistrationEmailAsUsername(tenant.getRegistrationEmailAsUsername());
- existing.setEnabled(tenant.getEnabled());
- existing.setDuplicateEmailsAllowed(tenant.getDuplicateEmailsAllowed());
- existing.setResetPasswordAllowed(tenant.getResetPasswordAllowed());
- existing.setNotBefore(tenant.getNotBefore() != null ? tenant.getNotBefore().intValue() : null);
- configureRealm(existing);
-
- realmsResource.realm(realm).update(existing);
- persistenceService.publishPersistenceEvent(PersistenceEvent.Cause.UPDATE, convert(existing, Tenant.class), existingTenant, Tenant.getPropertyFields());
+ realmRepresentation.setRealm(tenant.getRealm());
+ realmRepresentation.setDisplayName(tenant.getDisplayName());
+ realmRepresentation.setAccountTheme(tenant.getAccountTheme());
+ realmRepresentation.setAdminTheme(tenant.getAdminTheme());
+ realmRepresentation.setEmailTheme(tenant.getEmailTheme());
+ realmRepresentation.setLoginTheme(tenant.getLoginTheme());
+ realmRepresentation.setRememberMe(tenant.getRememberMe());
+ realmRepresentation.setRegistrationAllowed(tenant.getRegistrationAllowed());
+ realmRepresentation.setRegistrationEmailAsUsername(tenant.getRegistrationEmailAsUsername());
+ realmRepresentation.setEnabled(tenant.getEnabled());
+ realmRepresentation.setDuplicateEmailsAllowed(tenant.getDuplicateEmailsAllowed());
+ realmRepresentation.setResetPasswordAllowed(tenant.getResetPasswordAllowed());
+ realmRepresentation.setNotBefore(tenant.getNotBefore() != null ? tenant.getNotBefore().intValue() : null);
+ configureRealm(realmRepresentation);
+ realmResource.update(realmRepresentation);
+
+ Set<RealmRole> existingRealmRoles = existingTenant.getRealmRoles();
+ existingTenant.setRealmRoles(existingRealmRoles);
+
+ // Update realm roles if required
+ if (tenant.getRealmRoles() != null) {
+
+ Set<RealmRole> realmRoles = tenant.getNormalisedRealmRoles();
+ RolesResource rolesResource = realmResource.roles();
+
+ // Handle removed roles
+ existingRealmRoles.stream().filter(realmRole -> !realmRoles.contains(realmRole)).forEach(realmRole -> {
+ LOG.finer("Removing realm role + " + realmRole);
+ rolesResource.deleteRole(realmRole.getName());
+ });
+ // Handle added roles
+ realmRoles.stream().filter(realmRole -> !existingRealmRoles.contains(realmRole)).forEach(realmRole -> {
+ LOG.finer("Adding realm role + " + realmRole);
+ rolesResource.create(new RoleRepresentation(realmRole.getName(), realmRole.getDescription(), false));
+ });
+ }
+
+ Tenant updatedTenant = convert(realmRepresentation, Tenant.class);
+ updatedTenant.setRealmRoles((tenant.getRealmRoles() == null) ? existingRealmRoles : tenant.getNormalisedRealmRoles());
+ persistenceService.publishPersistenceEvent(PersistenceEvent.Cause.UPDATE, updatedTenant, existingTenant, Tenant.getPropertyFields());
return null;
});
}
@@ -819,14 +842,21 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
configureRealm(realmRepresentation);
realmResource.update(realmRepresentation);
+ // Set realm roles
+ RolesResource rolesResource = realmResource.roles();
+ List<RoleRepresentation> existingRealmRoles = rolesResource.list();
+ tenant.getNormalisedRealmRoles().stream().filter(realmRole -> existingRealmRoles.stream().noneMatch(roleRepresentation -> roleRepresentation.getName().equals(realmRole.getName())))
+ .forEach(realmRole -> {
+ LOG.finer("Adding realm role + " + realmRole);
+ rolesResource.create(new RoleRepresentation(realmRole.getName(), realmRole.getDescription(), false));
+ });
+
// Auto create the standard openremote client
ClientRepresentation clientRepresentation = generateOpenRemoteClientRepresentation();
createUpdateClient(tenant.getRealm(), clientRepresentation);
- // Add restricted realm role
- realmResource.roles().create(new RoleRepresentation(RESTRICTED_USER_REALM_ROLE, "Restricted access to assets", false));
-
Tenant createdTenant = convert(realmRepresentation, Tenant.class);
+ createdTenant.setRealmRoles(tenant.getRealmRoles());
persistenceService.publishPersistenceEvent(PersistenceEvent.Cause.CREATE, tenant, null, Tenant.getPropertyFields());
return createdTenant;
} catch (Exception e) {
@@ -1061,7 +1091,7 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
return false;
}
- public void configureRealm(RealmRepresentation realmRepresentation) {
+ protected void configureRealm(RealmRepresentation realmRepresentation) {
realmRepresentation.setAccessTokenLifespan(Constants.ACCESS_TOKEN_LIFESPAN_SECONDS);
diff --git a/manager/src/main/java/org/openremote/manager/security/UserResourceImpl.java b/manager/src/main/java/org/openremote/manager/security/UserResourceImpl.java
index bcd26179f..83da42f9f 100644
--- a/manager/src/main/java/org/openremote/manager/security/UserResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/security/UserResourceImpl.java
@@ -281,19 +281,6 @@ public class UserResourceImpl extends ManagerWebResource implements UserResource
}
}
- @Override
- public Role[] getRealmRoles(RequestParams requestParams, String realm) {
- try {
- return identityService.getIdentityProvider().getRoles(
- realm,
- null);
- } catch (ClientErrorException ex) {
- throw new WebApplicationException(ex.getCause(), ex.getResponse().getStatus());
- } catch (Exception ex) {
- throw new WebApplicationException(ex);
- }
- }
-
@Override
public void updateRoles(RequestParams requestParams, String realm, Role[] roles) {
updateClientRoles(requestParams, realm, roles, KEYCLOAK_CLIENT_ID);
diff --git a/manager/src/main/java/org/openremote/manager/setup/KeycloakInitSetup.java b/manager/src/main/java/org/openremote/manager/setup/KeycloakInitSetup.java
index f250685d9..e41d3dd5b 100644
--- a/manager/src/main/java/org/openremote/manager/setup/KeycloakInitSetup.java
+++ b/manager/src/main/java/org/openremote/manager/setup/KeycloakInitSetup.java
@@ -21,15 +21,11 @@ package org.openremote.manager.setup;
import org.openremote.container.util.UniqueIdentifierGenerator;
import org.openremote.model.Container;
-import org.openremote.model.auth.OAuthClientCredentialsGrant;
-import org.openremote.model.auth.OAuthGrant;
import org.openremote.model.auth.OAuthPasswordGrant;
import org.openremote.model.security.ClientRole;
-import org.openremote.model.security.Role;
import org.openremote.model.security.Tenant;
import org.openremote.model.security.User;
-import java.util.logging.Level;
import java.util.logging.Logger;
import static org.openremote.container.security.keycloak.KeycloakIdentityProvider.MANAGER_CLIENT_ID;
@@ -52,6 +48,7 @@ public class KeycloakInitSetup extends AbstractKeycloakSetup {
// e.g. Set SMTP server, theme, timeouts, etc.
Tenant masterRealm = keycloakProvider.getTenant(MASTER_REALM);
masterRealm.setDisplayName("Master");
+ masterRealm.setRealmRoles(masterRealm.getNormalisedRealmRoles());
keycloakProvider.updateTenant(masterRealm);
// Create our client application with its default roles in the master realm
diff --git a/model/src/main/java/org/openremote/model/security/RealmRole.java b/model/src/main/java/org/openremote/model/security/RealmRole.java
new file mode 100644
index 000000000..6b217f3ae
--- /dev/null
+++ b/model/src/main/java/org/openremote/model/security/RealmRole.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2021, OpenRemote Inc.
+ *
+ * See the CONTRIBUTORS.txt file in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.openremote.model.security;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonValue;
+import org.hibernate.annotations.Subselect;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import java.util.Objects;
+
+@Entity
+@Subselect("select * from PUBLIC.KEYCLOAK_ROLE where CLIENT is NULL") // Map this immutable to an SQL view, don't use/create table
+public class RealmRole {
+
+ @JsonIgnore
+ @Id
+ protected String id;
+
+ @Column(name = "name")
+ protected String name;
+
+ @Column(name = "description")
+ protected String description;
+
+ protected RealmRole() {}
+
+ @JsonCreator
+ public RealmRole(String name, String description) {
+ this.name = name;
+ this.description = description;
+ }
+
+ public RealmRole(String name) {
+ this.name = name;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ RealmRole realmRole = (RealmRole) o;
+ return name.equals(realmRole.name);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(name);
+ }
+
+ @Override
+ public String toString() {
+ return getClass().getSimpleName() + "{" +
+ "name='" + name + '\'' +
+ ", description='" + description + '\'' +
+ '}';
+ }
+}
diff --git a/model/src/main/java/org/openremote/model/security/Tenant.java b/model/src/main/java/org/openremote/model/security/Tenant.java
index 490bbf8cc..e893c8224 100644
--- a/model/src/main/java/org/openremote/model/security/Tenant.java
+++ b/model/src/main/java/org/openremote/model/security/Tenant.java
@@ -19,18 +19,19 @@
*/
package org.openremote.model.security;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import org.hibernate.annotations.Formula;
import org.hibernate.annotations.Subselect;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Transient;
+import javax.persistence.*;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;
import java.lang.reflect.Field;
-import java.util.Arrays;
+import java.util.*;
+
+import static org.openremote.model.Constants.MASTER_REALM;
+import static org.openremote.model.Constants.RESTRICTED_USER_REALM_ROLE;
/**
* This can be used (among other things) to query the REALM table in JPA queries.
@@ -87,6 +88,10 @@ public class Tenant {
@Transient
protected Integer accessTokenLifespan;
+ @OneToMany(fetch = FetchType.EAGER)
+ @JoinColumn(name = "REALM_ID")
+ protected Set<RealmRole> realmRoles;
+
public Tenant() {
this(null, null, null, null);
}
@@ -233,6 +238,24 @@ public class Tenant {
return this;
}
+ public Set<RealmRole> getRealmRoles() {
+ return realmRoles;
+ }
+
+ @JsonIgnore
+ public Set<RealmRole> getNormalisedRealmRoles() {
+ Set<RealmRole> tempSet = new LinkedHashSet<>(getDefaultRealmRoles(getRealm()));
+ if (realmRoles != null) {
+ tempSet.addAll(realmRoles);
+ }
+ return tempSet;
+ }
+
+ public Tenant setRealmRoles(Set<RealmRole> realmRoles) {
+ this.realmRoles = realmRoles;
+ return this;
+ }
+
public static Field[] getPropertyFields() {
if (propertyFields == null) {
propertyFields = Arrays.stream(Tenant.class.getDeclaredFields())
@@ -242,6 +265,26 @@ public class Tenant {
return propertyFields;
}
+ protected static List<RealmRole> getDefaultRealmRoles(String realm) {
+ if (MASTER_REALM.equals(realm)) {
+ return Arrays.asList(
+ new RealmRole("default-roles-master"),
+ new RealmRole("admin"),
+ new RealmRole("create-realm"),
+ new RealmRole("offline_access"),
+ new RealmRole("uma_authorization"),
+ new RealmRole(RESTRICTED_USER_REALM_ROLE, "Restricted access to assets")
+ );
+ }
+
+ return Arrays.asList(
+ new RealmRole("default-roles-" + realm),
+ new RealmRole("offline_access"),
+ new RealmRole("uma_authorization"),
+ new RealmRole(RESTRICTED_USER_REALM_ROLE, "Restricted access to assets")
+ );
+ }
+
@Override
public String toString() {
return getClass().getSimpleName() + "{" +
diff --git a/model/src/main/java/org/openremote/model/security/UserResource.java b/model/src/main/java/org/openremote/model/security/UserResource.java
index 2f741bd15..6fc39234e 100644
--- a/model/src/main/java/org/openremote/model/security/UserResource.java
+++ b/model/src/main/java/org/openremote/model/security/UserResource.java
@@ -54,13 +54,6 @@ public interface UserResource {
@RolesAllowed(Constants.WRITE_ADMIN_ROLE)
Role[] getClientRoles(@BeanParam RequestParams requestParams, @PathParam("realm") String realm, @PathParam("clientId") String clientId);
- @GET
- @Path("{realm}/realm-roles")
- @Produces(APPLICATION_JSON)
- @SuppressWarnings("unusable-by-js")
- @RolesAllowed(Constants.WRITE_ADMIN_ROLE)
- Role[] getRealmRoles(@BeanParam RequestParams requestParams, @PathParam("realm") String realm);
-
@PUT
@Path("{realm}/roles")
@Consumes(APPLICATION_JSON)
diff --git a/ui/app/manager/src/pages/page-realms.ts b/ui/app/manager/src/pages/page-realms.ts
index 17af26736..e50a5cff0 100644
--- a/ui/app/manager/src/pages/page-realms.ts
+++ b/ui/app/manager/src/pages/page-realms.ts
@@ -367,7 +367,7 @@ class PageRealms<S extends AppStateKeyed> extends Page<S> {
<div class="row">
<div class="column">
<or-mwc-input ?readonly="${tenant.id}" .label="${i18next.t("realm")}" .type="${InputType.TEXT}" min="1" required .value="${tenant.realm}" @or-mwc-input-changed="${(e: OrInputChangedEvent) => tenant.realm = e.detail.value}"></or-mwc-input>
- <or-mwc-input ?readonly="${readonly}" .label="${i18next.t("enabled")}" .type="${InputType.SWITCH}" min="1" .value="${tenant.enabled}" @or-mwc-input-changed="${(e: OrInputChangedEvent) =>tenant.enabled = e.detail.value}}"></or-mwc-input>
+ <or-mwc-input ?readonly="${readonly}" .label="${i18next.t("enabled")}" .type="${InputType.SWITCH}" min="1" .value="${tenant.enabled}" @or-mwc-input-changed="${(e: OrInputChangedEvent) =>tenant.enabled = e.detail.value}"></or-mwc-input>
</div>
<div class="column">
<or-mwc-input .label="${i18next.t("displayName")}" .type="${InputType.TEXT}" min="1" required .value="${tenant.displayName}" @or-mwc-input-changed="${(e: OrInputChangedEvent) => tenant.displayName = e.detail.value}"></or-mwc-input>
diff --git a/ui/app/manager/src/pages/page-users.ts b/ui/app/manager/src/pages/page-users.ts
index f9088f068..695e05862 100644
--- a/ui/app/manager/src/pages/page-users.ts
+++ b/ui/app/manager/src/pages/page-users.ts
@@ -5,7 +5,7 @@ import "@openremote/or-components/or-panel";
import "@openremote/or-translate";
import {EnhancedStore} from "@reduxjs/toolkit";
import {AppStateKeyed, Page, PageProvider} from "@openremote/or-app";
-import {ClientRole, Role, User, UserAssetLink, UserQuery} from "@openremote/model";
+import {ClientRole, RealmRole, Role, User, UserAssetLink, UserQuery} from "@openremote/model";
import {i18next} from "@openremote/or-translate";
import {OrIcon} from "@openremote/or-icon";
import {InputType, OrInputChangedEvent, OrMwcInput} from "@openremote/or-mwc-components/or-mwc-input";
@@ -221,7 +221,7 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {
@state()
protected _roles: Role[] = [];
@state()
- protected _realmRoles: Role[] = [];
+ protected _realmRoles: RealmRole[] = [];
@state()
protected _compositeRoles: Role[] = [];
protected _loading: boolean = false;
@@ -293,9 +293,9 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {
return;
}
- const realmRoleResponse = await manager.rest.api.UserResource.getRealmRoles(manager.displayRealm);
+ const tenantResponse = await manager.rest.api.TenantResource.get(manager.displayRealm);
- if (!this.responseAndStateOK(stateChecker, roleResponse, i18next.t("loadFailedRoles"))) {
+ if (!this.responseAndStateOK(stateChecker, tenantResponse, i18next.t("loadFailedRoles"))) {
return;
}
@@ -307,7 +307,7 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {
this._compositeRoles = roleResponse.data.filter(role => role.composite).sort(Util.sortByString(role => role.name));
this._roles = roleResponse.data.filter(role => !role.composite).sort(Util.sortByString(role => role.name));
- this._realmRoles = realmRoleResponse.data.sort(Util.sortByString(role => role.name));
+ this._realmRoles = (tenantResponse.data.realmRoles || []).sort(Util.sortByString(role => role.name));
this._users = usersResponse.data.filter(user => !user.serviceAccount).sort(Util.sortByString(u => u.username));
this._serviceUsers = usersResponse.data.filter(user => user.serviceAccount).sort(Util.sortByString(u => u.username));
this._loading = false;
diff --git a/ui/component/or-rules/src/index.ts b/ui/component/or-rules/src/index.ts
index eb8afb400..26122fc41 100644
--- a/ui/component/or-rules/src/index.ts
+++ b/ui/component/or-rules/src/index.ts
@@ -41,6 +41,7 @@ import {ValueInputProviderGenerator} from "@openremote/or-mwc-components/or-mwc-
import {showOkCancelDialog} from "@openremote/or-mwc-components/or-mwc-dialog";
export const enum ConditionType {
+ AGENT_QUERY = "agentQuery",
ASSET_QUERY = "assetQuery",
TIMER = "timer"
}
@@ -194,7 +195,7 @@ export function getAssetIdsFromQuery(query?: AssetQuery) {
return query && query.ids ? [...query.ids] : undefined;
}
-export const getAssetTypes = async () => {
+export const getAssetTypes: () => Promise<string[]> = async () => {
// RT: Change to just get all asset types for now as if an instance of a particular asset doesn't exist you
// won't be able to create a rule for it (e.g. if no ConsoleAsset in a realm then cannot create a console rule)
return AssetModelUtil.getAssetTypeInfos().filter((ati) => ati.assetDescriptor!.name !== WellknownAssets.UNKNOWNASSET).map(ati => ati.assetDescriptor!.name!);
diff --git a/ui/component/or-rules/src/json-viewer/or-rule-condition.ts b/ui/component/or-rules/src/json-viewer/or-rule-condition.ts
index f8af2a453..327e60164 100644
--- a/ui/component/or-rules/src/json-viewer/or-rule-condition.ts
+++ b/ui/component/or-rules/src/json-viewer/or-rule-condition.ts
@@ -17,33 +17,61 @@ import {OrRuleAssetQuery} from "./or-rule-asset-query";
const TIMER_COLOR = "4b87ea";
const DATE_TIME_COLOR = "6AEAA4";
-export function getWhenTypesMenu(config?: RulesConfig, assetInfos?: AssetTypeInfo[]): ListItem[] {
+export function getWhenTypesMenu(config?: RulesConfig, assetInfos?: AssetTypeInfo[]): (ListItem | null)[] {
let addAssetTypes = true;
+ let addAgentTypes = true;
let addTimer = true;
if (config && config.controls && config.controls.allowedConditionTypes) {
addAssetTypes = config.controls.allowedConditionTypes.indexOf(ConditionType.ASSET_QUERY) >= 0;
+ addAgentTypes = config.controls.allowedConditionTypes.indexOf(ConditionType.AGENT_QUERY) >= 0;
addTimer = config.controls.allowedConditionTypes.indexOf(ConditionType.TIMER) >= 0;
}
- const menu: ListItem[] = [];
+ const menu: (ListItem | null)[] = [];
- if (addAssetTypes && assetInfos) {
- menu.push(...assetInfos.filter((assetInfo) => assetInfo.assetDescriptor!.descriptorType !== "agent").map((assetTypeInfo) => {
+ if (assetInfos) {
- const color = AssetModelUtil.getAssetDescriptorColour(assetTypeInfo);
- const icon = AssetModelUtil.getAssetDescriptorIcon(assetTypeInfo);
- const styleMap = color ? {"--or-icon-fill": "#" + color} : undefined;
+ if (addAssetTypes) {
+ const items = assetInfos.filter((assetInfo) => assetInfo.assetDescriptor!.descriptorType !== "agent").map((assetTypeInfo) => {
- return {
- text: Util.getAssetTypeLabel(assetTypeInfo.assetDescriptor!),
- value: assetTypeInfo.assetDescriptor!.name,
- icon: icon ? icon : AssetModelUtil.getAssetDescriptorIcon(WellknownAssets.THINGASSET),
- styleMap: styleMap
- } as ListItem;
- })
- .sort(Util.sortByString((listItem) => listItem.value!)));
+ const color = AssetModelUtil.getAssetDescriptorColour(assetTypeInfo);
+ const icon = AssetModelUtil.getAssetDescriptorIcon(assetTypeInfo);
+ const styleMap = color ? {"--or-icon-fill": "#" + color} : undefined;
+
+ return {
+ text: Util.getAssetTypeLabel(assetTypeInfo.assetDescriptor!),
+ value: assetTypeInfo.assetDescriptor!.name,
+ icon: icon ? icon : AssetModelUtil.getAssetDescriptorIcon(WellknownAssets.THINGASSET),
+ styleMap: styleMap
+ } as ListItem;
+ });
+
+ menu.push(...items.sort(Util.sortByString((listItem) => listItem.text!)));
+ }
+
+ if (addAssetTypes && addAgentTypes) {
+ menu.push(null);
+ }
+
+ if (addAgentTypes) {
+ const items = assetInfos.filter((assetInfo) => assetInfo.assetDescriptor!.descriptorType === "agent").map((assetTypeInfo) => {
+
+ const color = AssetModelUtil.getAssetDescriptorColour(assetTypeInfo);
+ const icon = AssetModelUtil.getAssetDescriptorIcon(assetTypeInfo);
+ const styleMap = color ? {"--or-icon-fill": "#" + color} : undefined;
+
+ return {
+ text: Util.getAssetTypeLabel(assetTypeInfo.assetDescriptor!),
+ value: assetTypeInfo.assetDescriptor!.name,
+ icon: icon ? icon : AssetModelUtil.getAssetDescriptorIcon(WellknownAssets.THINGASSET),
+ styleMap: styleMap
+ } as ListItem;
+ });
+
+ menu.push(...items.sort(Util.sortByString((listItem) => listItem.text!)));
+ }
}
if (addTimer) {