100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Users pagination (#867)
Martin Peetersbfe38c5c771e
diff --git a/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java b/manager/src/main/java/org/openremote/manager/gateway/GatewayService.javaindex 699383890..09bd28de6 100644--- a/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java+++ b/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java@@ -644,7 +644,7 @@ public class GatewayService extends RouteBuilder implements ContainerService, As.setServiceAccount(true).setSystemAccount(true).setUsername(clientId)- .setEnabled(!gateway.getDisabled().orElse(false)), secret);+ .setEnabled(!gateway.getDisabled().orElse(false)), secret, true);}if (!userExists && gatewayUser != null) {diff --git a/manager/src/main/java/org/openremote/manager/provisioning/UserAssetProvisioningMQTTHandler.java b/manager/src/main/java/org/openremote/manager/provisioning/UserAssetProvisioningMQTTHandler.javaindex d9bccfd3d..5592f4bdd 100644--- a/manager/src/main/java/org/openremote/manager/provisioning/UserAssetProvisioningMQTTHandler.java+++ b/manager/src/main/java/org/openremote/manager/provisioning/UserAssetProvisioningMQTTHandler.java@@ -430,7 +430,7 @@ public class UserAssetProvisioningMQTTHandler extends MQTTHandler {.setUsername(username);String secret = UniqueIdentifierGenerator.generateId();- serviceUser = identityProvider.createUpdateUser(realm, serviceUser, secret);+ serviceUser = identityProvider.createUpdateUser(realm, serviceUser, secret, true);if (provisioningConfig.getUserRoles() != null && provisioningConfig.getUserRoles().length > 0) {LOG.finer("Setting user roles: realm=" + realm + ", username=" + username + ", roles=" + Arrays.toString(provisioningConfig.getUserRoles()));diff --git a/manager/src/main/java/org/openremote/manager/security/ManagerBasicIdentityProvider.java b/manager/src/main/java/org/openremote/manager/security/ManagerBasicIdentityProvider.javaindex 644e6f9dd..61b448122 100644--- a/manager/src/main/java/org/openremote/manager/security/ManagerBasicIdentityProvider.java+++ b/manager/src/main/java/org/openremote/manager/security/ManagerBasicIdentityProvider.java@@ -72,7 +72,7 @@ public class ManagerBasicIdentityProvider extends BasicIdentityProvider implemenUser adminUser = new User();adminUser.setUsername(MASTER_REALM_ADMIN_USER);- createUpdateUser(MASTER_REALM, adminUser, adminPassword);+ createUpdateUser(MASTER_REALM, adminUser, adminPassword, true);}}@@ -97,7 +97,7 @@ public class ManagerBasicIdentityProvider extends BasicIdentityProvider implemen}@Override- public User createUpdateUser(String realm, User user, String password) {+ public User createUpdateUser(String realm, User user, String password, boolean allowUpdate) {if (!realm.equals(MASTER_REALM)) {throw new UnsupportedOperationException("This provider does not support realms other than master");}@@ -109,9 +109,11 @@ public class ManagerBasicIdentityProvider extends BasicIdentityProvider implemenLOG.info("Creating user: " + user);user.setId(UUID.randomUUID().toString());persistenceService.doTransaction(em -> em.unwrap(Session.class).doWork(connection -> {- String sql = "insert into PUBLIC.USER_ENTITY(ID, REALM_ID, USERNAME, PASSWORD, FIRST_NAME, LAST_NAME, EMAIL, ENABLED) values (?, ?, ?, ?, ?, ?, ?, ?)" +- "ON CONFLICT (ID) DO UPDATE " +- "SET username = excluded.username, password = excluded.password, first_name = excluded.first_name, last_name = excluded.last_name, email = excluded.email, enabled = excluded.enabled";+ String sql = "insert into PUBLIC.USER_ENTITY(ID, REALM_ID, USERNAME, PASSWORD, FIRST_NAME, LAST_NAME, EMAIL, ENABLED) values (?, ?, ?, ?, ?, ?, ?, ?)";+ if(allowUpdate) {+ sql += " ON CONFLICT (ID, USERNAME) DO UPDATE";+ }+ sql += " SET username = excluded.username, password = excluded.password, first_name = excluded.first_name, last_name = excluded.last_name, email = excluded.email, enabled = excluded.enabled";try (PreparedStatement st = connection.prepareStatement(sql)) {st.setString(1, UUID.randomUUID().toString());st.setString(2, MASTER_REALM); // For master REALM NAME and ID are the samediff --git a/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.java b/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.javaindex 045805fc2..dfa5864f1 100644--- a/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.java+++ b/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.java@@ -49,7 +49,7 @@ public interface ManagerIdentityProvider extends IdentityProvider {User getUserByUsername(String realm, String username);- User createUpdateUser(String realm, User user, String password);+ User createUpdateUser(String realm, User user, String password, boolean allowUpdate);void deleteUser(String realm, String userId);diff --git a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.javaindex 8d23e39cc..1da1a1657 100644--- a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java+++ b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java@@ -56,10 +56,7 @@ import org.openremote.model.util.ValueUtil;import javax.persistence.Query;import javax.validation.constraints.NotNull;-import javax.ws.rs.BadRequestException;-import javax.ws.rs.NotAllowedException;-import javax.ws.rs.NotFoundException;-import javax.ws.rs.WebApplicationException;+import javax.ws.rs.*;import javax.ws.rs.core.Response;import javax.ws.rs.core.UriBuilder;import java.io.InputStream;@@ -221,7 +218,7 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im}@Override- public User createUpdateUser(String realm, final User user, String passwordSecret) throws WebApplicationException {+ public User createUpdateUser(String realm, final User user, String passwordSecret, boolean allowUpdate) throws WebApplicationException {return getRealms(realmsResource -> {if (user.getUsername() == null) {@@ -236,6 +233,12 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider imClientRepresentation clientRepresentation;UserRepresentation userRepresentation;+ if(existingUser != null && !allowUpdate) {+ String msg = "Attempt to create user but it already exists: User=" + user;+ LOG.fine(msg);+ throw new ForbiddenException(msg);+ }+if (existingUser == null && user.isServiceAccount()) {// Could be a service useruserRepresentation = withClientResource(realm, user.getUsername(), realmsResource, (clientRep, clientResource) -> {diff --git a/manager/src/main/java/org/openremote/manager/security/UserResourceImpl.java b/manager/src/main/java/org/openremote/manager/security/UserResourceImpl.javaindex 1885dc54b..edde21207 100644--- a/manager/src/main/java/org/openremote/manager/security/UserResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/security/UserResourceImpl.java@@ -110,12 +110,26 @@ public class UserResourceImpl extends ManagerWebResource implements UserResource}@Override- public User createUpdate(RequestParams requestParams, String realm, User user) {+ public User update(RequestParams requestParams, String realm, User user) {throwIfIllegalMasterAdminUserMutation(requestParams, realm, user);try {- return identityService.getIdentityProvider().createUpdateUser(realm, user, null);+ return identityService.getIdentityProvider().createUpdateUser(realm, user, null, true);+ } catch (ClientErrorException ex) {+ throw new WebApplicationException(ex.getCause(), ex.getResponse().getStatus());+ } catch (WebApplicationException ex) {+ throw ex;+ } catch (Exception ex) {+ throw new WebApplicationException(ex);+ }+ }++ @Override+ public User create(RequestParams requestParams, String realm, User user) {++ try {+ return identityService.getIdentityProvider().createUpdateUser(realm, user, null, false);} catch (ClientErrorException ex) {throw new WebApplicationException(ex.getCause(), ex.getResponse().getStatus());} catch (WebApplicationException ex) {diff --git a/manager/src/main/java/org/openremote/manager/setup/AbstractKeycloakSetup.java b/manager/src/main/java/org/openremote/manager/setup/AbstractKeycloakSetup.javaindex 11dda0e9c..79dc4d16d 100644--- a/manager/src/main/java/org/openremote/manager/setup/AbstractKeycloakSetup.java+++ b/manager/src/main/java/org/openremote/manager/setup/AbstractKeycloakSetup.java@@ -101,7 +101,7 @@ public abstract class AbstractKeycloakSetup implements Setup {if (pushNotificationsDisabled) {user.setAttribute(KEYCLOAK_USER_ATTRIBUTE_PUSH_NOTIFICATIONS_DISABLED, "true");}- user = keycloakProvider.createUpdateUser(realm, user, password);+ user = keycloakProvider.createUpdateUser(realm, user, password, true);if (user == null) {return null;}diff --git a/manager/src/main/java/org/openremote/manager/setup/KeycloakInitSetup.java b/manager/src/main/java/org/openremote/manager/setup/KeycloakInitSetup.javaindex d58bbfc35..f7b407029 100644--- a/manager/src/main/java/org/openremote/manager/setup/KeycloakInitSetup.java+++ b/manager/src/main/java/org/openremote/manager/setup/KeycloakInitSetup.java@@ -58,7 +58,7 @@ public class KeycloakInitSetup extends AbstractKeycloakSetup {User adminUser = keycloakProvider.getUserByUsername(MASTER_REALM, MASTER_REALM_ADMIN_USER);adminUser.setFirstName("System");adminUser.setLastName("Administrator");- keycloakProvider.createUpdateUser(MASTER_REALM, adminUser, null);+ keycloakProvider.createUpdateUser(MASTER_REALM, adminUser, null, true);// Give admin all roles on application client levelkeycloakProvider.updateUserRoles(MASTER_REALM, adminUser.getId(), KEYCLOAK_CLIENT_ID, ClientRole.READ.getValue(), ClientRole.WRITE.getValue());@@ -69,7 +69,7 @@ public class KeycloakInitSetup extends AbstractKeycloakSetup {.setEnabled(true).setSystemAccount(true);String password = UniqueIdentifierGenerator.generateId();- keycloakProxyUser = keycloakProvider.createUpdateUser(MASTER_REALM, keycloakProxyUser, password);+ keycloakProxyUser = keycloakProvider.createUpdateUser(MASTER_REALM, keycloakProxyUser, password, true);// Make this proxy user a super user by giving them admin realm rolekeycloakProvider.updateUserRealmRoles(MASTER_REALM, keycloakProxyUser.getId(), keycloakProvider.addRealmRoles(MASTER_REALM, keycloakProxyUser.getId(), REALM_ADMIN_ROLE));diff --git a/manager/src/web/shared/locales/en/or.json b/manager/src/web/shared/locales/en/or.jsonindex 147c332b7..e67ba9be9 100644--- a/manager/src/web/shared/locales/en/or.json+++ b/manager/src/web/shared/locales/en/or.json@@ -243,9 +243,12 @@"realm_plural": "Realms","displayName":"Friendly name","deleteRealmConfirm":"Are you sure you want to delete this Realm?",+ "serviceUser": "Service user","user_plural": "Users","regularUser_plural": "Regular users","serviceUser_plural": "Service users",+ "creating_regularUser": "Creating a new user",+ "creating_serviceUser": "Creating a new service user","regenerateSecret": "Regenerate secret","generateSecretInfo": "A secret will be generated on user creation.","copySecret": "Copy Secret",@@ -489,8 +492,11 @@"indexedItem": "Item {{index}}"}},+ "rowsPerPage": "Rows per page","createUserFailed": "Create user failed","saveUserFailed": "Save user failed",+ "saveUserSucceeded": "Saved user successfully!",+ "userAlreadyExists": "Error occurred! This user already exists.","invalidUsername": "Username must be 3-255 alpha numerical characters","invalidEmail": "Invalid email address","yes": "Yes",diff --git a/manager/src/web/shared/locales/nl/or.json b/manager/src/web/shared/locales/nl/or.jsonindex e48c3d3c7..8fad3f409 100644--- a/manager/src/web/shared/locales/nl/or.json+++ b/manager/src/web/shared/locales/nl/or.json@@ -241,9 +241,12 @@"realm_plural": "Realms","displayName":"Vriendelijke naam","deleteRealmConfirm":"Weet je zeker dat je deze realm wil verwijderen?",+ "serviceUser": "Service gebruiker","user_plural": "Gebruikers","regularUser_plural": "Gebruikers","serviceUser_plural": "Service gebruikers",+ "creating_regularUser": "Een nieuwe gebruiker aanmaken",+ "creating_serviceUser": "Een nieuwe service gebruiker aanmaken","regenerateSecret": "Regenereer secret","generateSecretInfo": "Een secret wordt gegenereerd bij het maken van een gebruiker.","copySecret": "Kopieer secret",@@ -488,6 +491,13 @@"indexedItem": "Item {{index}}"}},+ "rowsPerPage": "Rijen per pagina",+ "createUserFailed": "Aanmaken gebruiker mislukt",+ "saveUserFailed": "Opslaan gebruiker mislukt",+ "saveUserSucceeded": "Gebruiker succesvol opgeslagen!",+ "userAlreadyExists": "Fout opgetreden! Deze gebruiker bestaat al!",+ "invalidUsername": "De gebruikersnaam mag 3-255 numerieke tekens bevatten",+ "invalidEmail": "Ongeldig emailadres","yes": "Ja","no": "Nee","filter": {diff --git a/model/src/main/java/org/openremote/model/security/UserResource.java b/model/src/main/java/org/openremote/model/security/UserResource.javaindex 486ee0b43..f69ea7129 100644--- a/model/src/main/java/org/openremote/model/security/UserResource.java+++ b/model/src/main/java/org/openremote/model/security/UserResource.java@@ -29,8 +29,6 @@ import javax.validation.Valid;import javax.ws.rs.*;import static javax.ws.rs.core.MediaType.APPLICATION_JSON;-import static org.openremote.model.Constants.READ_ADMIN_ROLE;-import static org.openremote.model.Constants.READ_USERS_ROLE;/*** Manage users in realms and get info of current user.@@ -82,12 +80,19 @@ public interface UserResource {@Produces(APPLICATION_JSON)User getCurrent(@BeanParam RequestParams requestParams);+ @PUT+ @Path("{realm}/users")+ @Consumes(APPLICATION_JSON)+ @Produces(APPLICATION_JSON)+ @RolesAllowed(Constants.WRITE_ADMIN_ROLE)+ User update(@BeanParam RequestParams requestParams, @PathParam("realm") String realm, @Valid User user);+@POST@Path("{realm}/users")@Consumes(APPLICATION_JSON)@Produces(APPLICATION_JSON)@RolesAllowed(Constants.WRITE_ADMIN_ROLE)- User createUpdate(@BeanParam RequestParams requestParams, @PathParam("realm") String realm, @Valid User user);+ User create(@BeanParam RequestParams requestParams, @PathParam("realm") String realm, @Valid User user);@DELETE@Path("{realm}/users/{userId}")diff --git a/setup/src/integration/java/org/openremote/setup/integration/KeycloakTestSetup.java b/setup/src/integration/java/org/openremote/setup/integration/KeycloakTestSetup.javaindex 07ef85c7a..444c1d867 100644--- a/setup/src/integration/java/org/openremote/setup/integration/KeycloakTestSetup.java+++ b/setup/src/integration/java/org/openremote/setup/integration/KeycloakTestSetup.java@@ -111,7 +111,7 @@ public class KeycloakTestSetup extends AbstractKeycloakSetup {.setServiceAccount(true).setEnabled(true).setUsername("serviceuser");- serviceUser = keycloakProvider.createUpdateUser(realmBuilding.getName(), serviceUser, UniqueIdentifierGenerator.generateId("serviceusertest"));+ serviceUser = keycloakProvider.createUpdateUser(realmBuilding.getName(), serviceUser, UniqueIdentifierGenerator.generateId("serviceusertest"), true);keycloakProvider.updateUserRoles(realmBuilding.getName(),serviceUser.getId(),@@ -122,7 +122,7 @@ public class KeycloakTestSetup extends AbstractKeycloakSetup {.setServiceAccount(true).setEnabled(true).setUsername("serviceuser2");- serviceUser2 = keycloakProvider.createUpdateUser(realmBuilding.getName(), serviceUser2, UniqueIdentifierGenerator.generateId("serviceuser2test"));+ serviceUser2 = keycloakProvider.createUpdateUser(realmBuilding.getName(), serviceUser2, UniqueIdentifierGenerator.generateId("serviceuser2test"), true);keycloakProvider.updateUserRoles(realmBuilding.getName(),serviceUser2.getId(),diff --git a/test/src/test/groovy/org/openremote/test/provisioning/UserAndAssetProvisioningTest.groovy b/test/src/test/groovy/org/openremote/test/provisioning/UserAndAssetProvisioningTest.groovyindex a676d3846..ae4132848 100644--- a/test/src/test/groovy/org/openremote/test/provisioning/UserAndAssetProvisioningTest.groovy+++ b/test/src/test/groovy/org/openremote/test/provisioning/UserAndAssetProvisioningTest.groovy@@ -650,8 +650,8 @@ class UserAndAssetProvisioningTest extends Specification implements ManagerContadef deviceNUser = identityService.getIdentityProvider().getUserByUsername(managerTestSetup.realmBuildingName, User.SERVICE_ACCOUNT_PREFIX + PROVISIONING_USER_PREFIX + deviceNUniqueId)device1User.setEnabled(false)deviceNUser.setEnabled(false)- device1User = identityService.getIdentityProvider().createUpdateUser(managerTestSetup.realmBuildingName, device1User, null)- deviceNUser = identityService.getIdentityProvider().createUpdateUser(managerTestSetup.realmBuildingName, deviceNUser, null)+ device1User = identityService.getIdentityProvider().createUpdateUser(managerTestSetup.realmBuildingName, device1User, null, true)+ deviceNUser = identityService.getIdentityProvider().createUpdateUser(managerTestSetup.realmBuildingName, deviceNUser, null, true)then: "already connected client that was authenticated should be disconnected, then reconnect"conditions.eventually {@@ -715,7 +715,7 @@ class UserAndAssetProvisioningTest extends Specification implements ManagerContaexistingConnection = mqttBrokerService.getConnectionFromClientID(mqttDevice1ClientId)def existingNConnection = mqttBrokerService.getConnectionFromClientID(mqttDeviceNClientId)device1User.setEnabled(true)- device1User = identityService.getIdentityProvider().createUpdateUser(managerTestSetup.realmBuildingName, device1User, null)+ device1User = identityService.getIdentityProvider().createUpdateUser(managerTestSetup.realmBuildingName, device1User, null, true)and: "the re-enabled client device publishes its' valid client certificate"device1Responses.clear()diff --git a/ui/app/manager/src/pages/page-users.ts b/ui/app/manager/src/pages/page-users.tsindex e3e47cace..1af229b12 100644--- a/ui/app/manager/src/pages/page-users.ts+++ b/ui/app/manager/src/pages/page-users.ts@@ -1,25 +1,32 @@import {css, html, PropertyValues, TemplateResult, unsafeCSS} from "lit";import {customElement, property, state} from "lit/decorators.js";-import manager, {DefaultColor3, Util} from "@openremote/core";+import manager, {DefaultColor4, Util} from "@openremote/core";import "@openremote/or-components/or-panel";import "@openremote/or-translate";import {Store} from "@reduxjs/toolkit";-import {AppStateKeyed, Page, PageProvider} from "@openremote/or-app";-import {ClientRole, RealmRole, Role, User, UserAssetLink, UserQuery} from "@openremote/model";+import {AppStateKeyed, Page, PageProvider, router} from "@openremote/or-app";+import {ClientRole, 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";import {OrMwcDialog, showDialog, showOkCancelDialog} from "@openremote/or-mwc-components/or-mwc-dialog";import {showSnackbar} from "@openremote/or-mwc-components/or-mwc-snackbar";-import {AxiosError, isAxiosError, GenericAxiosResponse} from "@openremote/rest";+import {isAxiosError, GenericAxiosResponse} from "@openremote/rest";import {OrAssetTreeRequestSelectionEvent, OrAssetTreeSelectionEvent} from "@openremote/or-asset-tree";+import {getNewUserRoute, getUsersRoute} from "../routes";+import {when} from 'lit/directives/when.js';+import {until} from 'lit/directives/until.js';+import {OrMwcTableRowClickEvent, TableColumn, TableRow} from "@openremote/or-mwc-components/or-mwc-table";const tableStyle = require("@material/data-table/dist/mdc.data-table.css");export function pageUsersProvider(store: Store<AppStateKeyed>): PageProvider<AppStateKeyed> {return {name: "users",- routes: ["users"],+ routes: [+ "users",+ "users/:id",+ "users/new/:type"+ ],pageCreator: () => {return new PageUsers(store);},@@ -78,50 +85,25 @@ export class PageUsers extends Page<AppStateKeyed> {border: 1px solid #e5e5e5;border-radius: 5px;position: relative;- margin: 5px auto;- padding: 24px;+ margin: 0 auto 10px;+ padding: 12px 24px 24px;}.panel-title {text-transform: uppercase;font-weight: bolder;line-height: 1em;- margin-bottom: 20px;+ margin-bottom: 10px;margin-top: 0;flex: 0 0 auto;letter-spacing: 0.025em;+ display: flex;+ align-items: center;+ min-height: 36px;}- #table-users,- #table-users table {- width: 100%;- white-space: nowrap;- }-- .mdc-data-table__row {- cursor: pointer;- border-top-color: #D3D3D3;- }-- .mdc-data-table__row.disabled {- cursor: progress;- opacity: 0.4;- }-- .table-actions-container {- text-align: right;- position: absolute;- right: 0;- margin: 2px;- }-- td, th {- width: 25%- }-or-mwc-input {margin-bottom: 20px;- margin-right: 16px;}or-icon {@@ -137,6 +119,7 @@ export class PageUsers extends Page<AppStateKeyed> {flex-direction: row;margin: 10px 0;flex: 1 1 0;+ gap: 24px;}.column {@@ -144,63 +127,42 @@ export class PageUsers extends Page<AppStateKeyed> {flex-direction: column;margin: 0px;flex: 1 1 0;- max-width: 50%;- }-- .mdc-data-table__header-cell {- font-weight: bold;- color: ${unsafeCSS(DefaultColor3)};- }-- .mdc-data-table__header-cell:first-child {- padding-left: 36px;- }-- .item-row td {- padding: 0;}- .item-row-content {- flex-direction: row;- overflow: hidden;- max-height: 0;- padding-left: 16px;+ .hidden {+ display: none;}- .item-row.expanded .item-row-content {- overflow: visible;- max-height: unset;+ .breadcrumb-container {+ padding: 0 20px;+ width: calc(100% - 40px);+ max-width: 1360px;+ margin: 12px auto 0;+ display: flex;+ align-items: center;}- .button {+ .breadcrumb-clickable {cursor: pointer;- display: flex;- flex-direction: row;- align-content: center;- padding: 16px;- align-items: center;- font-size: 14px;- text-transform: uppercase;- color: var(--or-app-color4);+ color: ${unsafeCSS(DefaultColor4)}}- .hidden {- display: none;+ .breadcrumb-arrow {+ margin: 0 5px -3px 5px;+ --or-icon-width: 16px;+ --or-icon-height: 16px;}-+@media screen and (max-width: 768px) {#title {padding: 0;width: 100%;}- .hide-mobile {- display: none;- }-.row {display: block;flex-direction: column;+ gap: 0;}.panel {@@ -209,10 +171,6 @@ export class PageUsers extends Page<AppStateKeyed> {border-right: 0px;width: calc(100% - 48px);}-- td, th {- width: 50%- }}`,];@@ -220,6 +178,13 @@ export class PageUsers extends Page<AppStateKeyed> {@property()public realm?: string;+ @property()+ public userId?: string;+ @property()+ public creationState?: {+ userModel: UserModel+ }+@state()protected _users: UserModel[] = [];@state()@@ -237,17 +202,27 @@ export class PageUsers extends Page<AppStateKeyed> {protected _compositeRoles: Role[] = [];protected _loading: boolean = false;+ @state()+ protected _loadUsersPromise?: Promise<any>;+ @state()+ protected _saveUserPromise?: Promise<any>;+get name(): string {return "user_plural";}- public shouldUpdate(_changedProperties: PropertyValues): boolean {- if (_changedProperties.has("realm")) {+ public shouldUpdate(changedProperties: PropertyValues): boolean {+ if (changedProperties.has("realm") && changedProperties.get("realm") != undefined) {+ this.reset();this.loadUsers();}-- return super.shouldUpdate(_changedProperties);+ if (changedProperties.has('userId')) {+ this._updateRoute();+ } else if (changedProperties.has('creationState')) {+ this._updateNewUserRoute();+ }+ return super.shouldUpdate(changedProperties);}public connectedCallback() {@@ -274,7 +249,15 @@ export class PageUsers extends Page<AppStateKeyed> {return true;}- protected async loadUsers() {+ protected async loadUsers(): Promise<void> {+ this._loadUsersPromise = this.fetchUsers();+ this._loadUsersPromise.then(() => {+ this._loadUsersPromise = undefined;+ })+ return this._loadUsersPromise;+ }++ protected async fetchUsers(): Promise<void> {if (!this.realm || this._loading || !this.isConnected) {return;@@ -324,8 +307,7 @@ export class PageUsers extends Page<AppStateKeyed> {this._loading = false;}- private async _createUpdateUser(user: UserModel) {-+ private async _createUpdateUser(user: UserModel, action: 'update' | 'create') {if (!user.username) {return;}@@ -338,7 +320,9 @@ export class PageUsers extends Page<AppStateKeyed> {const isUpdate = !!user.id;try {- const response = await manager.rest.api.UserResource.createUpdate(manager.displayRealm, user);+ const response = action == 'update'+ ? await manager.rest.api.UserResource.update(manager.displayRealm, user)+ : await manager.rest.api.UserResource.create(manager.displayRealm, user);// Ensure user ID is setuser.id = response.data.id;@@ -357,8 +341,12 @@ export class PageUsers extends Page<AppStateKeyed> {if (e.response.status === 400) {showSnackbar(undefined, i18next.t(isUpdate ? "saveUserFailed" : "createUserFailed"), i18next.t("dismiss"));+ } else if (e.response.status === 403) {+ showSnackbar(undefined, i18next.t('userAlreadyExists'))}}+ throw e; // Throw exception anyhow to handle individual cases+} finally {await this.loadUsers();}@@ -417,15 +405,11 @@ export class PageUsers extends Page<AppStateKeyed> {private doDelete(user) {manager.rest.api.UserResource.delete(manager.displayRealm, user.id).then(response => {if (user.serviceAccount) {- const elem = this.shadowRoot?.querySelector('#serviceuser-' + user.username);- this._toggleUserExpand(elem as HTMLTableRowElement, user).then(() => {- this._serviceUsers = [...this._serviceUsers.filter(u => u.id !== user.id)];- });+ this._serviceUsers = [...this._serviceUsers.filter(u => u.id !== user.id)];+ this.reset();} else {- const elem = this.shadowRoot?.querySelector('#user-' + user.username);- this._toggleUserExpand(elem as HTMLTableRowElement, user).then(() => {- this._users = [...this._users.filter(u => u.id !== user.id)];- });+ this._users = [...this._users.filter(u => u.id !== user.id)];+ this.reset();}})}@@ -437,172 +421,174 @@ export class PageUsers extends Page<AppStateKeyed> {`;}- if (!this._roles || this._roles.length === 0) {- return html``;- }-const compositeRoleOptions: string[] = this._compositeRoles.map(cr => cr.name);const realmRoleOptions: [string, string][] = this._realmRoles ? this._realmRoles.filter(r => this._realmRolesFilter(r)).map(r => [r.name, i18next.t("realmRole." + r.name, Util.camelCaseToSentenceCase(r.name.replace("_", " ").replace("-", " ")))]) : [];const readonly = !manager.hasRole(ClientRole.WRITE_ADMIN);+ // Content of User Table+ const userTableColumns: TableColumn[] = [+ {title: i18next.t('username')},+ {title: i18next.t('firstName')},+ {title: i18next.t('surname')},+ {title: i18next.t('email'), hideMobile: true},+ {title: i18next.t('status')}+ ];+ const userTableRows: TableRow[] = this._users.map((user) => {+ return {+ content: [user.username, user.firstName, user.lastName, user.email, user.enabled ? i18next.t('enabled') : i18next.t('disabled')],+ clickable: true+ }+ });++ // Content of Service user Table+ const serviceUserTableColumns: TableColumn[] = [+ {title: i18next.t('username')},+ {title: i18next.t('status')}+ ];+ const serviceUserTableRows: TableRow[] = this._serviceUsers.map((user) => {+ return {+ content: [user.username, user.enabled ? i18next.t('enabled') : i18next.t('disabled')],+ clickable: true+ }+ })++ // Configuration+ const tableConfig = {+ columnFilter: [],+ stickyFirstColumn: false,+ pagination: {+ enable: true+ }+ }++ const mergedUserList: UserModel[] = [...this._users, ...this._serviceUsers];+ const index: number | undefined = (this.userId ? mergedUserList.findIndex((user) => user.id == this.userId) : undefined);+return html`<div id="wrapper">++ <!-- Breadcrumb on top of the page-->+ ${when((this.userId && index != undefined) || this.creationState, () => html`+ <div class="breadcrumb-container">+ <span class="breadcrumb-clickable"+ @click="${() => this.reset()}">${i18next.t("user_plural")}</span>+ <or-icon class="breadcrumb-arrow" icon="chevron-right"></or-icon>+ <span style="margin-left: 2px;">${index != undefined ? mergedUserList[index]?.username : (this.creationState.userModel.serviceAccount ? i18next.t('creating_serviceUser') : i18next.t('creating_regularUser'))}</span>+ </div>+ `)}+<div id="title"><or-icon icon="account-group"></or-icon>- ${i18next.t("user_plural")}+ <span>${this.userId && index != undefined ? mergedUserList[index]?.username : i18next.t('user_plural')}</span></div>- <div class="panel">- <p class="panel-title">${i18next.t("regularUser_plural")}</p>- <div id="table-users" class="mdc-data-table">- <table class="mdc-data-table__table" aria-label="user list">- <thead>- <tr class="mdc-data-table__header-row">- <th class="mdc-data-table__header-cell" role="columnheader" scope="col">- <or-translate value="username"></or-translate>- </th>- <th class="mdc-data-table__header-cell hide-mobile" role="columnheader" scope="col">- <or-translate value="email"></or-translate>- </th>- <th class="mdc-data-table__header-cell" role="columnheader" scope="col">- <or-translate value="role"></or-translate>- </th>- <th class="mdc-data-table__header-cell hide-mobile" role="columnheader" scope="col">- <or-translate value="status"></or-translate>- </th>- </tr>- </thead>- <tbody class="mdc-data-table__content">- ${this._users.map((user, index) => this._getUserTemplate(() => {- this._users.pop(); this._users = [...this._users];- }, user, readonly, compositeRoleOptions, realmRoleOptions, "user"+index))}- ${(this._users.length === 0 || (this._users.length > 0 && !!this._users[this._users.length - 1].id)) && !readonly ? html`- <tr class="mdc-data-table__row" @click="${() => {- this._users = [...this._users, {realm: manager.displayRealm, userAssetLinks: [], roles:[], previousRoles: [], realmRoles: [], previousRealmRoles: [], enabled: true, loaded: true}];- }}">- <td colspan="100%">- <a class="button"><or-icon icon="plus"></or-icon>${i18next.t("add")} ${i18next.t("user")}</a>- </td>- </tr>- ` : ``}- </tbody>- </table>+ <!-- User Specific page -->+ ${when((this.userId && index != undefined) || this.creationState, () => html`+ ${when(mergedUserList[index] != undefined || this.creationState, () => {+ const user: UserModel = (index != undefined ? mergedUserList[index] : this.creationState.userModel);+ return html`+ <div id="content" class="panel">+ <p class="panel-title">+ ${user.serviceAccount ? i18next.t('serviceUser') : i18next.t('user')}+ ${i18next.t('settings')}</p>+ ${this.getSingleUserView((index != undefined ? mergedUserList[index] : this.creationState.userModel), compositeRoleOptions, realmRoleOptions, ("user" + index), (readonly || this._saveUserPromise != undefined))}+ </div>+ `;+ })}++ <!-- List of Users page -->+ `, () => html`+ <div id="content" class="panel">+ <div class="panel-title" style="justify-content: space-between;">+ <p>${i18next.t("regularUser_plural")}</p>+ <or-mwc-input style="margin: 0;" type="${InputType.BUTTON}" icon="plus"+ label="${i18next.t('add')} ${i18next.t("user")}"+ @or-mwc-input-changed="${() => this.creationState = {userModel: this.getNewUserModel(false)}}"></or-mwc-input>+ </div>+ ${until(this.getUsersTable(userTableColumns, userTableRows, tableConfig, (ev) => {+ this.userId = this._users[ev.detail.index].id;+ }), html`${i18next.t('loading')}`)}</div>- </div>-- <div class="panel">- <p class="panel-title">${i18next.t("serviceUser_plural")}</p>- <div id="table-users" class="mdc-data-table">- <table class="mdc-data-table__table" aria-label="user list">- <thead>- <tr class="mdc-data-table__header-row">- <th class="mdc-data-table__header-cell" role="columnheader" scope="col">- <or-translate value="username"></or-translate>- </th>- <th class="mdc-data-table__header-cell hide-mobile" role="columnheader" scope="col"><!-- Empty --></th>- <th class="mdc-data-table__header-cell" role="columnheader" scope="col">- <or-translate value="role"></or-translate>- </th>- <th class="mdc-data-table__header-cell hide-mobile" role="columnheader" scope="col">- <or-translate value="status"></or-translate>- </th>- </tr>- </thead>- <tbody class="mdc-data-table__content">- ${this._serviceUsers.map((user, index) => this._getUserTemplate(() => {- this._serviceUsers.pop(); this._serviceUsers = [...this._serviceUsers];- }, user, readonly, compositeRoleOptions, realmRoleOptions, "serviceuser" + index))}- ${(this._serviceUsers.length === 0 || (this._serviceUsers.length > 0 && !!this._serviceUsers[this._serviceUsers.length - 1].id)) && !readonly ? html`- <tr class="mdc-data-table__row" @click="${() => {- this._serviceUsers = [...this._serviceUsers, {- userAssetLinks: [],- roles: [],- previousRoles: [],- realmRoles: [],- previousRealmRoles: [],- loaded: true,- enabled: true,- serviceAccount: true}]- }}">- <td colspan="100%">- <a class="button"><or-icon icon="plus"></or-icon>${i18next.t("add")} ${i18next.t("user")}</a>- </td>- </tr>- ` : ``}- </tbody>- </table>++ <div id="content" class="panel">+ <div class="panel-title" style="justify-content: space-between;">+ <p>${i18next.t("serviceUser_plural")}</p>+ <or-mwc-input style="margin: 0;" type="${InputType.BUTTON}" icon="plus"+ label="${i18next.t('add')} ${i18next.t("user")}"+ @or-mwc-input-changed="${() => this.creationState = {userModel: this.getNewUserModel(true)}}"></or-mwc-input>+ </div>+ ${until(this.getUsersTable(serviceUserTableColumns, serviceUserTableRows, tableConfig, (ev) => {+ this.userId = this._serviceUsers[ev.detail.index].id;+ }), html`${i18next.t('loading')}`)}</div>- </div>+ `)}</div>`;}- public stateChanged(state: AppStateKeyed) {- this.realm = state.app.realm;+ protected async getUsersTable(columns: TemplateResult | TableColumn[] | string[], rows: TemplateResult | TableRow[] | string[][], config: any, onRowClick: (event: OrMwcTableRowClickEvent) => void): Promise<TemplateResult> {+ if (this._loadUsersPromise) {+ await this._loadUsersPromise;+ }+ return html`+ <or-mwc-table .columns="${columns instanceof Array ? columns : undefined}"+ .columnsTemplate="${!(columns instanceof Array) ? columns : undefined}"+ .rows="${rows instanceof Array ? rows : undefined}"+ .rowsTemplate="${!(rows instanceof Array) ? rows : undefined}"+ .config="${config}"+ @or-mwc-table-row-click="${rows instanceof Array ? onRowClick : undefined}"+ ></or-mwc-table>+ `}- protected async _toggleUserExpand(trElem: HTMLTableRowElement, user: UserModel, autoScroll: boolean = false) {- const expanderIcon = trElem.getElementsByTagName("or-icon")[0] as OrIcon;- const userRow = (trElem.parentElement! as HTMLTableElement).rows[trElem.rowIndex];+ protected getNewUserModel(serviceAccount: boolean): UserModel {+ return {+ enabled: true,+ password: undefined,+ roles: [],+ previousRoles: [],+ realmRoles: [],+ previousRealmRoles: [],+ userAssetLinks: [],+ serviceAccount: serviceAccount+ }+ }- if (user.loading) {+ protected async loadUser(user: UserModel) {+ if (user.roles || user.realmRoles) {return;}- if (!user.loaded) {- trElem.classList.add("disabled");- user.loading = true;-- // Load users assigned roles- const userRolesResponse = await (manager.rest.api.UserResource.getUserRoles(manager.displayRealm, user.id));-- if (!this.responseAndStateOK(() => true, userRolesResponse, i18next.t("loadFailedUserInfo"))) {- user.loading = false;- trElem.classList.remove("disabled");- return;- }-- const userRealmRolesResponse = await manager.rest.api.UserResource.getUserRealmRoles(manager.displayRealm, user.id);-- if (!this.responseAndStateOK(() => true, userRolesResponse, i18next.t("loadFailedUserInfo"))) {- user.loading = false;- trElem.classList.remove("disabled");- return;- }--- const userAssetLinksResponse = await manager.rest.api.AssetResource.getUserAssetLinks({realm: manager.displayRealm, userId: user.id});-- if (!this.responseAndStateOK(() => true, userAssetLinksResponse, i18next.t("loadFailedUserInfo"))) {- user.loading = false;- trElem.classList.remove("disabled");- return;- }+ // Load users assigned roles+ const userRolesResponse = await (manager.rest.api.UserResource.getUserRoles(manager.displayRealm, user.id));+ if (!this.responseAndStateOK(() => true, userRolesResponse, i18next.t("loadFailedUserInfo"))) {+ return;+ }- user.roles = userRolesResponse.data.filter(r => r.assigned);- user.realmRoles = userRealmRolesResponse.data.filter(r => r.assigned);- this._realmRoles = [...userRealmRolesResponse.data];- user.previousRealmRoles = [...user.realmRoles];- user.previousRoles = [...user.roles];- user.userAssetLinks = userAssetLinksResponse.data;- user.loaded = true;- user.loading = false;- trElem.classList.remove("disabled");- // Update the dom- this.requestUpdate();+ const userRealmRolesResponse = await manager.rest.api.UserResource.getUserRealmRoles(manager.displayRealm, user.id);+ if (!this.responseAndStateOK(() => true, userRolesResponse, i18next.t("loadFailedUserInfo"))) {+ return;}- if (expanderIcon.icon === "chevron-right") {- expanderIcon.icon = "chevron-down";- userRow.classList.add("expanded");- if(autoScroll) {- await this.updateComplete;- userRow.scrollIntoView({behavior: 'auto', block: 'center', inline: 'center'});- }- } else {- expanderIcon.icon = "chevron-right";- userRow.classList.remove("expanded");+ const userAssetLinksResponse = await manager.rest.api.AssetResource.getUserAssetLinks({+ realm: manager.displayRealm,+ userId: user.id+ });+ if (!this.responseAndStateOK(() => true, userAssetLinksResponse, i18next.t("loadFailedUserInfo"))) {+ return;}++ user.roles = userRolesResponse.data.filter(r => r.assigned);+ user.realmRoles = userRealmRolesResponse.data.filter(r => r.assigned);+ this._realmRoles = [...userRealmRolesResponse.data];+ user.previousRealmRoles = [...user.realmRoles];+ user.previousRoles = [...user.roles];+ user.userAssetLinks = userAssetLinksResponse.data;+ user.loaded = true;+ user.loading = false;++ // Update the dom+ this.requestUpdate();}protected _openAssetSelector(ev: MouseEvent, user: UserModel, readonly: boolean) {@@ -626,19 +612,19 @@ export class PageUsers extends Page<AppStateKeyed> {const dialog = showDialog(new OrMwcDialog().setHeading(i18next.t("linkedAssets")).setContent(html`- <or-asset-tree- id="chart-asset-tree" readonly .selectedIds="${user.userAssetLinks.map(ual => ual.id.assetId)}"- .showSortBtn="${false}" expandNodes checkboxes- @or-asset-tree-request-selection="${(e: OrAssetTreeRequestSelectionEvent) => {- if (readonly) {- e.detail.allow = false;- }- }}"- @or-asset-tree-selection="${(e: OrAssetTreeSelectionEvent) => {- if (!readonly) {- onAssetSelectionChanged(e);- }- }}"></or-asset-tree>+ <or-asset-tree+ id="chart-asset-tree" readonly .selectedIds="${user.userAssetLinks.map(ual => ual.id.assetId)}"+ .showSortBtn="${false}" expandNodes checkboxes+ @or-asset-tree-request-selection="${(e: OrAssetTreeRequestSelectionEvent) => {+ if (readonly) {+ e.detail.allow = false;+ }+ }}"+ @or-asset-tree-selection="${(e: OrAssetTreeSelectionEvent) => {+ if (!readonly) {+ onAssetSelectionChanged(e);+ }+ }}"></or-asset-tree>`).setActions([{@@ -670,9 +656,9 @@ export class PageUsers extends Page<AppStateKeyed> {}));}- protected onUserChanged(e: OrInputChangedEvent, suffix: string) {+ protected onUserChanged(e: OrInputChangedEvent | OrMwcInput, suffix: string) {// Don't have form-associated custom element support in lit at time of writing which would be the way to go here- const formElement = (e.target as HTMLElement).parentElement;+ const formElement = e instanceof OrInputChangedEvent ? (e.target as HTMLElement).parentElement : e.parentElement;const saveBtn = this.shadowRoot.getElementById("savebtn-" + suffix) as OrMwcInput;if (formElement) {@@ -712,7 +698,7 @@ export class PageUsers extends Page<AppStateKeyed> {}protected _updateUserSelectedRoles(user: UserModel, suffix: string) {- const roleCheckboxes = [...((this.shadowRoot!.getElementById("role-list-" + suffix) as HTMLDivElement).children as any)] as OrMwcInput[];+ const roleCheckboxes = [...((this.shadowRoot.getElementById("role-list-" + suffix) as HTMLDivElement).children as any)] as OrMwcInput[];const implicitRoleNames = this.getImplicitUserRoles(user);roleCheckboxes.forEach((checkbox) => {const roleName = checkbox.label;@@ -726,214 +712,259 @@ export class PageUsers extends Page<AppStateKeyed> {return this._compositeRoles.filter((role) => user.roles.some(ur => ur.name === role.name)).flatMap((role) => role.compositeRoleIds).map(id => this._roles.find(r => r.id === id).name);}- protected _getUserTemplate(addCancel: () => void, user: UserModel, readonly: boolean, compositeRoleOptions: string[], realmRoleOptions: [string, string][], suffix: string): TemplateResult {+ protected getSingleUserView(user: UserModel, compositeRoleOptions: string[], realmRoleOptions: [string, string][], suffix: string, readonly: boolean = true): TemplateResult {+ return html`+ ${when((user.loaded || (user.roles && user.realmRoles)), () => {+ return this.getSingleUserTemplate(user, compositeRoleOptions, realmRoleOptions, suffix, readonly);+ }, () => {+ const getTemplate = async () => {+ await this.loadUser(user);+ return this.getSingleUserTemplate(user, compositeRoleOptions, realmRoleOptions, suffix, readonly);+ }+ const content: Promise<TemplateResult> = getTemplate();+ return html`+ ${until(content, html`${i18next.t('loading')}`)}+ `;+ })}+ `;+ }++ protected getSingleUserTemplate(user: UserModel, compositeRoleOptions: string[], realmRoleOptions: [string, string][], suffix: string, readonly: boolean = true): TemplateResult {const isServiceUser = user.serviceAccount;const isSameUser = user.username === manager.username;const implicitRoleNames = user.loaded ? this.getImplicitUserRoles(user) : [];-return html`- <tr id="${(user.serviceAccount ? 'serviceuser-' : 'user-') + user.username}" class="mdc-data-table__row" @click="${(ev) => {- if((ev.path[0].tagName != 'SPAN' || ev.path[0].className == '' || ev.path[0].className == 'mdi-chevron-right' || ev.path[0].className == 'mdi-chevron-down') && ev.path[0].tagName != 'BUTTON') {- this._toggleUserExpand(ev.currentTarget, user); // Only toggling when not hovering an action button- }- }}">- <td class="padded-cell mdc-data-table__cell">- <or-icon icon="chevron-right"></or-icon>- <span>${user.username}</span>- </td>- <td class="padded-cell mdc-data-table__cell hide-mobile">- ${isServiceUser ? undefined : user.email}- </td>- <td class="padded-cell mdc-data-table__cell">- ${user.roles ? user.roles.filter(r => r.composite).map(r => r.name).join(",") : null}- </td>- <td class="padded-cell mdc-data-table__cell hide-mobile">- <or-translate .value="${user.enabled ? "enabled" : "disabled"}"></or-translate>- </td>- ${(isServiceUser) ? html`- <span class="table-actions-container">- ${user.secret ? html`- <or-mwc-input type="${InputType.BUTTON}" icon="key" style="margin: 0;" title="${i18next.t("copySecret")}" @click="${() => {- navigator.clipboard.writeText(user.secret);- showSnackbar(undefined, i18next.t("copiedSecretToClipboard"));+ <div class="row">+ <div class="column">+ <h5>${i18next.t("details")}</h5>+ <!-- user details -->+ <or-mwc-input id="username-${suffix}" ?readonly="${!!user.id || readonly}" .disabled="${!!user.id}"+ .label="${i18next.t("username")}"+ .type="${InputType.TEXT}" minLength="3" maxLength="255" required+ pattern="[a-zA-Z0-9-_]+"+ .value="${user.username}"+ .validationMessage="${i18next.t("invalidUsername")}"+ @or-mwc-input-changed="${(e: OrInputChangedEvent) => {+ user.username = e.detail.value;+ this.onUserChanged(e, suffix)+ }}"></or-mwc-input>+ <or-mwc-input ?readonly="${readonly}"+ class="${isServiceUser ? "hidden" : ""}"+ .label="${i18next.t("email")}"+ .type="${InputType.EMAIL}"+ .value="${user.email}"+ .validationMessage="${i18next.t("invalidEmail")}"+ @or-mwc-input-changed="${(e: OrInputChangedEvent) => {+ user.email = e.detail.value;+ this.onUserChanged(e, suffix)+ }}"></or-mwc-input>+ <or-mwc-input ?readonly="${readonly}"+ class="${isServiceUser ? "hidden" : ""}"+ .label="${i18next.t("firstName")}"+ .type="${InputType.TEXT}" minLength="1"+ .value="${user.firstName}"+ @or-mwc-input-changed="${(e: OrInputChangedEvent) => {+ user.firstName = e.detail.value;+ this.onUserChanged(e, suffix)+ }}"></or-mwc-input>+ <or-mwc-input ?readonly="${readonly}"+ class="${isServiceUser ? "hidden" : ""}"+ .label="${i18next.t("surname")}"+ .type="${InputType.TEXT}" minLength="1"+ .value="${user.lastName}"+ @or-mwc-input-changed="${(e: OrInputChangedEvent) => {+ user.lastName = e.detail.value;+ this.onUserChanged(e, suffix)+ }}"></or-mwc-input>++ <!-- password -->+ <h5>${i18next.t("password")}</h5>+ ${isServiceUser ? html`+ ${when(user.secret, () => html`+ <or-mwc-input id="password-${suffix}" readonly+ .label="${i18next.t("secret")}"+ .value="${user.secret}"+ .type="${InputType.TEXT}"></or-mwc-input>+ <or-mwc-input ?readonly="${!user.id || readonly}"+ .label="${i18next.t("regenerateSecret")}"+ .type="${InputType.BUTTON}"+ @or-mwc-input-changed="${(ev) => this._regenerateSecret(ev, user, "password-" + suffix)}"></or-mwc-input>+ `, () => html`+ <span>${i18next.t("generateSecretInfo")}</span>+ `)}+ ` : html`+ <or-mwc-input id="password-${suffix}"+ ?readonly="${readonly}"+ .label="${i18next.t("password")}"+ .type="${InputType.PASSWORD}" min="1"+ @or-mwc-input-changed="${(e: OrInputChangedEvent) => {+ this._onPasswordChanged(user, suffix);+ this.onUserChanged(e, suffix);+ }}"+ ></or-mwc-input>+ <or-mwc-input id="repeatPassword-${suffix}"+ helperPersistent ?readonly="${readonly}"+ .label="${i18next.t("repeatPassword")}"+ .type="${InputType.PASSWORD}" min="1"+ @or-mwc-input-changed="${(e: OrInputChangedEvent) => {+ this._onPasswordChanged(user, suffix);+ this.onUserChanged(e, suffix);+ }}"+ ></or-mwc-input>+ `}+ </div>++ <div class="column">+ <h5>${i18next.t("settings")}</h5>+ <!-- enabled -->+ <or-mwc-input ?readonly="${readonly}"+ .label="${i18next.t("active")}"+ .type="${InputType.CHECKBOX}"+ .value="${user.enabled}"+ @or-mwc-input-changed="${(e: OrInputChangedEvent) => user.enabled = e.detail.value}"+ style="height: 56px;"+ ></or-mwc-input>++ <!-- realm roles -->+ <or-mwc-input+ ?readonly="${readonly}"+ ?disabled="${isSameUser}"+ .value="${user.realmRoles && user.realmRoles.length > 0 ? user.realmRoles.filter(r => this._realmRolesFilter(r)).map(r => r.name) : undefined}"+ .type="${InputType.SELECT}" multiple+ .options="${realmRoleOptions}"+ .label="${i18next.t("realm_role_plural")}"+ @or-mwc-input-changed="${(e: OrInputChangedEvent) => {+ const roleNames = e.detail.value as string[];+ const excludedAndCompositeRoles = user.realmRoles.filter(r => !this._realmRolesFilter(r));+ const selectedRoles = this._realmRoles.filter(cr => roleNames.some(name => cr.name === name)).map(r => {+ return {...r, assigned: true} as Role;+ });+ user.realmRoles = [...excludedAndCompositeRoles, ...selectedRoles];}}"></or-mwc-input>- ` : undefined}- </span>- ` : undefined}- </tr>- <tr class="item-row${!user.id ? " expanded" : ""}">- <td colspan="4">- ${!user.loaded ? `` : html`- <div class="item-row-content">- <div class="row">- <div class="column">- <h5>${i18next.t("details")}</h5>- <!-- user details -->- <or-mwc-input ?readonly="${!!user.id || readonly}" .disabled="${!!user.id}"- .label="${i18next.t("username")}"- .type="${InputType.TEXT}" minLength="3" maxLength="255" required- pattern="[a-zA-Z0-9-_]+"- .value="${user.username}" .validationMessage="${i18next.t("invalidUsername")}"- @or-mwc-input-changed="${(e: OrInputChangedEvent) => {user.username = e.detail.value; this.onUserChanged(e, suffix)}}"></or-mwc-input>- <or-mwc-input ?readonly="${readonly}"- class="${isServiceUser ? "hidden" : ""}"- .label="${i18next.t("email")}"- .type="${InputType.EMAIL}"- .value="${user.email}" .validationMessage="${i18next.t("invalidEmail")}"- @or-mwc-input-changed="${(e: OrInputChangedEvent) => {user.email = e.detail.value; this.onUserChanged(e, suffix)}}"></or-mwc-input>- <or-mwc-input ?readonly="${readonly}"- class="${isServiceUser ? "hidden" : ""}"- .label="${i18next.t("firstName")}"- .type="${InputType.TEXT}" minLength="1"- .value="${user.firstName}"- @or-mwc-input-changed="${(e: OrInputChangedEvent) => {user.firstName = e.detail.value; this.onUserChanged(e, suffix)}}"></or-mwc-input>- <or-mwc-input ?readonly="${readonly}"- class="${isServiceUser ? "hidden" : ""}"- .label="${i18next.t("surname")}"- .type="${InputType.TEXT}" minLength="1"- .value="${user.lastName}"- @or-mwc-input-changed="${(e: OrInputChangedEvent) => {user.lastName = e.detail.value; this.onUserChanged(e, suffix)}}"></or-mwc-input>-- <!-- password -->- <h5>${i18next.t("password")}</h5>- ${isServiceUser ? html`- ${user.secret ? html`- <or-mwc-input id="password-${suffix}" readonly- .label="${i18next.t("secret")}"- .value="${user.secret}"- .type="${InputType.TEXT}"></or-mwc-input>- <or-mwc-input ?readonly="${!user.id || readonly}"- .label="${i18next.t("regenerateSecret")}"- .type="${InputType.BUTTON}"- @or-mwc-input-changed="${(ev) => this._regenerateSecret(ev, user, "password-" + suffix)}"></or-mwc-input>- ` : html`- <span>${i18next.t("generateSecretInfo")}</span>- `}- ` : html`- <or-mwc-input id="password-${suffix}"- ?readonly="${readonly}"- .label="${i18next.t("password")}"- .type="${InputType.PASSWORD}" min="1"- @or-mwc-input-changed="${(e: OrInputChangedEvent) => {- this._onPasswordChanged(user, suffix);- this.onUserChanged(e, suffix);- }}"></or-mwc-input>- <or-mwc-input id="repeatPassword-${suffix}"- helperPersistent ?readonly="${readonly}"- .label="${i18next.t("repeatPassword")}"- .type="${InputType.PASSWORD}" min="1"- @or-mwc-input-changed="${(e: OrInputChangedEvent) => {- this._onPasswordChanged(user, suffix);- this.onUserChanged(e, suffix);- }}"></or-mwc-input>- `}- </div>-- <div class="column">- <h5>${i18next.t("settings")}</h5>- <!-- enabled -->- <or-mwc-input ?readonly="${readonly}"- .label="${i18next.t("active")}"- .type="${InputType.CHECKBOX}"- .value="${user.enabled}"- @or-mwc-input-changed="${(e: OrInputChangedEvent) => user.enabled = e.detail.value}"- style="height: 56px;"></or-mwc-input>-- <!-- realm roles -->- <or-mwc-input- ?readonly="${readonly}"- ?disabled="${isSameUser}"- .value="${user.realmRoles && user.realmRoles.length > 0 ? user.realmRoles.filter(r => this._realmRolesFilter(r)).map(r => r.name) : undefined}"- .type="${InputType.SELECT}" multiple- .options="${realmRoleOptions}"- .label="${i18next.t("realm_role_plural")}"- @or-mwc-input-changed="${(e: OrInputChangedEvent) => {- const roleNames = e.detail.value as string[];- const excludedAndCompositeRoles = user.realmRoles.filter(r => !this._realmRolesFilter(r));- const selectedRoles = this._realmRoles.filter(cr => roleNames.some(name => cr.name === name)).map(r => {- return {...r, assigned: true} as Role;- });- user.realmRoles = [...excludedAndCompositeRoles, ...selectedRoles];- }}"></or-mwc-input>-- <!-- composite client roles -->- <or-mwc-input- ?readonly="${readonly}"- ?disabled="${isSameUser}"- .value="${user.roles && user.roles.length > 0 ? user.roles.filter(r => r.composite).map(r => r.name) : undefined}"- .type="${InputType.SELECT}" multiple- .options="${compositeRoleOptions}"- .label="${i18next.t("manager_role_plural")}"- @or-mwc-input-changed="${(e: OrInputChangedEvent) => {- const roleNames = e.detail.value as string[];- user.roles = this._compositeRoles.filter(cr => roleNames.some(name => cr.name === name)).map(r => {- return {...r, assigned: true};- });- this._updateUserSelectedRoles(user, suffix);- }}"></or-mwc-input>-- <!-- roles -->- <div style="display:flex;flex-wrap:wrap;margin-bottom: 20px;"- id="role-list-${suffix}">- ${this._roles.map(r => {- return html`- <or-mwc-input- ?readonly="${readonly}"- ?disabled="${implicitRoleNames.find(name => r.name === name)}"- .value="${!!user.roles.find(userRole => userRole.name === r.name) || implicitRoleNames.some(implicitRoleName => implicitRoleName === r.name)}"- .type="${InputType.CHECKBOX}"- .label="${r.name}"- style="width:25%;margin:0"- @or-mwc-input-changed="${(e: OrInputChangedEvent) => {- if (!!e.detail.value) {- user.roles.push({...r, assigned: true});- } else {- user.roles = user.roles.filter(e => e.name !== r.name);- }- }}"></or-mwc-input>- `- })}- </div>-- <!-- restricted access -->- <div>- <span>${i18next.t("linkedAssets")}:</span>- <or-mwc-input outlined- .type="${InputType.BUTTON}"- .label="${i18next.t("selectRestrictedAssets", {number: user.userAssetLinks.length})}"- @click="${(ev: MouseEvent) => this._openAssetSelector(ev, user, readonly)}"></or-mwc-input>- </div>- </div>- </div>- ${readonly ? `` : html`- <div class="row" style="margin-bottom: 0;">-- ${!isSameUser && user.id ? html`- <or-mwc-input .label="${i18next.t("delete")}"- .type="${InputType.BUTTON}"- @click="${() => this._deleteUser(user)}"></or-mwc-input>- ` : ``}- ${!user.id ? html`- <or-mwc-input .label="${i18next.t("cancel")}"- .type="${InputType.BUTTON}"- @click="${() => addCancel()}"></or-mwc-input>- ` : ``}- <or-mwc-input id="savebtn-${suffix}" style="margin-left: auto;"- .label="${i18next.t(user.id ? "save" : "create")}"- .type="${InputType.BUTTON}"- @click="${() => {- this._createUpdateUser(user).then(() => {- showSnackbar(undefined, (user.username + " " + i18next.t("savedSuccessfully")));- })- }}">- </or-mwc-input>- </div>- `}- </div>- `}- </td>- </tr>+ <!-- composite client roles -->+ <or-mwc-input+ ?readonly="${readonly}"+ ?disabled="${isSameUser}"+ .value="${user.roles && user.roles.length > 0 ? user.roles.filter(r => r.composite).map(r => r.name) : undefined}"+ .type="${InputType.SELECT}" multiple+ .options="${compositeRoleOptions}"+ .label="${i18next.t("manager_role_plural")}"+ @or-mwc-input-changed="${(e: OrInputChangedEvent) => {+ const roleNames = e.detail.value as string[];+ user.roles = this._compositeRoles.filter(cr => roleNames.some(name => cr.name === name)).map(r => {+ return {...r, assigned: true};+ });+ this._updateUserSelectedRoles(user, suffix);+ }}"></or-mwc-input>++ <!-- roles -->+ <div style="display:flex;flex-wrap:wrap;margin-bottom: 20px;"+ id="role-list-${suffix}">+ ${this._roles.map(r => {+ return html`+ <or-mwc-input+ ?readonly="${readonly}"+ ?disabled="${implicitRoleNames.find(name => r.name === name)}"+ .value="${!!user.roles.find(userRole => userRole.name === r.name) || implicitRoleNames.some(implicitRoleName => implicitRoleName === r.name)}"+ .type="${InputType.CHECKBOX}"+ .label="${r.name}"+ style="flex: 0 1 160px; margin: 0; overflow: hidden;"+ @or-mwc-input-changed="${(e: OrInputChangedEvent) => {+ if (!!e.detail.value) {+ user.roles.push({...r, assigned: true});+ } else {+ user.roles = user.roles.filter(e => e.name !== r.name);+ }+ }}"></or-mwc-input>+ `+ })}+ </div>++ <!-- restricted access -->+ <div>+ <span>${i18next.t("linkedAssets")}:</span>+ <or-mwc-input outlined ?disabled="${readonly}" style="margin-left: 4px;"+ .type="${InputType.BUTTON}"+ .label="${i18next.t("selectRestrictedAssets", {number: user.userAssetLinks.length})}"+ @or-mwc-input-changed="${(ev: MouseEvent) => this._openAssetSelector(ev, user, readonly)}"></or-mwc-input>+ </div>+ </div>+ </div>+ <!-- Bottom controls (save/update and delete button) -->+ ${when(!(readonly && !this._saveUserPromise), () => html`+ <div class="row" style="margin-bottom: 0; justify-content: space-between;">++ ${when((!isSameUser && user.id), () => html`+ <or-mwc-input style="margin: 0;" outlined ?disabled="${readonly}"+ .label="${i18next.t("delete")}"+ .type="${InputType.BUTTON}"+ @click="${() => this._deleteUser(user)}"+ ></or-mwc-input>+ `)}+ <div style="display: flex; align-items: center; gap: 16px; margin: 0 0 0 auto;">+ <or-mwc-input id="savebtn-${suffix}" style="margin: 0;" raised ?disabled="${readonly}"+ .label="${i18next.t(user.id ? "save" : "create")}"+ .type="${InputType.BUTTON}"+ @or-mwc-input-changed="${(e: OrInputChangedEvent) => {+ let error: { status?: number, text: string };+ this._saveUserPromise = this._createUpdateUser(user, user.id ? 'update' : 'create').then(() => {+ showSnackbar(undefined, i18next.t("saveUserSucceeded"));+ this.reset();+ }).catch((ex) => {+ if (isAxiosError(ex)) {+ error = {+ status: ex.response.status,+ text: (ex.response.status == 403 ? i18next.t('userAlreadyExists') : i18next.t('errorOccurred'))+ }+ }+ }).finally(() => {+ this._saveUserPromise = undefined;+ if (error) {+ this.updateComplete.then(() => {+ showSnackbar(undefined, error.text);+ if (error.status == 403) {+ const elem = this.shadowRoot.getElementById('username-' + suffix) as OrMwcInput;+ elem.setCustomValidity(error.text);+ (elem.shadowRoot.getElementById("elem") as HTMLInputElement).reportValidity(); // manually reporting was required since we're not editing the username at all.+ this.onUserChanged(elem, suffix); // onUserChanged to trigger validation of all fields again.+ }+ })+ }+ })+ }}">+ </or-mwc-input>+ </div>+ </div>+ `)}`;}++ // Reset selected user or creation page, and go back to the list+ protected reset() {+ this.userId = undefined;+ this.creationState = undefined;+ }++ public stateChanged(state: AppStateKeyed) {+ if (state.app.page == 'users') { // it seems that the check is necessary here+ this.realm = state.app.realm;+ this.userId = (state.app.params && state.app.params.id) ? state.app.params.id : undefined;+ this.creationState = (state.app.params?.type ? {userModel: this.getNewUserModel(state.app.params.type == 'serviceuser')} : undefined);+ }+ }++ protected _updateRoute(silent: boolean = false) {+ router.navigate(getUsersRoute(this.userId), {+ callHooks: !silent,+ callHandler: !silent+ });+ }++ protected _updateNewUserRoute(silent: boolean = false) {+ router.navigate(getNewUserRoute(this.creationState?.userModel.serviceAccount), {+ callHooks: !silent,+ callHandler: !silent+ });+ }}diff --git a/ui/app/manager/src/routes.ts b/ui/app/manager/src/routes.tsindex d52dcc528..da6996501 100644--- a/ui/app/manager/src/routes.ts+++ b/ui/app/manager/src/routes.ts@@ -24,3 +24,19 @@ export function getInsightsRoute(editMode?: boolean, dashboardId?: string) {}return route;}++export function getUsersRoute(userId?: string) {+ let route = "users";+ if(userId) {+ route += "/" + userId;+ }+ return route;+}+export function getNewUserRoute(serviceAccount?: boolean) {+ let route = "users";+ if(serviceAccount != undefined) {+ let type = (serviceAccount ? 'serviceuser' : 'regular')+ route += "/new/" + type;+ }+ return route+}diff --git a/ui/component/or-asset-viewer/src/index.ts b/ui/component/or-asset-viewer/src/index.tsindex f3f5c9213..2a16d2329 100644--- a/ui/component/or-asset-viewer/src/index.ts+++ b/ui/component/or-asset-viewer/src/index.ts@@ -653,7 +653,7 @@ function getPanelContent(id: string, assetInfo: AssetInfo, hostElement: LitElemeselectedAttributes.push(...newSelection);const attributeTable: OrMwcTable = hostElement.shadowRoot!.getElementById(id + "-attribute-table") as OrMwcTable;const headersAndRows = getHeadersAndRows();- attributeTable!.headers = headersAndRows[0];+ attributeTable!.columns = headersAndRows[0];attributeTable!.rows = headersAndRows[1];config.views[asset.id!] = [...selectedAttributes];manager.console.storeData("OrAssetConfig", config);@@ -756,7 +756,7 @@ function getPanelContent(id: string, assetInfo: AssetInfo, hostElement: LitEleme}</style><or-mwc-input .type="${InputType.BUTTON}" class="asset-group-add-remove-button" icon="pencil" @click="${() => attributePickerModalOpen()}"></or-mwc-input>- <or-mwc-table .headers="${headersAndRows[0]}" .rows="${headersAndRows[1]}" .id="${id}-attribute-table" .options="{stickyFirstColumn:true}"></or-mwc-table>+ <or-mwc-table .columns="${headersAndRows[0]}" .rows="${headersAndRows[1]}" .id="${id}-attribute-table" .config="${{stickyFirstColumn: true}}"></or-mwc-table>`;}@@ -781,7 +781,7 @@ function getPanelContent(id: string, assetInfo: AssetInfo, hostElement: LitEleme];});- return html`<or-mwc-table .rows="${rows}" .options="${{stickyFirstColumn:false}}" .headers="${["Username", "Roles", "Restricted user"]}"></or-mwc-table>`;+ return html`<or-mwc-table .rows="${rows}" .config="${{stickyFirstColumn:false}}" .columns="${["Username", "Roles", "Restricted user"]}"></or-mwc-table>`;}}diff --git a/ui/component/or-mwc-components/src/or-mwc-table.ts b/ui/component/or-mwc-components/src/or-mwc-table.tsindex b8298ea2c..9ff6ca770 100644--- a/ui/component/or-mwc-components/src/or-mwc-table.ts+++ b/ui/component/or-mwc-components/src/or-mwc-table.ts@@ -1,17 +1,15 @@-import {css, html, LitElement, unsafeCSS} from "lit";-import {customElement, property, query} from "lit/decorators.js";+import {css, html, LitElement, TemplateResult, unsafeCSS} from "lit";+import {customElement, property, state} from "lit/decorators.js";import {classMap} from "lit/directives/class-map.js";-import {ifDefined} from "lit/directives/if-defined.js";+import {until} from 'lit/directives/until.js';import {MDCDataTable} from "@material/data-table";-+import {when} from 'lit/directives/when.js';import {DefaultColor3, DefaultColor2, DefaultColor1} from "@openremote/core";+import {i18next} from "@openremote/or-translate";+import {InputType, OrInputChangedEvent} from "./or-mwc-input";-const dataTableStyle = require("@material/data-table/dist/mdc.data-table.css");-interface TableOptions {- columnFilter?: string[];- stickyFirstColumn?: boolean;-}+const dataTableStyle = require("@material/data-table/dist/mdc.data-table.css");// language=CSSconst style = css`@@ -19,7 +17,7 @@ const style = css`:host {width: 100%;}-+:host([hidden]) {display: none;}@@ -30,6 +28,12 @@ const style = css`max-height: 500px;}+ .mdc-data-table__paginated {+ overflow: hidden;+ max-height: 700px;+ justify-content: space-between;+ }+/* first column should be sticky*/.mdc-data-table.has-sticky-first-column tr th:first-of-type,.mdc-data-table.has-sticky-first-column tr td:first-of-type {@@ -38,6 +42,7 @@ const style = css`left: 0;background-color: ${unsafeCSS(DefaultColor2)};}+.mdc-data-table.has-sticky-first-column tr th:first-of-type {z-index: 2;}@@ -45,9 +50,11 @@ const style = css`thead th {box-shadow: 0 1px 0 0 rgb(229, 229, 229);}+.mdc-data-table.has-sticky-first-column tr td:first-of-type {box-shadow: 1px 0 0 0 rgb(229, 229, 229);}+thead th:first-of-type {box-shadow: 1px 1px 0 0 rgb(229, 229, 229);}@@ -61,19 +68,75 @@ const style = css`th, td {cursor: default;}-+th:not(:first-of-type), td:not(:first-of-type) {max-width: 100px;text-overflow: ellipsis;}.mdc-data-table__header-cell {- font-weight: 500;+ font-weight: bold;color: ${unsafeCSS(DefaultColor3)};font-size: 14px;}++ .mdc-data-table__pagination-rows-per-page-select {+ /*min-width: 112px;*/+ }++ .mdc-data-table__pagination {+ min-height: 64px;+ }++ .mdc-data-table__cell--clickable {+ cursor: pointer;+ }++ @media screen and (max-width: 768px) {+ .hide-mobile {+ display: none;+ }+ }`;+interface TableConfig {+ columnFilter?: string[];+ stickyFirstColumn?: boolean;+ pagination?: {+ enable?: boolean+ }+}++export interface TableColumn {+ title?: string,+ isNumeric?: boolean,+ hideMobile?: boolean+}++export interface TableRow {+ content?: string[]+ clickable?: boolean+}++export interface OrMwcTableRowClickDetail {+ index: number+}++export class OrMwcTableRowClickEvent extends CustomEvent<OrMwcTableRowClickDetail> {++ public static readonly NAME = "or-mwc-table-row-click";++ constructor(index: number) {+ super(OrMwcTableRowClickEvent.NAME, {+ detail: {+ index: index+ },+ bubbles: true,+ composed: true+ });+ }+}+@customElement("or-mwc-table")export class OrMwcTable extends LitElement {@@ -85,45 +148,215 @@ export class OrMwcTable extends LitElement {}@property({type: Array})- public headers?: string[];+ public columns?: TableColumn[] | string[];++ @property({type: Object}) // to manually control HTML+ protected columnsTemplate?: TemplateResult;@property({type: Array})- public rows?: string[][];+ public rows?: TableRow[] | string[][];++ @property({type: Object}) // to manually control HTML (requires td and tr elements)+ protected rowsTemplate?: TemplateResult;++ @property({type: Number})+ protected paginationIndex: number = 0;++ @property({type: Number})+ protected paginationSize: number = 10;@property({type: Array})- public options?: TableOptions = {+ protected config: TableConfig = {columnFilter: [],- stickyFirstColumn: true+ stickyFirstColumn: true,+ pagination: {+ enable: false+ }};+ @state()+ protected _dataTable?: MDCDataTable;+++ /* ------------------- */++ protected firstUpdated(changedProperties: Map<string, any>) {+ const elem = this.shadowRoot!.querySelector('.mdc-data-table');+ this._dataTable = new MDCDataTable(elem!);+ }++ protected updated(changedProperties: Map<string, any>) {+ if ((changedProperties.has('paginationIndex') || changedProperties.has('paginationSize')) && this.config.pagination?.enable) {+ const elem = (this._dataTable ? this._dataTable.root.children[0] : this.shadowRoot!.querySelector('.mdc-data-table__table-container'));++ // Using an observer to prevent forced reflow / DOM measurements; prevents blocking the thread+ const observer = new IntersectionObserver((entries, observer) => {+ (entries[0].target as HTMLElement).scrollTop = 0;+ observer.unobserve(entries[0].target);+ })+ observer.observe(elem!);+ }+ }+protected render() {+ const tableClasses = {+ "mdc-data-table": true,+ "mdc-data-table__paginated": !!this.config.pagination,+ "has-sticky-first-column": !!this.config.stickyFirstColumn+ }+ return html`+ <div class="${classMap(tableClasses)}">+ <div class="mdc-data-table__table-container">+ <table class="mdc-data-table__table">+ <!-- Header row that normally includes entries like 'id' and 'name'. You can use either a template or a list of columns -->+ ${when(this.columnsTemplate, () => this.columnsTemplate, () => {+ return this.columns ? html`+ <thead>+ <tr class="mdc-data-table__header-row">+ ${this.columns.map((column: TableColumn | string) => {+ return (typeof column == "string") ? html`+ <th class="mdc-data-table__header-cell" role="columnheader" scope="col"+ title="${column}">${column}+ </th>+ ` : html`+ <th class="mdc-data-table__header-cell ${classMap({+ 'mdc-data-table__cell--numeric': !!column.isNumeric,+ 'hide-mobile': !!column.hideMobile+ })}"+ role="columnheader" scope="col" title="${column.title}">+ ${column.title}+ </th>+ `;+ })}+ </tr>+ </thead>+ ` : undefined;+ })}+ <!-- Table content, where either the template or an array of rows is displayed -->+ <tbody class="mdc-data-table__content">+ ${when(this.rowsTemplate, () => {+ if (this.config.pagination) { // if paginated, filter out the rows by index by manually collecting a list of <tr> elements.+ this.updateComplete.then(async () => {+ const elem = await this.getTableElem(false);+ const rows = elem?.querySelectorAll('tr');+ rows?.forEach((row, index) => {+ const hidden = (index <= (this.paginationIndex * this.paginationSize) || index > (this.paginationIndex * this.paginationSize) + this.paginationSize) && !row.classList.contains('mdc-data-table__header-row');+ row.style.display = (hidden ? 'none' : 'table-row');+ });+ });+ }+ return html`${this.rowsTemplate}`;+ }, () => {+ return this.rows ? (this.rows as any[])+ .filter((row, index) => (index >= (this.paginationIndex * this.paginationSize)) && (index < (this.paginationIndex * this.paginationSize + this.paginationSize)))+ .map((item: TableRow | string[]) => {+ const content: string[] | undefined = (Array.isArray(item) ? item : (item as TableRow).content);+ return html`+ <tr class="mdc-data-table__row"+ @click="${(ev: MouseEvent) => this.dispatchEvent(new OrMwcTableRowClickEvent((this.rows as any[]).indexOf(item)))}">+ ${content?.map((cell: string | number, index: number) => {+ const classes = {+ "mdc-data-table__cell": true,+ "mdc-data-table__cell--numeric": typeof cell === "number",+ "mdc-data-table__cell--clickable": (!Array.isArray(item) && (item as TableRow).clickable)!,+ "hide-mobile": (this.columns && typeof this.columns[index] != "string" && (this.columns[index] as TableColumn).hideMobile)!+ }+ return html`+ <td class="${classMap(classes)}" title="${cell}">+ <span>${cell}</span>+ </td>+ `;+ })}+ </tr>+ `+ })+ : undefined;+ })}+ </tbody>+ </table>+ </div>+ <!-- Pagination HTML, shown on the bottom right. Same as Material Design spec -->+ ${when(this.config.pagination, () => {+ return html`+ <div class="mdc-data-table__pagination">+ <div class="mdc-data-table__pagination-trailing">+ <div class="mdc-data-table__pagination-rows-per-page">+ <div class="mdc-data-table__pagination-rows-per-page-label">+ ${i18next.t('rowsPerPage')}+ </div>+ <or-mwc-input class="mdc-data-table__pagination-rows-per-page-select"+ .type="${InputType.SELECT}" compact comfortable outlined+ .value="${this.paginationSize}" .options="${[10, 25, 100]}"+ @or-mwc-input-changed="${(ev: OrInputChangedEvent) => {+ this.paginationSize = ev.detail.value;+ this.paginationIndex = 0;+ }}"+ ></or-mwc-input>+ </div>+ ${until(this.getPaginationControls(), html`${i18next.t('loading')}`)}+ </div>+ </div>+ `+ })}+ </div>+ `;+ }- const headerTemplate = (!this.headers) ? html`` : html`- <thead>- <tr class="mdc-data-table__header-row">- ${this.headers.map(item => html`- <th class="mdc-data-table__header-cell" role="columnheader" scope="col" title="${item}">- ${item}- </th>- `)}- </tr>- </thead>`;+ // HTML for the controls on the bottom of the table.+ // Includes basic pagination for browsing pages, with calculations of where to go.+ async getPaginationControls(): Promise<TemplateResult> {+ const max: number = await this.getRowCount();+ const start: number = (this.paginationIndex * this.paginationSize) + 1;+ let end: number = this.paginationIndex * this.paginationSize + this.paginationSize;+ if (end > max) {+ end = max;+ }return html`- <div class="mdc-data-table ${classMap({"has-sticky-first-column": !!this.options!.stickyFirstColumn})}">- <table class="mdc-data-table__table">- ${headerTemplate}- <tbody class="mdc-data-table__content">- ${!this.rows ? `` : this.rows.map(item => html`- <tr class="mdc-data-table__row">- ${item.map((cell: string|number) => {- return html`<td class="mdc-data-table__cell ${classMap({"mdc-data-table__cell--numeric": typeof cell === "number"})}" title="${cell}">${cell}</td>`;- })}- </tr>- `)}- </tbody>- </table>+ <div class="mdc-data-table__pagination-navigation">+ <div class="mdc-data-table__pagination-total">+ <span>${start}-${end} of ${max}</span>+ </div>+ <or-mwc-input class="mdc-data-table__pagination-button" .type="${InputType.BUTTON}"+ data-first-page="true" icon="page-first" .disabled="${this.paginationIndex == 0}"+ @or-mwc-input-changed="${() => this.paginationIndex = 0}"></or-mwc-input>+ <or-mwc-input class="mdc-data-table__pagination-button" .type="${InputType.BUTTON}"+ data-prev-page="true" icon="chevron-left" .disabled="${this.paginationIndex == 0}"+ @or-mwc-input-changed="${() => this.paginationIndex--}"></or-mwc-input>+ <or-mwc-input class="mdc-data-table__pagination-button" .type="${InputType.BUTTON}"+ data-next-page="true" icon="chevron-right"+ .disabled="${this.paginationIndex * this.paginationSize + this.paginationSize >= max}"+ @or-mwc-input-changed="${() => this.paginationIndex++}"></or-mwc-input>+ <or-mwc-input class="mdc-data-table__pagination-button" .type="${InputType.BUTTON}"+ data-last-page="true" icon="page-last"+ .disabled="${this.paginationIndex * this.paginationSize + this.paginationSize >= max}"+ @or-mwc-input-changed="${async () => {+ let pages: number = max / this.paginationSize;+ pages = pages.toString().includes('.') ? Math.floor(pages) : (pages - 1);+ this.paginationIndex = pages;+ }}"+ ></or-mwc-input></div>`;}+ // Getting the amount of rows/entries in the table.+ // Makes sure that both the rows, and rowsTemplate properties work.+ async getRowCount(wait: boolean = true, tableElem?: HTMLElement): Promise<number> {+ if (this.rows?.length) {+ return this.rows?.length;+ }+ if (!tableElem) {+ tableElem = await this.getTableElem(wait);+ }+ const rowElems = tableElem?.querySelectorAll('tr');+ return rowElems!.length;+ }++ async getTableElem(wait: boolean = false): Promise<HTMLElement | undefined> {+ if (wait) {+ await this.updateComplete;+ }+ return this._dataTable ? (this._dataTable.root as HTMLElement) : (this.shadowRoot!.querySelector('.mdc-data-table') as HTMLElement);+ }+}