+
+
+
+ );
+}
+
+const GroupManagerPlugin = connect(
+ createStructuredSelector({
+ totalResources: getTotalUserGroups,
+ loading: getUserGroupsLoading,
+ location: getRouterLocation,
+ resources: getUserGroups,
+ error: getUserGroupsError,
+ isFirstRequest: getIsFirstRequest,
+ page: getCurrentPage,
+ search: getSearch,
+ storedParams: getCurrentParams
+ }),
+ {
+ setLoading: loadingUserGroups,
+ setResources: updateUserGroups,
+ setResourcesMetadata: updateUserGroupsMetadata,
+ onResetSearch: resetSearchUserGroups
+ }
+)(GroupManager);
+
+GroupManagerPlugin.defaultProps = {
+ id: 'groups'
+};
+
+/**
+ * Allows an administrator to browse user groups.
+ * Renders in {@link #plugins.Manager|Manager} plugin.
+ * @name GroupManager
+ * @deprecated
+ * @property {object[]} cfg.attributeFields attributes that should be shown in attributes tab of group manager. By default this array contains one `notes` attribute with `controlType`: `text`. Every object in this array can contain:
+ * - `name`: the name of the attribute
+ * - `title`: the string to show as label for the attribute. If not present, `name` property will be used.
+ * - `controlType`: The input control to use. can be : `string` (input), `text` (text area), `date` (date picker) and `select`. By default it is `string`
+ * - `controlAttributes`: attributes specific of the `controlType`. For instance the `options` for the `select` control. See the examples for more details.
+ * @property {boolean} cfg.showMembersTab shows/hides group members tab, default true
+ * @property {boolean} cfg.showAttributesTab shows/hides group attributes tab, default false
+ * @memberof plugins
+ * @class
+ * @example
+ * { "name": "GroupManager",
+ * "cfg": {
+ * "showMembersTab": false,
+ * "showAttributesTab": true,
+ * "attributeFields": [
+ * {
+ * "title": "Simple text",
+ * "name": "normalString",
+ * "controlType": "string"
+ * },
+ * {
+ * "title": "Input creates different attributes entries, separated by ;",
+ * "name": "multistring",
+ * "controlType": "string",
+ * "controlAttributes": {
+ * "multiAttribute": true,
+ * "separator": ";"
+ * }
+ * },
+ * {
+ * "title": "Notes",
+ * "name": "notes",
+ * "controlType": "text"
+ * },
+ * {
+ * "title": "Notes, multiple entries, separated by new-line",
+ * "name": "multiple-notes",
+ * "controlType": "text",
+ * "controlAttributes": {
+ * "multiAttribute": true,
+ * "separator": "\n"
+ * }
+ * },
+ * {
+ * "title": "Single select with options in",
+ * "name": "select",
+ * "controlType": "select",
+ * "options": [
+ * {
+ * "label": "Option 1",
+ * "value": "opt1"
+ * },
+ * {
+ * "label": "Option 2",
+ * "value": "opt2"
+ * }
+ * ]
+ * },
+ * {
+ * "title": "Multiple selections in multiple attributes (using remote service)",
+ * "name": "organizations",
+ * "controlType": "select",
+ * "source": {
+ * "url": "assets/json/organizations.json",
+ * "path": "organizations",
+ * "valueAttribute": "value",
+ * "labelAttribute": "label"
+ * },
+ * "controlAttributes": {
+ * "multiAttribute": true,
+ * "isMulti": true
+ * }
+ * },
+ * {
+ * "title": "Multiple selections in single attribute, concatenated (using remote service)",
+ * "name": "organizations_dependent",
+ * "controlType": "select",
+ * "source": {
+ * "url": "assets/json/organizations.json",
+ * "path": "organizations",
+ * "valueAttribute": "value",
+ * "labelAttribute": "label"
+ * },
+ * "controlAttributes": {
+ * "separator": ";",
+ * "isMulti": true
+ * }
+ * }
+ * ]
+ * }
+ * }
+ */
+export default createPlugin('GroupManager', {
+ component: GroupManagerPlugin,
+ containers: {
+ Manager: {
+ name: 'groupmanager',
+ position: 2,
+ priority: 1,
+ glyph: "1-user-mod"
+ }
+ },
+ epics: {},
+ reducers: {
+ usergroups: usergroupsReducer
+ }
+});
diff --git a/web/client/plugins/ResourcesCatalog/ResourcesGrid.jsx b/web/client/plugins/ResourcesCatalog/ResourcesGrid.jsx
index 42769a4063c..2acddff4268 100644
--- a/web/client/plugins/ResourcesCatalog/ResourcesGrid.jsx
+++ b/web/client/plugins/ResourcesCatalog/ResourcesGrid.jsx
@@ -10,7 +10,6 @@ import React, { useRef } from 'react';
import { createPlugin } from '../../utils/PluginsUtils';
import { connect } from 'react-redux';
import { createStructuredSelector } from 'reselect';
-import { getResources, getRouterLocation, getSelectedResource } from './selectors/resources';
import resourcesReducer from './reducers/resources';
import usePluginItems from '../../hooks/usePluginItems';
@@ -18,6 +17,24 @@ import ConnectedResourcesGrid from './containers/ResourcesGrid';
import { hashLocationToHref } from './utils/ResourcesFiltersUtils';
import { requestResources } from './api/resources';
import { getResourceTypesInfo, getResourceStatus, getResourceId } from './utils/ResourcesUtils';
+import {
+ loadingResources,
+ resetSearchResources,
+ updateResources,
+ updateResourcesMetadata
+} from './actions/resources';
+import {
+ getResourcesLoading,
+ getResourcesError,
+ getIsFirstRequest,
+ getTotalResources,
+ getCurrentPage,
+ getSearch,
+ getCurrentParams,
+ getResources,
+ getRouterLocation,
+ getSelectedResource
+} from './selectors/resources';
/**
* This plugins allows to render a resources grid, it could be configured multiple times in the localConfig with different id
@@ -401,6 +418,7 @@ function ResourcesGrid({
const configuredItems = usePluginItems({ items, loadedPlugins }, []);
+
const updatedLocation = useRef();
updatedLocation.current = props.location;
function handleFormatHref(options) {
@@ -428,10 +446,23 @@ function ResourcesGrid({
const ResourcesGridPlugin = connect(
createStructuredSelector({
+ totalResources: getTotalResources,
+ loading: getResourcesLoading,
location: getRouterLocation,
resources: getResources,
- selectedResource: getSelectedResource
- })
+ selectedResource: getSelectedResource,
+ error: getResourcesError,
+ isFirstRequest: getIsFirstRequest,
+ page: getCurrentPage,
+ search: getSearch,
+ storedParams: getCurrentParams
+ }),
+ {
+ setLoading: loadingResources,
+ setResources: updateResources,
+ setResourcesMetadata: updateResourcesMetadata,
+ onResetSearch: resetSearchResources
+ }
)(ResourcesGrid);
export default createPlugin('ResourcesGrid', {
diff --git a/web/client/plugins/ResourcesCatalog/UserManager.jsx b/web/client/plugins/ResourcesCatalog/UserManager.jsx
new file mode 100644
index 00000000000..0d22d20fe04
--- /dev/null
+++ b/web/client/plugins/ResourcesCatalog/UserManager.jsx
@@ -0,0 +1,326 @@
+/*
+ * Copyright 2025, GeoSolutions Sas.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import React, { useRef } from 'react';
+import { createPlugin } from '../../utils/PluginsUtils';
+import { connect } from 'react-redux';
+import { createStructuredSelector } from 'reselect';
+import { getRouterLocation } from './selectors/resources';
+import {
+ editUser,
+ deleteUser,
+ changeUserMetadata,
+ saveUser,
+ loadingUsers,
+ updateUsers,
+ updateUsersMetadata,
+ resetSearchUsers,
+ searchUsers
+} from '../../actions/users';
+
+import { castArray, findIndex } from 'lodash';
+import usePluginItems from '../../hooks/usePluginItems';
+import ConnectedResourcesGrid from './containers/ResourcesGrid';
+import { hashLocationToHref } from './utils/ResourcesFiltersUtils';
+import { getResourceTypesInfo, getResourceId } from './utils/ResourcesUtils';
+import GeoStoreDAO from '../../api/GeoStoreDAO';
+import { Button } from 'react-bootstrap';
+import InputControl from './components/InputControl';
+import Message from '../../components/I18N/Message';
+
+import UserDeleteConfirm from '../../components/manager/users/UserDeleteConfirm';
+import UserDialog from '../../components/manager/users/UserDialog';
+import usersReducer from '../../reducers/users';
+import {
+ getTotalUsers,
+ getUsersLoading,
+ getUsers,
+ getUsersError,
+ getIsFirstRequest,
+ getCurrentPage,
+ getSearch,
+ getCurrentParams
+} from '../../selectors/users';
+import { userSelector } from '../../selectors/security';
+
+const ConnectedUserDialog = connect((state) => {
+ const users = state && state.users;
+ return {
+ modal: true,
+ show: users && !!users.currentUser,
+ user: users && users.currentUser,
+ groups: users && users.groups,
+ hidePasswordFields: users && users.currentUser && state.security && state.security.user && state.security.user.id === users.currentUser.id
+ };
+}, {
+ onChange: changeUserMetadata.bind(null),
+ onClose: editUser.bind(null, null),
+ onSave: saveUser.bind(null)
+})(UserDialog);
+
+const ConnectedUserDeleteConfirm = connect((state) => {
+ const usersState = state && state.users;
+ if (!usersState) return {};
+ const users = getUsers(state);
+ const deleteId = usersState.deletingUser && usersState.deletingUser.id;
+ if (users && deleteId) {
+ const index = findIndex(users, (user) => user.id === deleteId);
+ const user = users[index];
+ return {
+ user,
+ deleteId,
+ deleteError: usersState.deletingUser.error,
+ deleteStatus: usersState.deletingUser.status
+ };
+ }
+ return {
+ deleteId
+ };
+}, {
+ deleteUser
+})(UserDeleteConfirm);
+
+function requestUsers({ params }) {
+ const {
+ page = 1,
+ pageSize = 12,
+ q
+ } = params || {};
+ return GeoStoreDAO.getUsers(q ? `*${q}*` : '*', {
+ params: {
+ start: parseFloat(page - 1) * pageSize,
+ limit: pageSize
+ }
+ }).then((response) => {
+ const totalCount = response?.ExtUserList?.UserCount;
+ const users = castArray(response?.ExtUserList?.User || []);
+ const transformedUsers = users.map(user => ({
+ ...user,
+ groups: user?.groups?.group
+ ? Array.isArray(user.groups.group)
+ ? user.groups.group
+ : [user.groups.group].filter(Boolean)
+ : []
+ }));
+ return {
+ total: totalCount,
+ isNextPageAvailable: page < (totalCount / pageSize),
+ resources: transformedUsers
+ };
+ });
+}
+
+function NewUser({onNewUser}) {
+ return <>
+
+ ;
+}
+
+function EditUser({ component, onEdit, resource: user }) {
+ const Component = component;
+ function handleClick() {
+ onEdit(user);
+ }
+ if (user.role === 'GUEST') {
+ return null;
+ }
+ return ();
+}
+
+function DeleteUser({component, onDelete, resource: user, user: myUser }) {
+ const Component = component;
+ function handleClick() {
+ onDelete(user && user.id);
+ }
+ if (user.role === 'GUEST' || myUser.id === user.id) {
+ return null;
+ }
+ return ();
+}
+
+function UserFilter({onSearch, query }) {
+ const handleFieldChange = (params) => {
+ onSearch({ params: { q: params } });
+ };
+ return ();
+}
+
+const usersToolsConnect = connect(createStructuredSelector({
+ user: userSelector
+}), {
+ onEdit: editUser,
+ onDelete: deleteUser,
+ onSearch: searchUsers,
+ onNewUser: editUser.bind(null, { role: "USER", "enabled": true })
+});
+
+const ConnectedNewUser = usersToolsConnect(NewUser);
+const ConnectedEditUser = usersToolsConnect(EditUser);
+const ConnectedDeleteUser = usersToolsConnect(DeleteUser);
+const ConnectedFilter = usersToolsConnect(UserFilter);
+
+function UserManager({
+ active = true,
+ items,
+ order = null,
+ metadata = {
+ grid: [
+ {
+ path: 'name',
+ target: 'header',
+ icon: { glyph: 'user', type: 'glyphicon' }
+ },
+ {
+ path: 'groups',
+ itemValue: 'groupName',
+ type: 'tag',
+ showFullContent: true,
+ target: 'footer'
+ }
+ ]
+ },
+ attributeFields,
+ ...props
+}, context) {
+ const { loadedPlugins } = context;
+
+ const configuredItems = usePluginItems({ items, loadedPlugins }, []);
+
+ const updatedLocation = useRef();
+ updatedLocation.current = props.location;
+ function handleFormatHref(options) {
+ return hashLocationToHref({
+ location: updatedLocation.current,
+ excludeQueryKeys: ['page'],
+ ...options
+ });
+ }
+
+ if (!active) {
+ return null;
+ }
+
+ return (
+
+ {
+ return {
+ items: [
+ ...(resource.role === 'ADMIN' ? [{
+ type: 'icon',
+ tooltipId: 'users.admin',
+ glyph: 'shield'
+ }] : []),
+ ...(resource.enabled === true ? [{
+ type: 'icon',
+ tooltipId: 'users.active',
+ glyph: 'ok-sign',
+ iconType: 'glyphicon',
+ variant: 'success'
+ }] : [{
+ type: 'icon',
+ tooltipId: 'users.inactive',
+ glyph: 'minus-sign',
+ iconType: 'glyphicon',
+ variant: 'danger'
+ }])
+ ]
+ };
+ }}
+ formatHref={handleFormatHref}
+ getResourceTypesInfo={getResourceTypesInfo}
+ getResourceId={getResourceId}
+ cardLayoutStyle="grid"
+ hideThumbnail
+ resourcesFoundMsgId="users.usersFound"
+ />
+
+
+
+
+ );
+}
+
+const UserManagerPlugin = connect(
+ createStructuredSelector({
+ totalResources: getTotalUsers,
+ loading: getUsersLoading,
+ location: getRouterLocation,
+ resources: getUsers,
+ error: getUsersError,
+ isFirstRequest: getIsFirstRequest,
+ page: getCurrentPage,
+ search: getSearch,
+ storedParams: getCurrentParams
+ }),
+ {
+ setLoading: loadingUsers,
+ setResources: updateUsers,
+ setResourcesMetadata: updateUsersMetadata,
+ onResetSearch: resetSearchUsers
+ }
+)(UserManager);
+
+
+UserManagerPlugin.defaultProps = {
+ id: 'users'
+};
+
+/**
+ * Allows an administrator to browse users.
+ * Renders in {@link #plugins.Manager|Manager} plugin.
+ * @deprecated
+ * @name UserManager
+ * @memberof plugins
+ * @property {object[]} cfg.attributeFields attributes that should be shown in attributes tab of user dialog.
+ * @class
+ */
+export default createPlugin('UserManager', {
+ component: UserManagerPlugin,
+ containers: {
+ Manager: {
+ name: 'usermanager',
+ position: 1,
+ priority: 1,
+ glyph: "1-user-mod"
+ }
+ },
+ epics: {},
+ reducers: {
+ users: usersReducer
+ }
+});
diff --git a/web/client/plugins/ResourcesCatalog/components/Menu.jsx b/web/client/plugins/ResourcesCatalog/components/Menu.jsx
index e8025970ac6..4c7b967b17e 100644
--- a/web/client/plugins/ResourcesCatalog/components/Menu.jsx
+++ b/web/client/plugins/ResourcesCatalog/components/Menu.jsx
@@ -45,15 +45,18 @@ const Menu = forwardRef(({
{items
.map((item, idx) => {
return (
-
+ <>
+
+
);
})}
diff --git a/web/client/plugins/ResourcesCatalog/components/MenuItem.jsx b/web/client/plugins/ResourcesCatalog/components/MenuItem.jsx
index eefadeed6e3..dd0bd9fa94c 100644
--- a/web/client/plugins/ResourcesCatalog/components/MenuItem.jsx
+++ b/web/client/plugins/ResourcesCatalog/components/MenuItem.jsx
@@ -94,8 +94,9 @@ const MenuItem = ({
size,
alignRight,
variant,
- target: defaultTarget,
- menuItemComponent
+ menuItemComponent,
+ onClick,
+ target: defaultTarget
}) => {
const {
@@ -185,6 +186,7 @@ const MenuItem = ({
if (type === 'button') {
return (
diff --git a/web/client/plugins/ResourcesCatalog/components/ResourcesMenu.jsx b/web/client/plugins/ResourcesCatalog/components/ResourcesMenu.jsx
index 1b10233a8e9..06434c1565c 100644
--- a/web/client/plugins/ResourcesCatalog/components/ResourcesMenu.jsx
+++ b/web/client/plugins/ResourcesCatalog/components/ResourcesMenu.jsx
@@ -132,9 +132,11 @@ const ResourcesMenu = forwardRef(({
columns,
setColumns,
metadata,
- target
+ target,
+ resourcesFoundMsgId = "resourcesCatalog.resourcesFound"
}, ref) => {
+
const {
defaultLabelId,
options: orderOptions = [],
@@ -204,7 +206,7 @@ const ResourcesMenu = forwardRef(({
{loading
?
- : }
+ : }
}
footer={
@@ -252,6 +248,7 @@ function ResourcesGrid({
formatHref={formatHref}
getResourceTypesInfo={getResourceTypesInfo}
getResourceId={getResourceId}
+ hideThumbnail={hideThumbnail}
/>
@@ -261,22 +258,11 @@ function ResourcesGrid({
const ConnectedResourcesGrid = connect(
createStructuredSelector({
user: userSelector,
- totalResources: getTotalResources,
- loading: getResourcesLoading,
location: getRouterLocation,
- monitoredState: getMonitoredStateSelector,
- error: getResourcesError,
- isFirstRequest: getIsFirstRequest,
- page: getCurrentPage,
- search: getSearch,
- storedParams: getCurrentParams
+ monitoredState: getMonitoredStateSelector
}),
{
- onPush: push,
- setLoading: loadingResources,
- setResources: updateResources,
- setResourcesMetadata: updateResourcesMetadata,
- onResetSearch: resetSearchResources
+ onPush: push
}
)(withResizeDetector(ResourcesGrid));
diff --git a/web/client/plugins/ResourcesCatalog/index.js b/web/client/plugins/ResourcesCatalog/index.js
index 980462e76cb..ce3d54735a8 100644
--- a/web/client/plugins/ResourcesCatalog/index.js
+++ b/web/client/plugins/ResourcesCatalog/index.js
@@ -17,4 +17,6 @@ export { default as BrandNavbarPlugin } from './BrandNavbar';
export { default as FooterPlugin } from './Footer';
export { default as SavePlugin } from './Save';
export { default as SaveAsPlugin } from './SaveAs';
-export { default as TagsManager } from './TagsManager';
+export { default as TagsManagerPlugin } from './TagsManager';
+export { default as UserManagerPlugin } from './UserManager';
+export { default as GroupManagerPlugin } from './GroupManager';
diff --git a/web/client/plugins/ResourcesCatalog/utils/ResourcesUtils.js b/web/client/plugins/ResourcesCatalog/utils/ResourcesUtils.js
index cbb1363194c..df0e5b2642f 100644
--- a/web/client/plugins/ResourcesCatalog/utils/ResourcesUtils.js
+++ b/web/client/plugins/ResourcesCatalog/utils/ResourcesUtils.js
@@ -63,7 +63,7 @@ export const getResourceTypesInfo = (resource) => {
icon,
thumbnailUrl,
viewerPath,
- viewerUrl: `#${viewerPath}`
+ viewerUrl: viewerPath ? `#${viewerPath}` : false
};
};
/**
diff --git a/web/client/plugins/manager/GroupManager.jsx b/web/client/plugins/manager/GroupManager.jsx
deleted file mode 100644
index 8c6de8e9b06..00000000000
--- a/web/client/plugins/manager/GroupManager.jsx
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Copyright 2016, GeoSolutions Sas.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-import { trim } from 'lodash';
-import assign from 'object-assign';
-import PropTypes from 'prop-types';
-import React from 'react';
-import { Glyphicon, Grid } from 'react-bootstrap';
-import { connect } from 'react-redux';
-
-import Button from '../../components/misc/Button';
-import { editGroup, getUserGroups, groupSearchTextChanged } from '../../actions/usergroups';
-import Message from '../../components/I18N/Message';
-import SearchBar from '../../components/search/SearchBar';
-import GroupDeleteConfirm from './users/GroupDeleteConfirm';
-import GroupDialog from './users/GroupDialog';
-import GroupsGrid from './users/GroupGrid';
-import usergroups from '../../reducers/usergroups';
-
-class GroupManager extends React.Component {
- static propTypes = {
- onNewGroup: PropTypes.func,
- className: PropTypes.string,
- hideOnBlur: PropTypes.bool,
- placeholderMsgId: PropTypes.string,
- typeAhead: PropTypes.bool,
- splitTools: PropTypes.bool,
- isSearchClickable: PropTypes.bool,
- searchText: PropTypes.string,
- onSearch: PropTypes.func,
- onSearchReset: PropTypes.func,
- onSearchTextChange: PropTypes.func,
- start: PropTypes.number,
- limit: PropTypes.number,
- showMembersTab: PropTypes.bool,
- showAttributesTab: PropTypes.bool,
- attributeFields: PropTypes.array
- };
-
- static defaultProps = {
- className: "user-search",
- hideOnBlur: false,
- isSearchClickable: true,
- splitTools: false,
- placeholderMsgId: "usergroups.searchGroups",
- typeAhead: false,
- searchText: "",
- start: 0,
- limit: 20,
- onNewGroup: () => {},
- onSearch: () => {},
- onSearchReset: () => {},
- onSearchTextChange: () => {}
- };
-
- onNew = () => {
- this.props.onNewGroup();
- };
-
- render() {
- return (
-
-
-
-
-
-
-
-
-
);
- }
-}
-
-/**
- * Allows an administrator to browse user groups.
- * Renders in {@link #plugins.Manager|Manager} plugin.
- * @name GroupManager
- * @property {object[]} [attributeFields] attributes that should be shown in attributes tab of group manager. By default this array contains one `notes` attribute with `controlType`: `text`. Every object in this array can contain:
- * - `name`: the name of the attribute
- * - `title`: the string to show as label for the attribute. If not present, `name` property will be used.
- * - `controlType`: The input control to use. can be : `string` (input), `text` (text area), `date` (date picker) and `select`. By default it is `string`
- * - `controlAttributes`: attributes specific of the `controlType`. For instance the `options` for the `select` control. See the examples for more details.
- * @property {boolean} [showMembersTab=true] shows/hides group members tab
- * @property {boolean} [showAttributesTab=false] shows/hides group attributes tab
- * @memberof plugins
- * @class
- * @example
- * { "name": "GroupManager",
- * "cfg": {
- * "showMembersTab": false,
- * "showAttributesTab": true,
- * "attributeFields": [
- * {
- * "title": "Simple text",
- * "name": "normalString",
- * "controlType": "string"
- * },
- * {
- * "title": "Input creates different attributes entries, separated by ;",
- * "name": "multistring",
- * "controlType": "string",
- * "controlAttributes": {
- * "multiAttribute": true,
- * "separator": ";"
- * }
- * },
- * {
- * "title": "Notes",
- * "name": "notes",
- * "controlType": "text"
- * },
- * {
- * "title": "Notes, multiple entries, separated by new-line",
- * "name": "multiple-notes",
- * "controlType": "text",
- * "controlAttributes": {
- * "multiAttribute": true,
- * "separator": "\n"
- * }
- * },
- * {
- * "title": "Single select with options in",
- * "name": "select",
- * "controlType": "select",
- * "options": [
- * {
- * "label": "Option 1",
- * "value": "opt1"
- * },
- * {
- * "label": "Option 2",
- * "value": "opt2"
- * }
- * ]
- * },
- * {
- * "title": "Multiple selections in multiple attributes (using remote service)",
- * "name": "organizations",
- * "controlType": "select",
- * "source": {
- * "url": "assets/json/organizations.json",
- * "path": "organizations",
- * "valueAttribute": "value",
- * "labelAttribute": "label"
- * },
- * "controlAttributes": {
- * "multiAttribute": true,
- * "isMulti": true
- * }
- * },
- * {
- * "title": "Multiple selections in single attribute, concatenated (using remote service)",
- * "name": "organizations_dependent",
- * "controlType": "select",
- * "source": {
- * "url": "assets/json/organizations.json",
- * "path": "organizations",
- * "valueAttribute": "value",
- * "labelAttribute": "label"
- * },
- * "controlAttributes": {
- * "separator": ";",
- * "isMulti": true
- * }
- * }
- * ]
- * }
- * }
- */
-export default {
- GroupManagerPlugin: assign(
- connect((state) => {
- let searchState = state && state.usergroups;
- return {
- start: searchState && searchState.start,
- limit: searchState && searchState.limit,
- searchText: searchState && searchState.searchText && trim(searchState.searchText, '*') || ""
- };
- }, {
- onNewGroup: editGroup.bind(null, {}),
- onSearchTextChange: groupSearchTextChanged,
- onSearch: getUserGroups
- }, (stateProps, dispatchProps, ownProps) => {
- return {
- ...stateProps,
- ...dispatchProps,
- ...ownProps,
- onSearchReset: (text) => {
- let limit = stateProps.limit;
- let searchText = text && text !== "" ? "*" + text + "*" : "*";
- dispatchProps.onSearch(searchText, {params: {start: 0, limit}});
- },
- onSearch: (text) => {
- let limit = stateProps.limit;
- let searchText = text && text !== "" ? "*" + text + "*" : "*";
- dispatchProps.onSearch(searchText, {params: {start: 0, limit}});
- }
- };
- })(GroupManager), {
- hide: true,
- Manager: {
- id: "groupmanager",
- name: 'groupmanager',
- position: 1,
- priority: 1,
- title: ,
- glyph: "1-group-mod"
- }}),
- reducers: {
- usergroups
- }
-};
diff --git a/web/client/plugins/manager/Manager.jsx b/web/client/plugins/manager/Manager.jsx
index 8d98921237f..f2c0c4fac0f 100644
--- a/web/client/plugins/manager/Manager.jsx
+++ b/web/client/plugins/manager/Manager.jsx
@@ -9,91 +9,78 @@ import React from 'react';
import PropTypes from 'prop-types';
import { itemSelected } from '../../actions/manager';
-import { Nav, NavItem, Glyphicon } from 'react-bootstrap';
+import { Tabs, Tab } from 'react-bootstrap';
import { connect } from 'react-redux';
import { Message } from '../../components/I18N/I18N';
-import './style/manager.css';
+import usePluginItems from '../../hooks/usePluginItems';
-class Manager extends React.Component {
- static propTypes = {
- navStyle: PropTypes.object,
- items: PropTypes.array,
- itemSelected: PropTypes.func,
- selectedTool: PropTypes.string
- };
+function Manager({ items, selectedTool, onItemSelected }, context) {
+ const { loadedPlugins } = context;
+ const configuredItems = usePluginItems({ items, loadedPlugins }, []);
- static contextTypes = {
- router: PropTypes.object
- };
-
- static defaultProps = {
- items: [],
- selectedTool: "importer",
- itemSelected: () => {},
- navStyle: {
- flex: "inherit"
- }
- };
-
- renderToolIcon = (tool) => {
- if (tool.glyph) {
- return ;
- }
- return null;
- };
-
- renderNavItems = () => {
- return this.props.items.map((tool) =>
- ( {
- event.preventDefault();
- this.props.itemSelected(tool.id);
- this.context.router.history.push("/manager/" + tool.id);
- }}>
- {this.renderToolIcon(tool)}
- {tool.msgId ? : tool.title || tool.id}
- ));
- };
-
- renderPlugin = () => {
- for ( let i = 0; i < this.props.items.length; i++) {
- let tool = this.props.items[i];
- if (tool.id === this.props.selectedTool) {
- return ;
- }
- }
- return null;
-
- };
-
- render() {
- return (
-
-
{this.renderPlugin()}
-
-
-
-
-
-
-
-
-
-
);
- }
-}
-
-/**
- * Allows an administrator to browse users.
- * Renders in {@link #plugins.Manager|Manager} plugin.
- * @name UserManager
- * @memberof plugins
- * @property {object[]} attributeFields attributes that should be shown in attributes tab of user dialog.
- * @class
- */
-export default {
- UserManagerPlugin: assign(
- connect((state) => {
- let searchState = state && state.users;
- return {
- start: searchState && searchState.start,
- limit: searchState && searchState.limit,
- searchText: searchState && searchState.searchText && trim(searchState.searchText, '*') || ""
- };
- },
- {
- onNewUser: editUser.bind(null, {role: "USER", "enabled": true}),
- onSearchTextChange: usersSearchTextChanged,
- onSearch: getUsers
- }, (stateProps, dispatchProps, ownProps) => {
- return {
- ...stateProps,
- ...dispatchProps,
- ...ownProps,
- onSearchReset: (text) => {
- let limit = stateProps.limit;
- let searchText = text && text !== "" ? "*" + text + "*" : "*";
- dispatchProps.onSearch(searchText, {params: {start: 0, limit}});
- },
- onSearch: (text) => {
- let limit = stateProps.limit;
- let searchText = text && text !== "" ? "*" + text + "*" : "*";
- dispatchProps.onSearch(searchText, {params: {start: 0, limit}});
- }
- };
- })(UserManager), {
- hide: true,
- Manager: {
- id: "usermanager",
- name: 'usermanager',
- position: 1,
- priority: 1,
- title: ,
- glyph: "1-user-mod"
- }}),
- reducers: {
- users: require('../../reducers/users').default
- }
-};
diff --git a/web/client/plugins/manager/style/manager.css b/web/client/plugins/manager/style/manager.css
deleted file mode 100644
index 0a3f26a5408..00000000000
--- a/web/client/plugins/manager/style/manager.css
+++ /dev/null
@@ -1,26 +0,0 @@
-.Manager-Container {
- display: flex;
- flex-direction: row;
- margin: 10px;
- height: 100%;
-}
-
-.Manager-Container .Manager-Tools-Nav .glyphicon {
- vertical-align: middle;
-}
-
-.Manager-Container .Manager-Tools-Nav .nav-msg {
- display: none;
-}
-@media (min-width: 1200px) {
- .Manager-Container .Manager-Tools-Nav .nav-msg {
- display: inline-block;
- }
-}
-.Manager-Container .Manager-Tools-Nav {
- order: -1;
- max-width: 20%;
-}
-.Manager-Container .usermanager-title {
- margin-top: 0;
-}
diff --git a/web/client/plugins/manager/users/GroupDialog.jsx b/web/client/plugins/manager/users/GroupDialog.jsx
deleted file mode 100644
index 8f2c28d45c3..00000000000
--- a/web/client/plugins/manager/users/GroupDialog.jsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import { connect } from 'react-redux';
-/**
- * Copyright 2016, GeoSolutions Sas.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
- */
-import { bindActionCreators } from 'redux';
-
-import { changeGroupMetadata, editGroup, saveGroup, searchUsers } from '../../../actions/usergroups';
-import GroupDialog from '../../../components/manager/users/GroupDialog';
-
-const mapStateToProps = (state) => {
- const usergroups = state && state.usergroups;
- return {
- modal: true,
- availableUsers: usergroups && usergroups.availableUsers,
- availableUsersCount: usergroups && usergroups.availableUsersCount,
- availableUsersLoading: usergroups && usergroups.availableUsersLoading,
- show: usergroups && !!usergroups.currentGroup,
- group: usergroups && usergroups.currentGroup
- };
-};
-const mapDispatchToProps = (dispatch) => {
- return bindActionCreators({
- searchUsers: searchUsers.bind(null),
- onChange: changeGroupMetadata.bind(null),
- onClose: editGroup.bind(null, null),
- onSave: saveGroup.bind(null)
- }, dispatch);
-};
-
-export default connect(mapStateToProps, mapDispatchToProps)(GroupDialog);
diff --git a/web/client/plugins/manager/users/GroupGrid.jsx b/web/client/plugins/manager/users/GroupGrid.jsx
deleted file mode 100644
index f9c8d2f78de..00000000000
--- a/web/client/plugins/manager/users/GroupGrid.jsx
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * Copyright 2016, GeoSolutions Sas.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-import assign from 'object-assign';
-import React from 'react';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-
-import { deleteGroup, editGroup, getUserGroups } from '../../../actions/usergroups';
-import GroupGrid from '../../../components/manager/users/GroupGrid';
-import PaginationToolbar from './GroupsPaginationToolbar';
-
-const mapStateToProps = (state) => {
- const usergroups = state && state.usergroups;
- return {
- groups: usergroups && state.usergroups.groups,
- loading: usergroups && usergroups.status === "loading",
- stateProps: usergroups && usergroups.stateProps,
- start: usergroups && usergroups.start,
- limit: usergroups && usergroups.limit,
- myUserId: state && state.security && state.security.user && state.security.user.id
- };
-};
-const mapDispatchToProps = (dispatch) => {
- return bindActionCreators({
- loadGroups: getUserGroups,
- onEdit: editGroup,
- onDelete: deleteGroup
- }, dispatch);
-};
-const mergeProps = (stateProps, dispatchProps, ownProps) => {
- return assign({}, stateProps, dispatchProps, ownProps, {
- bottom: ,
- loadGroups: () => {
- dispatchProps.loadGroups(stateProps && stateProps.searchText, {
- params: {
- start: stateProps && stateProps.start || 0,
- limit: stateProps && stateProps.limit || 12
- }
- });
- }
- });
-};
-export default connect(mapStateToProps, mapDispatchToProps, mergeProps, {pure: false})(GroupGrid);
diff --git a/web/client/plugins/manager/users/GroupsPaginationToolbar.jsx b/web/client/plugins/manager/users/GroupsPaginationToolbar.jsx
deleted file mode 100644
index 4ea355dcbc3..00000000000
--- a/web/client/plugins/manager/users/GroupsPaginationToolbar.jsx
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Copyright 2016, GeoSolutions Sas.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
- */
-import { connect } from 'react-redux';
-
-import { getUserGroups } from '../../../actions/usergroups';
-import PaginationToolbarComp from '../../../components/misc/PaginationToolbar';
-const PaginationToolbar = connect((state) => {
- if (!state.usergroups ) {
- return {};
- }
- let {start, limit, groups, status, totalCount, searchText} = state.usergroups;
- let page = 0;
- if (groups && totalCount) { // must be !==0 and exist to do the division
- page = Math.ceil(start / limit);
- }
-
- return {
- page: page,
- pageSize: limit,
- items: groups,
- total: totalCount,
- searchText,
- loading: status === "loading"
- };
-}, {onSelect: getUserGroups}, (stateProps, dispatchProps) => {
-
- return {
- ...stateProps,
- onSelect: (pageNumber) => {
- let start = stateProps.pageSize * pageNumber;
- let limit = stateProps.pageSize;
- dispatchProps.onSelect(stateProps.searchText, {params: { start, limit}});
- }
- };
-})(PaginationToolbarComp);
-export default PaginationToolbar;
diff --git a/web/client/plugins/manager/users/UserDialog.jsx b/web/client/plugins/manager/users/UserDialog.jsx
deleted file mode 100644
index 3e0af9c6caf..00000000000
--- a/web/client/plugins/manager/users/UserDialog.jsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import { connect } from 'react-redux';
-/**
- * Copyright 2016, GeoSolutions Sas.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
- */
-import { bindActionCreators } from 'redux';
-
-import { changeUserMetadata, editUser, saveUser } from '../../../actions/users';
-import UserDialog from '../../../components/manager/users/UserDialog';
-
-const mapStateToProps = (state) => {
- const users = state && state.users;
- return {
- modal: true,
- show: users && !!users.currentUser,
- user: users && users.currentUser,
- groups: users && users.groups,
- hidePasswordFields: users && users.currentUser && state.security && state.security.user && state.security.user.id === users.currentUser.id
- };
-};
-const mapDispatchToProps = (dispatch) => {
- return bindActionCreators({
- onChange: changeUserMetadata.bind(null),
- onClose: editUser.bind(null, null),
- onSave: saveUser.bind(null)
- }, dispatch);
-};
-
-export default connect(mapStateToProps, mapDispatchToProps)(UserDialog);
diff --git a/web/client/plugins/manager/users/UserGrid.jsx b/web/client/plugins/manager/users/UserGrid.jsx
deleted file mode 100644
index fd6ba5f7849..00000000000
--- a/web/client/plugins/manager/users/UserGrid.jsx
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * Copyright 2016, GeoSolutions Sas.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-import assign from 'object-assign';
-import React from 'react';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-
-import { deleteUser, editUser, getUsers } from '../../../actions/users';
-import UserGrid from '../../../components/manager/users/UserGrid';
-import PaginationToolbar from './UsersPaginationToolbar';
-
-const mapStateToProps = (state) => {
- const users = state && state.users;
- return {
- users: users && users.users,
- loading: users && users.status === "loading",
- stateProps: users && users.stateProps,
- start: users && users.start,
- limit: users && users.limit,
- myUserId: state && state.security && state.security.user && state.security.user.id
- };
-};
-const mapDispatchToProps = (dispatch) => {
- return bindActionCreators({
- loadUsers: getUsers,
- onEdit: editUser,
- onDelete: deleteUser
- }, dispatch);
-};
-const mergeProps = (stateProps, dispatchProps, ownProps) => {
- return assign({}, stateProps, dispatchProps, ownProps, {
- bottom: ,
- loadUsers: () => {
- dispatchProps.loadUsers(stateProps && stateProps.searchText, {
- params: {
- start: stateProps && stateProps.start || 0,
- limit: stateProps && stateProps.limit || 12
- }
- });
- }
- });
-};
-export default connect(mapStateToProps, mapDispatchToProps, mergeProps, {pure: false})(UserGrid);
diff --git a/web/client/plugins/manager/users/UsersPaginationToolbar.jsx b/web/client/plugins/manager/users/UsersPaginationToolbar.jsx
deleted file mode 100644
index 92e6310be91..00000000000
--- a/web/client/plugins/manager/users/UsersPaginationToolbar.jsx
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Copyright 2016, GeoSolutions Sas.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
- */
-import { connect } from 'react-redux';
-
-import { getUsers } from '../../../actions/users';
-import PaginationToolbarComp from '../../../components/misc/PaginationToolbar';
-const PaginationToolbar = connect((state) => {
- if (!state.users ) {
- return {};
- }
- let {start, limit, users, status, totalCount, searchText} = state.users;
- let page = 0;
- if (users && totalCount) { // must be !==0 and exist to do the division
- page = Math.ceil(start / limit);
- }
-
- return {
- page: page,
- pageSize: limit,
- items: users,
- total: totalCount,
- searchText,
- loading: status === "loading"
- };
-}, {onSelect: getUsers}, (stateProps, dispatchProps) => {
-
- return {
- ...stateProps,
- onSelect: (pageNumber) => {
- let start = stateProps.pageSize * pageNumber;
- let limit = stateProps.pageSize;
- dispatchProps.onSelect(stateProps.searchText, {params: { start, limit}});
- }
- };
-})(PaginationToolbarComp);
-export default PaginationToolbar;
diff --git a/web/client/product/assets/css/manager.css b/web/client/product/assets/css/manager.css
deleted file mode 100644
index e7518fe4f19..00000000000
--- a/web/client/product/assets/css/manager.css
+++ /dev/null
@@ -1,28 +0,0 @@
-.manager .mapstore-header {
- background-image: url('../img/manager-header.jpg');
- height: 200px;
- z-index: -100;
- width: 100%;
- background-size: cover;
- background-repeat: no-repeat;
- overflow: hidden;
- background-position: center;
- position: relative;
- top: -20px;
-}
-
-.manager .MapSearchBar.user-search {
- top: -100px;
- height: 0;
- overflow: visible;
-}
-.manager .MapSearchBar.user-search .input-group {
- box-shadow: -1px 1px 5px 1px rgba(94,94,94,1);
-}
-.manager .Manager-Container {
- margin: 0;
-}
-
-.manager #home-button {
- float: right;
-}
diff --git a/web/client/product/assets/img/manager-header.jpg b/web/client/product/assets/img/manager-header.jpg
deleted file mode 100644
index 9acc7f8c1dd..00000000000
Binary files a/web/client/product/assets/img/manager-header.jpg and /dev/null differ
diff --git a/web/client/product/pages/Manager.jsx b/web/client/product/pages/Manager.jsx
index fcb72277b72..30e88474c07 100644
--- a/web/client/product/pages/Manager.jsx
+++ b/web/client/product/pages/Manager.jsx
@@ -13,8 +13,6 @@ import {connect} from 'react-redux';
import {resetControls} from '../../actions/controls';
import Page from '../../containers/Page';
-import('../assets/css/manager.css');
-
/**
* @name Manager
* @memberof pages
diff --git a/web/client/product/plugins.js b/web/client/product/plugins.js
index 6cada6f81d2..ba8c6f0ba0a 100644
--- a/web/client/product/plugins.js
+++ b/web/client/product/plugins.js
@@ -52,7 +52,6 @@ export const plugins = {
// ### DYNAMIC PLUGINS ### //
// product plugins
AboutPlugin: toModulePlugin('About', () => import(/* webpackChunkName: 'plugins/about' */ './plugins/About')),
- HeaderPlugin: toModulePlugin('Header', () => import(/* webpackChunkName: 'plugins/header' */ './plugins/Header')),
// framework plugins
MapTypePlugin: toModulePlugin('MapType', () => import(/* webpackChunkName: 'plugins/mapType' */ './plugins/MapType')),
AddGroupPlugin: toModulePlugin('AddGroup', () => import(/* webpackChunkName: 'plugins/about' */'../plugins/AddGroup')),
@@ -78,7 +77,6 @@ export const plugins = {
GeoStoryImport: toModulePlugin('GeoStoryImport', () => import(/* webpackChunkName: 'plugins/geoStoryImport' */ '../plugins/GeoStoryImport')),
GeoProcessing: toModulePlugin('GeoProcessing', () => import(/* webpackChunkName: 'plugins/GeoProcessing' */ '../plugins/GeoProcessing')),
GeoStoryNavigationPlugin: toModulePlugin('GeoStoryNavigation', () => import(/* webpackChunkName: 'plugins/geoStoryNavigation' */ '../plugins/GeoStoryNavigation')),
- GroupManagerPlugin: toModulePlugin('GroupManager', () => import(/* webpackChunkName: 'plugins/groupManager' */ '../plugins/manager/GroupManager')),
GlobeViewSwitcherPlugin: toModulePlugin('GlobeViewSwitcher', () => import(/* webpackChunkName: 'plugins/globeViewSwitcher' */ '../plugins/GlobeViewSwitcher')),
GoFull: toModulePlugin('GoFull', () => import(/* webpackChunkName: 'plugins/goFull' */ '../plugins/GoFull')),
GridContainerPlugin: toModulePlugin('GridContainer', () => import(/* webpackChunkName: 'plugins/gridContainer' */ '../plugins/GridContainer')),
@@ -132,7 +130,6 @@ export const plugins = {
TutorialPlugin: toModulePlugin('Tutorial', () => import(/* webpackChunkName: 'plugins/tutorial' */ '../plugins/Tutorial')),
UndoPlugin: toModulePlugin('Undo', () => import(/* webpackChunkName: 'plugins/history' */ '../plugins/History')),
UserExtensionsPlugin: toModulePlugin('UserExtensions', () => import(/* webpackChunkName: 'plugins/userExtensions' */ '../plugins/UserExtensions')),
- UserManagerPlugin: toModulePlugin('UserManager', () => import(/* webpackChunkName: 'plugins/userManager' */ '../plugins/manager/UserManager')),
WidgetsBuilderPlugin: toModulePlugin('WidgetsBuilder', () => import(/* webpackChunkName: 'plugins/widgetsBuilder' */ '../plugins/WidgetsBuilder')),
WidgetsPlugin: toModulePlugin('Widgets', () => import(/* webpackChunkName: 'plugins/widgets' */ '../plugins/Widgets')),
WidgetsTrayPlugin: toModulePlugin('WidgetsTray', () => import(/* webpackChunkName: 'plugins/widgetsTray' */ '../plugins/WidgetsTray')),
diff --git a/web/client/product/plugins/Header.jsx b/web/client/product/plugins/Header.jsx
deleted file mode 100644
index c70a70e31c9..00000000000
--- a/web/client/product/plugins/Header.jsx
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2016, GeoSolutions Sas.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
- */
-import React from 'react';
-
-import PropTypes from 'prop-types';
-
-/**
- * Header of MapStore, rendered in the home page (big full-width image).
- * @name Header
- * @class
- * @memberof plugins
- * @prop {object} [style] the style for the main div.
- */
-class Header extends React.Component {
- static propTypes = {
- style: PropTypes.object,
- className: PropTypes.object
- };
-
- render() {
- return (
-
- );
- }
-}
-
-export default {
- HeaderPlugin: Header
-};
diff --git a/web/client/reducers/__tests__/usergroups-test.js b/web/client/reducers/__tests__/usergroups-test.js
index 730214af444..a9f2d4889e2 100644
--- a/web/client/reducers/__tests__/usergroups-test.js
+++ b/web/client/reducers/__tests__/usergroups-test.js
@@ -10,51 +10,89 @@ import expect from 'expect';
import usergroups from '../usergroups';
import {
- GETGROUPS,
EDITGROUP,
EDITGROUPDATA,
- SEARCHTEXTCHANGED,
SEARCHUSERS,
UPDATEGROUP,
DELETEGROUP,
STATUS_SUCCESS,
STATUS_LOADING,
STATUS_SAVED,
- STATUS_ERROR
+ STATUS_ERROR,
+ updateUserGroups,
+ updateUserGroupsMetadata,
+ loadingUserGroups,
+ searchUserGroups,
+ resetSearchUserGroups
} from '../../actions/usergroups';
describe('Test the usergroups reducer', () => {
- it('default loading', () => {
- let oldState = {test: "test"};
- const state = usergroups(oldState, {
- type: "TEST_UNKNOWN_ACTION",
- status: 'loading'
+
+ it('updateUserGroups', () => {
+ const userGroupsItems = [{ id: '01' }];
+ const state = usergroups({}, updateUserGroups(userGroupsItems));
+ expect(state).toEqual({
+ grid: {
+ isFirstRequest: false,
+ userGroups: userGroupsItems
+ }
});
- expect(state).toBe(oldState);
});
- it('search text change', () => {
- const state = usergroups(undefined, {
- type: SEARCHTEXTCHANGED,
- text: "TEXT"
+
+ it('updateUserGroupsMetadata', () => {
+ const metadata = { total: 1, isNextPageAvailable: false, params: { q: 'a' }, locationSearch: '?q=a', locationPathname: '/' };
+ const state = usergroups({ grid: { params: { q: 'ab' } } }, updateUserGroupsMetadata(metadata));
+ expect(state).toEqual({
+ grid: {
+ total: 1,
+ isNextPageAvailable: false,
+ error: undefined,
+ params: { q: 'a' },
+ previousParams: { q: 'ab' },
+ locationSearch: '?q=a',
+ locationPathname: '/'
+ }
});
- expect(state.searchText).toBe("TEXT");
});
- it('set loading', () => {
- const state = usergroups(undefined, {
- type: GETGROUPS,
- status: STATUS_LOADING
+
+ it('loadingUserGroups', () => {
+ const state = usergroups({}, loadingUserGroups(true));
+ expect(state).toEqual({
+ grid: {
+ loading: true,
+ error: false
+ }
});
- expect(state.status).toBe('loading');
});
- it('get groups', () => {
- const state = usergroups(undefined, {
- type: GETGROUPS,
- status: STATUS_SUCCESS,
- groups: [],
- totalCount: 0
+
+ it('searchUserGroups', () => {
+ let state = usergroups({}, searchUserGroups({ params: { q: 'a' } }));
+ expect(state.grid.search.id).toBeTruthy();
+ expect(state.grid.search.params).toEqual({ q: 'a' });
+ state = usergroups({}, searchUserGroups({ refresh: true }));
+ expect(state.grid.search.id).toBeTruthy();
+ expect(state.grid.search.refresh).toBe(true);
+ state = usergroups({}, searchUserGroups({ clear: true }));
+ expect(state.grid.search.id).toBeTruthy();
+ expect(state.grid.search.clear).toBe(true);
+ });
+
+ it('resetSearchUserGroups', () => {
+ const state = usergroups({ grid: { search: { refresh: true } } }, resetSearchUserGroups());
+ expect(state).toEqual({
+ grid: {
+ search: null
+ }
});
- expect(state.groups).toExist();
- expect(state.groups.length).toBe(0);
+ });
+
+ it('default loading', () => {
+ let oldState = {test: "test"};
+ const state = usergroups(oldState, {
+ type: "TEST_UNKNOWN_ACTION",
+ status: 'loading'
+ });
+ expect(state).toBe(oldState);
});
it('edit group', () => {
const state = usergroups(undefined, {
diff --git a/web/client/reducers/__tests__/users-test.js b/web/client/reducers/__tests__/users-test.js
index 4f094fdeffb..2dbf69bb38f 100644
--- a/web/client/reducers/__tests__/users-test.js
+++ b/web/client/reducers/__tests__/users-test.js
@@ -10,17 +10,80 @@ import expect from 'expect';
import users from '../users';
import {
- USERMANAGER_GETUSERS,
USERMANAGER_EDIT_USER,
USERMANAGER_EDIT_USER_DATA,
USERMANAGER_UPDATE_USER,
USERMANAGER_DELETE_USER,
- USERMANAGER_GETGROUPS
+ USERMANAGER_GETGROUPS,
+ updateUsers,
+ updateUsersMetadata,
+ loadingUsers,
+ searchUsers,
+ resetSearchUsers
} from '../../actions/users';
import { UPDATEGROUP, STATUS_CREATED, DELETEGROUP, STATUS_DELETED } from '../../actions/usergroups';
describe('Test the users reducer', () => {
+
+ it('updateUsers', () => {
+ const userItems = [{ id: '01' }];
+ const state = users({}, updateUsers(userItems));
+ expect(state).toEqual({
+ grid: {
+ isFirstRequest: false,
+ users: userItems
+ }
+ });
+ });
+
+ it('updateUsersMetadata', () => {
+ const metadata = { total: 1, isNextPageAvailable: false, params: { q: 'a' }, locationSearch: '?q=a', locationPathname: '/' };
+ const state = users({ grid: { params: { q: 'ab' } } }, updateUsersMetadata(metadata));
+ expect(state).toEqual({
+ grid: {
+ total: 1,
+ isNextPageAvailable: false,
+ error: undefined,
+ params: { q: 'a' },
+ previousParams: { q: 'ab' },
+ locationSearch: '?q=a',
+ locationPathname: '/'
+ }
+ });
+ });
+
+ it('loadingUsers', () => {
+ const state = users({}, loadingUsers(true));
+ expect(state).toEqual({
+ grid: {
+ loading: true,
+ error: false
+ }
+ });
+ });
+
+ it('searchUsers', () => {
+ let state = users({}, searchUsers({ params: { q: 'a' } }));
+ expect(state.grid.search.id).toBeTruthy();
+ expect(state.grid.search.params).toEqual({ q: 'a' });
+ state = users({}, searchUsers({ refresh: true }));
+ expect(state.grid.search.id).toBeTruthy();
+ expect(state.grid.search.refresh).toBe(true);
+ state = users({}, searchUsers({ clear: true }));
+ expect(state.grid.search.id).toBeTruthy();
+ expect(state.grid.search.clear).toBe(true);
+ });
+
+ it('resetSearchUsers', () => {
+ const state = users({ grid: { search: { refresh: true } } }, resetSearchUsers());
+ expect(state).toEqual({
+ grid: {
+ search: null
+ }
+ });
+ });
+
it('default loading', () => {
let oldState = {test: "test"};
const state = users(oldState, {
@@ -29,23 +92,6 @@ describe('Test the users reducer', () => {
});
expect(state).toBe(oldState);
});
- it('set loading', () => {
- const state = users(undefined, {
- type: USERMANAGER_GETUSERS,
- status: 'loading'
- });
- expect(state.status).toBe('loading');
- });
- it('set users', () => {
- const state = users(undefined, {
- type: USERMANAGER_GETUSERS,
- status: 'success',
- users: [],
- totalCount: 0
- });
- expect(state.users).toExist();
- expect(state.users.length).toBe(0);
- });
it('edit user', () => {
const state = users(undefined, {
type: USERMANAGER_EDIT_USER,
diff --git a/web/client/reducers/usergroups.js b/web/client/reducers/usergroups.js
index a6f8504c541..e63df60caf9 100644
--- a/web/client/reducers/usergroups.js
+++ b/web/client/reducers/usergroups.js
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2016, GeoSolutions Sas.
* All rights reserved.
*
@@ -6,37 +6,90 @@
* LICENSE file in the root directory of this source tree.
*/
+import isNil from 'lodash/isNil';
+import uuid from 'uuid/v1';
import {
- GETGROUPS,
SEARCHUSERS,
EDITGROUP,
EDITGROUPDATA,
DELETEGROUP,
UPDATEGROUP,
- SEARCHTEXTCHANGED
+ UPDATE_USER_GROUPS,
+ UPDATE_USER_GROUPS_METADATA,
+ LOADING_USER_GROUPS,
+ SEARCH_USER_GROUPS,
+ RESET_SEARCH_USER_GROUPS
} from '../actions/usergroups';
import assign from 'object-assign';
-function usergroups(state = {
- start: 0,
- limit: 12
-}, action) {
- switch (action.type) {
- case GETGROUPS:
- return assign({}, state, {
- searchText: action.searchText,
- status: action.status,
- groups: action.status === "loading" ? state.groups : action.groups,
- start: action.start,
- limit: action.limit,
- totalCount: action.status === "loading" ? state.totalCount : action.totalCount
- });
- case SEARCHTEXTCHANGED: {
- return assign({}, state, {
- searchText: action.text
- });
+function usergroups(state = {}, action) {
+ switch (action.type) {
+ case UPDATE_USER_GROUPS: {
+ return {
+ ...state,
+ grid: {
+ ...state?.grid,
+ isFirstRequest: false,
+ userGroups: action.userGroups
+ }
+ };
+ }
+ case UPDATE_USER_GROUPS_METADATA: {
+ return {
+ ...state,
+ grid: {
+ ...state?.grid,
+ total: action.metadata.total,
+ isNextPageAvailable: action.metadata.isNextPageAvailable,
+ error: action.metadata.error,
+ ...(action.metadata.params &&
+ {
+ params: action.metadata.params,
+ previousParams: state?.grid?.params
+ }),
+ ...(!isNil(action.metadata.locationSearch) &&
+ {
+ locationSearch: action.metadata.locationSearch
+ }),
+ ...(!isNil(action.metadata.locationPathname) &&
+ {
+ locationPathname: action.metadata.locationPathname
+ })
+ }
+ };
}
+ case LOADING_USER_GROUPS: {
+ return {
+ ...state,
+ grid: {
+ ...state?.grid,
+ loading: action.loading,
+ ...(action.loading && { error: false })
+ }
+ };
+ }
+ case SEARCH_USER_GROUPS:
+ return {
+ ...state,
+ grid: {
+ ...state?.grid,
+ search: {
+ id: uuid(),
+ params: action.params,
+ clear: action.clear,
+ refresh: action.refresh
+ }
+ }
+ };
+ case RESET_SEARCH_USER_GROUPS:
+ return {
+ ...state,
+ grid: {
+ ...state?.grid,
+ search: null
+ }
+ };
case EDITGROUP: {
let newGroup = action.status ? {
status: action.status,
diff --git a/web/client/reducers/users.js b/web/client/reducers/users.js
index 75e12198426..57dd851ec0e 100644
--- a/web/client/reducers/users.js
+++ b/web/client/reducers/users.js
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2016, GeoSolutions Sas.
* All rights reserved.
*
@@ -6,52 +6,92 @@
* LICENSE file in the root directory of this source tree.
*/
+import isNil from 'lodash/isNil';
+import uuid from 'uuid/v1';
import {
- USERMANAGER_GETUSERS,
USERMANAGER_EDIT_USER,
USERMANAGER_EDIT_USER_DATA,
USERMANAGER_UPDATE_USER,
USERMANAGER_DELETE_USER,
USERMANAGER_GETGROUPS,
- USERS_SEARCH_TEXT_CHANGED
+ UPDATE_USERS,
+ UPDATE_USERS_METADATA,
+ SEARCH_USERS,
+ RESET_SEARCH_USERS,
+ LOADING_USERS
} from '../actions/users';
import { UPDATEGROUP, STATUS_CREATED, DELETEGROUP, STATUS_DELETED } from '../actions/usergroups';
+
import assign from 'object-assign';
-/**
- * Reducer for a user
- * * It contains the following parts:
- *
- * {
- * searchText: {string} The text string
- * status: {string} one of "loading", "new", "saving", "error", "modified", "cancelled"
- * }
- *
- * @param {object} state - The current state
- * @param {object} action - The performed action
- *
- *
- */
-function users(state = {
- start: 0,
- limit: 12
-}, action) {
+function users(state = {}, action) {
switch (action.type) {
- case USERMANAGER_GETUSERS:
- return assign({}, state, {
- searchText: action.searchText,
- status: action.status,
- users: action.status === "loading" ? state.users : action.users,
- start: action.start,
- limit: action.limit,
- totalCount: action.status === "loading" ? state.totalCount : action.totalCount
- });
- case USERS_SEARCH_TEXT_CHANGED: {
- return assign({}, state, {
- searchText: action.text
- });
+ case UPDATE_USERS: {
+ return {
+ ...state,
+ grid: {
+ ...state?.grid,
+ isFirstRequest: false,
+ users: action.users
+ }
+ };
+ }
+ case UPDATE_USERS_METADATA: {
+ return {
+ ...state,
+ grid: {
+ ...state?.grid,
+ total: action.metadata.total,
+ isNextPageAvailable: action.metadata.isNextPageAvailable,
+ error: action.metadata.error,
+ ...(action.metadata.params &&
+ {
+ params: action.metadata.params,
+ previousParams: state?.grid?.params
+ }),
+ ...(!isNil(action.metadata.locationSearch) &&
+ {
+ locationSearch: action.metadata.locationSearch
+ }),
+ ...(!isNil(action.metadata.locationPathname) &&
+ {
+ locationPathname: action.metadata.locationPathname
+ })
+ }
+ };
}
+ case LOADING_USERS: {
+ return {
+ ...state,
+ grid: {
+ ...state?.grid,
+ loading: action.loading,
+ ...(action.loading && { error: false })
+ }
+ };
+ }
+ case SEARCH_USERS:
+ return {
+ ...state,
+ grid: {
+ ...state?.grid,
+ search: {
+ id: uuid(),
+ params: action.params,
+ clear: action.clear,
+ refresh: action.refresh
+ }
+ }
+ };
+ case RESET_SEARCH_USERS:
+ return {
+ ...state,
+ grid: {
+ ...state?.grid,
+ search: null
+ }
+ };
case USERMANAGER_EDIT_USER: {
let newUser = action.status ? {
status: action.status,
diff --git a/web/client/selectors/__tests__/usergroups-test.js b/web/client/selectors/__tests__/usergroups-test.js
new file mode 100644
index 00000000000..a36b18fe829
--- /dev/null
+++ b/web/client/selectors/__tests__/usergroups-test.js
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2025, GeoSolutions Sas.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import {
+ getTotalUserGroups,
+ getUserGroupsLoading,
+ getUserGroups,
+ getUserGroupsError,
+ getIsFirstRequest,
+ getCurrentPage,
+ getSearch,
+ getCurrentParams
+} from '../usergroups';
+import expect from 'expect';
+
+describe('usergroups selectors', () => {
+ it('getTotalUserGroups', () => {
+ expect(getTotalUserGroups()).toBe(0);
+ expect(getTotalUserGroups({ usergroups: { grid: { total: 10 } } })).toBe(10);
+ });
+ it('getUserGroupsLoading', () => {
+ expect(getUserGroupsLoading()).toBe(undefined);
+ expect(getUserGroupsLoading({ usergroups: { grid: { loading: false } } })).toBe(false);
+ });
+ it('getUserGroups', () => {
+ expect(getUserGroups()).toEqual([]);
+ expect(getUserGroups({ usergroups: { grid: { userGroups: [{ id: '01' }] } } })).toEqual([{ id: '01' }]);
+ });
+ it('getUserGroupsError', () => {
+ expect(getUserGroupsError()).toBe(undefined);
+ expect(getUserGroupsError({ usergroups: { grid: { error: false } } })).toBe(false);
+ });
+ it('getIsFirstRequest', () => {
+ expect(getIsFirstRequest()).toBe(true);
+ expect(getIsFirstRequest({ usergroups: { grid: { isFirstRequest: false } } })).toBe(false);
+ });
+ it('getCurrentPage', () => {
+ expect(getCurrentPage()).toBe(1);
+ expect(getCurrentPage({ usergroups: { grid: { params: { page: 2 } } } })).toBe(2);
+ });
+ it('getSearch', () => {
+ expect(getSearch()).toBe(null);
+ expect(getSearch({ usergroups: { grid: { search: { q: 'a' } } } })).toEqual({ q: 'a' });
+ });
+ it('getCurrentParams', () => {
+ expect(getCurrentParams()).toBe(undefined);
+ expect(getCurrentParams({ usergroups: { grid: { params: { page: 2 } } } })).toEqual({ page: 2 });
+ });
+});
diff --git a/web/client/selectors/__tests__/users-test.js b/web/client/selectors/__tests__/users-test.js
new file mode 100644
index 00000000000..6a047bf8fcd
--- /dev/null
+++ b/web/client/selectors/__tests__/users-test.js
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2025, GeoSolutions Sas.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import {
+ getTotalUsers,
+ getUsersLoading,
+ getUsers,
+ getUsersError,
+ getIsFirstRequest,
+ getCurrentPage,
+ getSearch,
+ getCurrentParams
+} from '../users';
+import expect from 'expect';
+
+describe('users selectors', () => {
+ it('getTotalUsers', () => {
+ expect(getTotalUsers()).toBe(0);
+ expect(getTotalUsers({ users: { grid: { total: 10 } } })).toBe(10);
+ });
+ it('getUsersLoading', () => {
+ expect(getUsersLoading()).toBe(undefined);
+ expect(getUsersLoading({ users: { grid: { loading: false } } })).toBe(false);
+ });
+ it('getUsers', () => {
+ expect(getUsers()).toEqual([]);
+ expect(getUsers({ users: { grid: { users: [{ id: '01' }] } } })).toEqual([{ id: '01' }]);
+ });
+ it('getUsersError', () => {
+ expect(getUsersError()).toBe(undefined);
+ expect(getUsersError({ users: { grid: { error: false } } })).toBe(false);
+ });
+ it('getIsFirstRequest', () => {
+ expect(getIsFirstRequest()).toBe(true);
+ expect(getIsFirstRequest({ users: { grid: { isFirstRequest: false } } })).toBe(false);
+ });
+ it('getCurrentPage', () => {
+ expect(getCurrentPage()).toBe(1);
+ expect(getCurrentPage({ users: { grid: { params: { page: 2 } } } })).toBe(2);
+ });
+ it('getSearch', () => {
+ expect(getSearch()).toBe(null);
+ expect(getSearch({ users: { grid: { search: { q: 'a' } } } })).toEqual({ q: 'a' });
+ });
+ it('getCurrentParams', () => {
+ expect(getCurrentParams()).toBe(undefined);
+ expect(getCurrentParams({ users: { grid: { params: { page: 2 } } } })).toEqual({ page: 2 });
+ });
+});
diff --git a/web/client/selectors/usergroups.js b/web/client/selectors/usergroups.js
new file mode 100644
index 00000000000..9c5d21a372d
--- /dev/null
+++ b/web/client/selectors/usergroups.js
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2025, GeoSolutions Sas.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+export const getTotalUserGroups = state => state?.usergroups?.grid?.total || 0;
+export const getUserGroupsLoading = state => state?.usergroups?.grid?.loading;
+export const getUserGroups = state => state?.usergroups?.grid?.userGroups || [];
+export const getUserGroupsError = state => state?.usergroups?.grid?.error;
+export const getIsFirstRequest = state => state?.usergroups?.grid?.isFirstRequest !== false;
+export const getCurrentPage = state => state?.usergroups?.grid?.params?.page ?? 1;
+export const getSearch = state => state?.usergroups?.grid?.search || null;
+export const getCurrentParams = state => state?.usergroups?.grid?.params;
diff --git a/web/client/selectors/users.js b/web/client/selectors/users.js
new file mode 100644
index 00000000000..c283517a100
--- /dev/null
+++ b/web/client/selectors/users.js
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2025, GeoSolutions Sas.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+export const getTotalUsers = state => state?.users?.grid?.total || 0;
+export const getUsersLoading = state => state?.users?.grid?.loading;
+export const getUsers = state => state?.users?.grid?.users || [];
+export const getUsersError = state => state?.users?.grid?.error;
+export const getIsFirstRequest = state => state?.users?.grid?.isFirstRequest !== false;
+export const getCurrentPage = state => state?.users?.grid?.params?.page ?? 1;
+export const getSearch = state => state?.users?.grid?.search || null;
+export const getCurrentParams = state => state?.users?.grid?.params;
diff --git a/web/client/test-resources/data.es-ES.json b/web/client/test-resources/data.es-ES.json
index 1d1fc76b2a7..26fc7f429b0 100644
--- a/web/client/test-resources/data.es-ES.json
+++ b/web/client/test-resources/data.es-ES.json
@@ -565,7 +565,11 @@
"confirmDeleteUser": "¿Está seguro de borrar el usuario?",
"errorDelete": "A ocurrido un error al borrar el usuario:",
"errorSaving": "A ocurrido un error al guardar el usuario:",
- "selectedGroups": "GRUPOS SELECCIONADOS"
+ "selectedGroups": "GRUPOS SELECCIONADOS",
+ "usersFound": "{count, plural, =0 {0 Usuarios encontrados} =1 {1 Usuario encontrado} other {# Usuarios encontrados}}",
+ "admin": "Administrador",
+ "active": "Activo",
+ "inactive": "Inactivo"
},
"usergroups": {
"searchGroups": "buscar grupo ...",
@@ -589,7 +593,10 @@
"noUsers": "El grupo no tiene usuarios",
"errorSaving": "A ocurrido un error al guardar el grupo",
"errorDelete": "A ocurrido un error al borrar el grupo",
- "confirmDeleteGroup": "¿Está seguro de borrar el grupo?"
+ "confirmDeleteGroup": "¿Está seguro de borrar el grupo?",
+ "userGroupsFound": "{count, plural, =0 {0 Grupos encontrados} =1 {1 Grupo encontrado} other {# Grupos encontrados}}",
+ "active": "Activo",
+ "inactive": "Inactivo"
},
"share":{
"title": "Compartir",
diff --git a/web/client/themes/default/less/resources-catalog/_resource-card.less b/web/client/themes/default/less/resources-catalog/_resource-card.less
index 2095feaaa28..751531e9adc 100644
--- a/web/client/themes/default/less/resources-catalog/_resource-card.less
+++ b/web/client/themes/default/less/resources-catalog/_resource-card.less
@@ -18,6 +18,9 @@
// **************
.ms-resource-card {
+ --tag-color-r: 230;
+ --tag-color-g: 230;
+ --tag-color-b: 230;
> div a {
position: relative;
}
diff --git a/web/client/themes/default/less/resources-catalog/_resources-container.less b/web/client/themes/default/less/resources-catalog/_resources-container.less
index 8c351ca6db2..a6140fe7772 100644
--- a/web/client/themes/default/less/resources-catalog/_resources-container.less
+++ b/web/client/themes/default/less/resources-catalog/_resources-container.less
@@ -20,6 +20,12 @@
margin-top: auto;
margin-bottom: 0;
}
+ .ms-resource-status {
+ align-self: flex-start;
+ }
+ .ms-resource-card-buttons {
+ align-self: flex-end;
+ }
}
}
}
diff --git a/web/client/translations/data.ca-ES.json b/web/client/translations/data.ca-ES.json
index 3b5899c63a3..b374836ee02 100644
--- a/web/client/translations/data.ca-ES.json
+++ b/web/client/translations/data.ca-ES.json
@@ -1395,11 +1395,15 @@
"userCreated": "Creat!",
"deleting": "Suprimint ...",
"delete": "Esborrar",
- "confirmDeleteUser": "Esteu segur que voleu suprimir aquest usuari?",
+ "confirmDeleteUser": "Esteu segur que voleu suprimir aquest \"{title}\" usuari?",
"errorDelete": "Hi va haver un error en suprimir aquest usuari:",
"errorSaving": "Hi va haver un error en desar l'usuari:",
"selectedGroups": "Grups seleccionats",
- "requiredFiedsMessage": "Calen camps marcats amb asterisc (*)"
+ "requiredFiedsMessage": "Calen camps marcats amb asterisc (*)",
+ "usersFound": "{count, plural, =0 {0 Users found} =1 {1 User found} other {# Users found}}",
+ "admin": "Admin",
+ "active": "Active",
+ "inactive": "Inactive"
},
"usergroups": {
"searchGroups": "Grups de cerca ...",
@@ -1424,9 +1428,12 @@
"noUsers": "No hi ha usuaris per a aquest grup",
"errorSaving": "Hi va haver un error en desar aquest grup",
"errorDelete": "Hi va haver un error en suprimir aquest grup",
- "confirmDeleteGroup": "Esteu segur que voleu suprimir aquest grup?",
+ "confirmDeleteGroup": "Esteu segur que voleu suprimir aquest \"{title}\" grup?",
"generalInformation": "General",
- "members": "Membres"
+ "members": "Membres",
+ "userGroupsFound": "{count, plural, =0 {0 Groups found} =1 {1 Group found} other {# Groups found}}",
+ "active": "Active",
+ "inactive": "Inactive"
},
"share": {
"title": "Compartir",
@@ -4304,6 +4311,7 @@
"filterMapsByContext": "Mapes per context",
"tags": "Etiquetes",
"deleteResource": "Esborrar",
+ "editResource": "Editar",
"deleteResourceTitle": "Esteu segur que voleu suprimir aquest recurs?",
"deleteResourceDescription": "Aquest recurs i tots els recursos vinculats seran suprimits",
"deleteResourceConfirm": "Esborrar",
diff --git a/web/client/translations/data.da-DK.json b/web/client/translations/data.da-DK.json
index 28a6514e464..5fad25eef2e 100644
--- a/web/client/translations/data.da-DK.json
+++ b/web/client/translations/data.da-DK.json
@@ -1293,11 +1293,15 @@
"userCreated": "Created!",
"deleting": "Deleting...",
"delete": "Delete",
- "confirmDeleteUser": "Are you sure you want to delete this user?",
+ "confirmDeleteUser": "Are you sure you want to delete \"{title}\" user?",
"errorDelete": "There was an error deleting this user:",
"errorSaving": "There was an error saving the user:",
"selectedGroups": "SELECTED GROUPS",
- "requiredFiedsMessage": "Fields marked with asterisk (*) are required"
+ "requiredFiedsMessage": "Fields marked with asterisk (*) are required",
+ "usersFound": "{count, plural, =0 {0 Users found} =1 {1 User found} other {# Users found}}",
+ "admin": "Admin",
+ "active": "Active",
+ "inactive": "Inactive"
},
"usergroups": {
"searchGroups": "Search Groups...",
@@ -1322,9 +1326,12 @@
"noUsers": "No users for this group",
"errorSaving": "There was an error saving this group",
"errorDelete": "There was an error deleting this group",
- "confirmDeleteGroup": "Are you sure you want to delete this group?",
+ "confirmDeleteGroup": "Are you sure you want to delete this \"{title}\" group?",
"generalInformation": "General",
- "members": "Members"
+ "members": "Members",
+ "userGroupsFound": "{count, plural, =0 {0 Groups found} =1 {1 Group found} other {# Groups found}}",
+ "active": "Active",
+ "inactive": "Inactive"
},
"share": {
"title": "Share",
@@ -3929,6 +3936,7 @@
"filterMapsByContext": "Maps by context",
"tags": "Tags",
"deleteResource": "Delete",
+ "editResource": "Edit",
"deleteResourceTitle": "Are you sure you want to delete this resource?",
"deleteResourceDescription": "This resource and all linked resources will be deleted",
"deleteResourceConfirm": "Delete",
diff --git a/web/client/translations/data.de-DE.json b/web/client/translations/data.de-DE.json
index dcf5c606b75..77639cc42ff 100644
--- a/web/client/translations/data.de-DE.json
+++ b/web/client/translations/data.de-DE.json
@@ -440,7 +440,9 @@
"theme_combo": "Thema wählen:",
"maps_title": "Karten",
"locales_combo": "Sprache:",
- "featuredMaps": "Empfohlene Karten"
+ "featuredMaps": "Empfohlene Karten",
+ "groupmanagerTab": "Gruppen",
+ "usermanagerTab": "Benutzer"
},
"newMap": "Neue Karte",
"newMapEmpty": "Leere Karte",
@@ -1433,14 +1435,18 @@
"userCreated": "Erstellt!",
"deleting": "Löschen...",
"delete": "Löschen",
- "confirmDeleteUser": "Sind Sie sicher, das Sie diesen Benutzer löschen möchten?",
+ "confirmDeleteUser": "Sind Sie sicher, das Sie diesen Benutzer löschen \"{title}\" möchten?",
"errorDelete": "Es gab einen Fehler beim Löschen von Benutzer:",
"errorSaving": "Es gab einen Fehler beim Speichern von Benutzer:",
"selectedGroups": "Ausgewählte Gruppen",
- "requiredFiedsMessage": "Felder, welche mit einem Sternchen (*) markiert sind, sind Pflichtfelder"
+ "requiredFiedsMessage": "Felder, welche mit einem Sternchen (*) markiert sind, sind Pflichtfelder",
+ "usersFound": "{count, plural, =0 {0 Benutzer gefunden} =1 {1 Benutzer gefunden} other {# Benutzer gefunden}}",
+ "admin": "Administrator",
+ "active": "Aktiv",
+ "inactive": "Inaktiv"
},
"usergroups": {
- "searchGroups": "Suche Gruppen...",
+ "searchGroups": "Suche gruppen...",
"groups": "Gruppen",
"nameLimit": "Der Name ist auf 255 Zeichen limitiert.",
"descLimit": "Die Beschreibung ist auf 255 Zeichen limitiert.",
@@ -1462,9 +1468,12 @@
"noUsers": "Keine Benutzer für diese Gruppe gefunden",
"errorSaving": "Es gab einen Fehler beim Speichern dieser Gruppe",
"errorDelete": "Es gab einen Fehler beim Löschen dieser Gruppe",
- "confirmDeleteGroup": "Sind Sie sicher, das Sie diese Gruppe löschen möchten?",
+ "confirmDeleteGroup": "Sind Sie sicher, das Sie diese Gruppe löschen möchten \"{title}\" ?",
"generalInformation": "Allgemein",
- "members": "Mitglied"
+ "members": "Mitglied",
+ "userGroupsFound": "{count, plural, =0 {0 Gruppen gefunden} =1 {1 Gruppe gefunden} other {# Gruppen gefunden}}",
+ "active": "Aktiv",
+ "inactive": "Inaktiv"
},
"share": {
"title": "Teilen",
@@ -4347,6 +4356,7 @@
"filterMapsByContext": "Karten nach Kontext",
"tags": "Tags",
"deleteResource": "Löschen",
+ "editResource": "Bearbeiten",
"deleteResourceTitle": "Möchten Sie diese Ressource wirklich löschen?",
"deleteResourceDescription": "Diese Ressource und alle verknüpften Ressourcen werden gelöscht",
"deleteResourceConfirm": "Löschen",
diff --git a/web/client/translations/data.en-US.json b/web/client/translations/data.en-US.json
index 31597b0b72a..bf8490cb8b1 100644
--- a/web/client/translations/data.en-US.json
+++ b/web/client/translations/data.en-US.json
@@ -402,7 +402,9 @@
"theme_combo": "Select theme:",
"maps_title": "Maps",
"locales_combo": "Language:",
- "featuredMaps": "Featured"
+ "featuredMaps": "Featured",
+ "groupmanagerTab": "Groups",
+ "usermanagerTab": "Users"
},
"newMap": "New map",
"newMapEmpty": "Empty map",
@@ -1378,7 +1380,7 @@
"title": "Manage Accounts",
"users": "Users",
"manageUsers": "Manage Users",
- "searchUsers": "search for users...",
+ "searchUsers": "Search users...",
"newUser": "New User",
"editUser": "Edit user",
"deleteUser": "Delete User",
@@ -1394,14 +1396,18 @@
"userCreated": "Created!",
"deleting": "Deleting...",
"delete": "Delete",
- "confirmDeleteUser": "Are you sure you want to delete this user?",
+ "confirmDeleteUser": "Are you sure you want to delete \"{title}\" user?",
"errorDelete": "There was an error deleting this user:",
"errorSaving": "There was an error saving the user:",
"selectedGroups": "SELECTED GROUPS",
- "requiredFiedsMessage": "Fields marked with asterisk (*) are required"
+ "requiredFiedsMessage": "Fields marked with asterisk (*) are required",
+ "usersFound": "{count, plural, =0 {0 Users found} =1 {1 User found} other {# Users found}}",
+ "admin": "Admin",
+ "active": "Active",
+ "inactive": "Inactive"
},
"usergroups": {
- "searchGroups": "Search Groups...",
+ "searchGroups": "Search groups...",
"groups": "Groups",
"nameLimit": "The name is limited to 255 characters.",
"descLimit": "The description is limited to 255 characters.",
@@ -1423,9 +1429,12 @@
"noUsers": "No users for this group",
"errorSaving": "There was an error saving this group",
"errorDelete": "There was an error deleting this group",
- "confirmDeleteGroup": "Are you sure you want to delete this group?",
+ "confirmDeleteGroup": "Are you sure you want to delete \"{title}\" group?",
"generalInformation": "General",
- "members": "Members"
+ "members": "Members",
+ "userGroupsFound": "{count, plural, =0 {0 Groups found} =1 {1 Group found} other {# Groups found}}",
+ "active": "Active",
+ "inactive": "Inactive"
},
"share": {
"title": "Share",
@@ -4307,7 +4316,6 @@
"createContext": "Create context",
"createMapFromContext": "Create map from this context",
"viewResourceProperties": "Open properties",
- "editResourceProperties": "Edit properties",
"uploadImage": "Upload image",
"removeThumbnail": "Remove thumbnail",
"apply": "Apply",
@@ -4318,6 +4326,7 @@
"filterMapsByContext": "Maps by context",
"tags": "Tags",
"deleteResource": "Delete",
+ "editResource": "Edit",
"deleteResourceTitle": "Are you sure you want to delete this resource?",
"deleteResourceDescription": "This resource and all linked resources will be deleted",
"deleteResourceConfirm": "Delete",
diff --git a/web/client/translations/data.es-ES.json b/web/client/translations/data.es-ES.json
index e65811cdd7a..5176923e25e 100644
--- a/web/client/translations/data.es-ES.json
+++ b/web/client/translations/data.es-ES.json
@@ -402,7 +402,9 @@
"theme_combo": "Seleccione un tema:",
"maps_title": "Mapa",
"locales_combo": "Idioma:",
- "featuredMaps": "Mapas Destacados"
+ "featuredMaps": "Mapas Destacados",
+ "groupmanagerTab": "Grupos",
+ "usermanagerTab": "Usuarios"
},
"newMap": "Nuevo mapa",
"newMapEmpty": "Mapa vacío",
@@ -1378,7 +1380,7 @@
"title": "Administrador de cuentas de usuario",
"users": "Usuarios",
"manageUsers": "Administrar los usuarios",
- "searchUsers": "buscar usuarios ...",
+ "searchUsers": "Buscar usuarios ...",
"newUser": "Nuevo",
"editUser": "Modificar",
"deleteUser": "Borrar",
@@ -1394,14 +1396,18 @@
"userCreated": "¡Creado!",
"deleting": "Borrando...",
"delete": "Borrar",
- "confirmDeleteUser": "¿Está seguro de borrar el usuario?",
+ "confirmDeleteUser": "¿Está seguro de borrar el \"{title}\" usuario?",
"errorDelete": "Ha ocurrido un error al borrar el usuario:",
"errorSaving": "Ha ocurrido un error al guardar el usuario:",
"selectedGroups": "GRUPOS SELECCIONADOS",
- "requiredFiedsMessage": "Se requiere llenar campos marcados con asterisco (*)"
+ "requiredFiedsMessage": "Se requiere llenar campos marcados con asterisco (*)",
+ "usersFound": "{count, plural, =0 {0 Users found} =1 {1 User found} other {# Users found}}",
+ "admin": "Admin",
+ "active": "Active",
+ "inactive": "Inactive"
},
"usergroups": {
- "searchGroups": "buscar grupo ...",
+ "searchGroups": "Buscar grupo ...",
"groups": "Grupos",
"nameLimit": "El nombre está limitado a 255 caracteres.",
"descLimit": "La descripción está limitada a 255 caracteres.",
@@ -1423,9 +1429,12 @@
"noUsers": "El grupo no tiene usuarios",
"errorSaving": "Ha ocurrido un error al guardar el grupo",
"errorDelete": "Ha ocurrido un error al borrar el grupo",
- "confirmDeleteGroup": "¿Está seguro de borrar el grupo?",
+ "confirmDeleteGroup": "¿Está seguro de borrar el \"{title}\" grupo?",
"generalInformation": "General",
- "members": "Miembros"
+ "members": "Miembros",
+ "userGroupsFound": "{count, plural, =0 {0 Groups found} =1 {1 Group found} other {# Groups found}}",
+ "active": "Active",
+ "inactive": "Inactive"
},
"share": {
"title": "Compartir",
@@ -4308,6 +4317,7 @@
"filterMapsByContext": "Mapas por contexto",
"tags": "Etiquetas",
"deleteResource": "Eliminar",
+ "editResource": "Editar",
"deleteResourceTitle": "¿Está seguro de que desea eliminar este recurso?",
"deleteResourceDescription": "Este recurso y todos los recursos vinculados se eliminarán eliminado",
"deleteResourceConfirm": "Eliminar",
diff --git a/web/client/translations/data.fi-FI.json b/web/client/translations/data.fi-FI.json
index c189793780d..a21c1174149 100644
--- a/web/client/translations/data.fi-FI.json
+++ b/web/client/translations/data.fi-FI.json
@@ -1038,11 +1038,15 @@
"userCreated": "Luotu!",
"deleting": "Poistetaan...",
"delete": "Poista",
- "confirmDeleteUser": "Haluatko varmasti poistaa tämän käyttäjän?",
+ "confirmDeleteUser": "Haluatko varmasti poistaa tämän \"{title}\" käyttäjän?",
"errorDelete": "Tämän käyttäjän poistamisessa tapahtui virhe:",
"errorSaving": "Käyttäjää tallennettaessa tapahtui virhe:",
"selectedGroups": "VALITUT RYHMÄT",
- "requiredFiedsMessage": "Tähdellä (*) merkityt kentät ovat pakollisia"
+ "requiredFiedsMessage": "Tähdellä (*) merkityt kentät ovat pakollisia",
+ "usersFound": "{count, plural, =0 {0 Users found} =1 {1 User found} other {# Users found}}",
+ "admin": "Admin",
+ "active": "Active",
+ "inactive": "Inactive"
},
"usergroups": {
"searchGroups": "Hakuryhmät...",
@@ -1067,7 +1071,10 @@
"noUsers": "Ei käyttäjiä tässä ryhmässä",
"errorSaving": "Tätä ryhmää tallennettaessa tapahtui virhe",
"errorDelete": "Tämän ryhmän poistamisessa tapahtui virhe",
- "confirmDeleteGroup": "Haluatko varmasti poistaa tämän ryhmän?"
+ "confirmDeleteGroup": "Haluatko varmasti poistaa tämän \"{title}\" ryhmän?",
+ "userGroupsFound": "{count, plural, =0 {0 Groups found} =1 {1 Group found} other {# Groups found}}",
+ "active": "Active",
+ "inactive": "Inactive"
},
"share": {
"title": "Jaa",
@@ -2728,6 +2735,7 @@
"filterMapsByContext": "Maps by context",
"tags": "Tags",
"deleteResource": "Delete",
+ "editResource": "Edit",
"deleteResourceTitle": "Are you sure you want to delete this resource?",
"deleteResourceDescription": "This resource and all linked resources will be deleted",
"deleteResourceConfirm": "Delete",
diff --git a/web/client/translations/data.fr-FR.json b/web/client/translations/data.fr-FR.json
index 1069f3c7d17..8f3154406c2 100644
--- a/web/client/translations/data.fr-FR.json
+++ b/web/client/translations/data.fr-FR.json
@@ -402,7 +402,9 @@
"theme_combo": "Sélectionner un thème :",
"maps_title": "Cartes",
"locales_combo": "Langue:",
- "featuredMaps": "Cartes à la une"
+ "featuredMaps": "Cartes à la une",
+ "groupmanagerTab": "Groupes",
+ "usermanagerTab": "Utilisateurs"
},
"newMap": "Nouvelle carte",
"newMapEmpty": "Carte vide",
@@ -1378,7 +1380,7 @@
"title": "Gérer les comptes",
"users": "Utilisateurs",
"manageUsers": "Gérer les utilisateurs",
- "searchUsers": "rechercher des utilisateurs ...",
+ "searchUsers": "Rechercher des utilisateurs ...",
"newUser": "Nouvel",
"editUser": "Modifier",
"deleteUser": "Supprimer",
@@ -1394,14 +1396,18 @@
"userCreated": "Créé!",
"deleting": "Suppression...",
"delete": "Effacer",
- "confirmDeleteUser": "Êtes-vous sûr de vouloir supprimer cet utilisateur?",
+ "confirmDeleteUser": "Êtes-vous sûr de vouloir supprimer cet \"{title}\" utilisateur?",
"errorDelete": "Une erreur s'est produite lors de la suppression de cet utilisateur:",
"errorSaving": "Une erreur s'est produite lors de l'enregistrement de cet utilisateur:",
"selectedGroups": "CERTAINS GROUPES",
- "requiredFiedsMessage": "Les champs marqués d'un astérisque (*) sont obligatoires"
+ "requiredFiedsMessage": "Les champs marqués d'un astérisque (*) sont obligatoires",
+ "usersFound": "{count, plural, =0 {0 Utilisateurs trouvés} =1 {1 Utilisateur trouvé} other {# Utilisateurs trouvés}}",
+ "admin": "Admin",
+ "active": "Actif",
+ "inactive": "Inactif"
},
"usergroups": {
- "searchGroups": "rechercher des groupes...",
+ "searchGroups": "Rechercher des groupes...",
"groups": "Groupes",
"nameLimit": "Le nom est limité à 255 caractères.",
"descLimit": "La description est limitée à 255 caractères.",
@@ -1423,9 +1429,12 @@
"noUsers": "Aucun utilisateur pour ce groupe",
"errorSaving": "Une erreur s'est produite lors de l'enregistrement de ce groupe",
"errorDelete": "Une erreur s'est produite lors de la suppression de ce groupe",
- "confirmDeleteGroup": "Voulez-vous vraiment supprimer ce groupe?",
+ "confirmDeleteGroup": "Voulez-vous vraiment supprimer ce \"{title}\" groupe?",
"generalInformation": "Général",
- "members": "Membres"
+ "members": "Membres",
+ "userGroupsFound": "{count, plural, =0 {0 Groupes trouvés} =1 {1 Groupe trouvé} other {# Groupes trouvés}}",
+ "active": "Actif",
+ "inactive": "Inactif"
},
"share": {
"title": "Partager",
@@ -4309,6 +4318,7 @@
"filterMapsByContext": "Cartes par contexte",
"tags": "Tags",
"deleteResource": "Supprimer",
+ "editResource": "Modifier",
"deleteResourceTitle": "Êtes-vous sûr de vouloir supprimer cette ressource?",
"deleteResourceDescription": "Cette ressource et toutes les ressources liées seront supprimées",
"deleteResourceConfirm": "Supprimer",
diff --git a/web/client/translations/data.hr-HR.json b/web/client/translations/data.hr-HR.json
index 28689da5ffa..09c23b9ec36 100644
--- a/web/client/translations/data.hr-HR.json
+++ b/web/client/translations/data.hr-HR.json
@@ -1018,11 +1018,15 @@
"userCreated": "Kreiran!",
"deleting": "Brisanje...",
"delete": "Briši",
- "confirmDeleteUser": "Želite li zaista izbrisati ovoga korisnika?",
+ "confirmDeleteUser": "Želite li zaista izbrisati ovoga \"{title}\" korisnika?",
"errorDelete": "Došlo je do greške prilikom brisanja ovoga korisnika:",
"errorSaving": "Došlo je do greške prilikom spremanja ovoga korisnika:",
"selectedGroups": "ODABRANE GRUPE",
- "requiredFiedsMessage": "Polja označena zvjezdicom (*) su obavezna"
+ "requiredFiedsMessage": "Polja označena zvjezdicom (*) su obavezna",
+ "usersFound": "{count, plural, =0 {0 Users found} =1 {1 User found} other {# Users found}}",
+ "admin": "Admin",
+ "active": "Active",
+ "inactive": "Inactive"
},
"usergroups": {
"searchGroups": "Pretraži grupe...",
@@ -1047,7 +1051,10 @@
"noUsers": "Nema korisnika za ovu grupu",
"errorSaving": "Došlo je do greške prilikom spremanja ove grupe",
"errorDelete": "Došlo je do greške prilikom brisanja ove grupe",
- "confirmDeleteGroup": "Želite li zaista izbrisati ovu grupu?"
+ "confirmDeleteGroup": "Želite li zaista izbrisati ovu \"{title}\" grupu?",
+ "userGroupsFound": "{count, plural, =0 {0 Groups found} =1 {1 Group found} other {# Groups found}}",
+ "active": "Active",
+ "inactive": "Inactive"
},
"share": {
"title": "Podijeli",
@@ -2120,6 +2127,7 @@
"filterMapsByContext": "Maps by context",
"tags": "Tags",
"deleteResource": "Delete",
+ "editResource": "Edit",
"deleteResourceTitle": "Are you sure you want to delete this resource?",
"deleteResourceDescription": "This resource and all linked resources will be deleted",
"deleteResourceConfirm": "Delete",
diff --git a/web/client/translations/data.is-IS.json b/web/client/translations/data.is-IS.json
index 0e145d2d4ba..5152aa901c6 100644
--- a/web/client/translations/data.is-IS.json
+++ b/web/client/translations/data.is-IS.json
@@ -1305,11 +1305,15 @@
"userCreated": "Created!",
"deleting": "Deleting...",
"delete": "Delete",
- "confirmDeleteUser": "Are you sure you want to delete this user?",
+ "confirmDeleteUser": "Are you sure you want to delete \"{title}\" user?",
"errorDelete": "There was an error deleting this user:",
"errorSaving": "There was an error saving the user:",
"selectedGroups": "SELECTED GROUPS",
- "requiredFiedsMessage": "Fields marked with asterisk (*) are required"
+ "requiredFiedsMessage": "Fields marked with asterisk (*) are required",
+ "usersFound": "{count, plural, =0 {0 Users found} =1 {1 User found} other {# Users found}}",
+ "admin": "Admin",
+ "active": "Active",
+ "inactive": "Inactive"
},
"usergroups": {
"searchGroups": "Search Groups...",
@@ -1334,9 +1338,12 @@
"noUsers": "No users for this group",
"errorSaving": "There was an error saving this group",
"errorDelete": "There was an error deleting this group",
- "confirmDeleteGroup": "Are you sure you want to delete this group?",
+ "confirmDeleteGroup": "Are you sure you want to delete this \"{title}\" group?",
"generalInformation": "General",
- "members": "Members"
+ "members": "Members",
+ "userGroupsFound": "{count, plural, =0 {0 Groups found} =1 {1 Group found} other {# Groups found}}",
+ "active": "Active",
+ "inactive": "Inactive"
},
"share": {
"title": "Share",
@@ -3962,6 +3969,7 @@
"filterMapsByContext": "Maps by context",
"tags": "Tags",
"deleteResource": "Delete",
+ "editResource": "Edit",
"deleteResourceTitle": "Are you sure you want to delete this resource?",
"deleteResourceDescription": "This resource and all linked resources will be deleted",
"deleteResourceConfirm": "Delete",
diff --git a/web/client/translations/data.it-IT.json b/web/client/translations/data.it-IT.json
index cb5f968ecd1..11c7571e2d1 100644
--- a/web/client/translations/data.it-IT.json
+++ b/web/client/translations/data.it-IT.json
@@ -403,7 +403,9 @@
"theme_combo": "Seleziona Tema:",
"maps_title": "Mappe",
"locales_combo": "Lingua:",
- "featuredMaps": "In Evidenza"
+ "featuredMaps": "In Evidenza",
+ "groupmanagerTab": "Gruppi",
+ "usermanagerTab": "Utenti"
},
"newMap": "Nuova Mappa",
"newMapEmpty": "Mappa vuota",
@@ -1395,11 +1397,15 @@
"userCreated": "Creato!",
"deleting": "Rimozione...",
"delete": "Rimuovi",
- "confirmDeleteUser": "Sei sicuro di voler cancellare questo utente?",
+ "confirmDeleteUser": "Sei sicuro di voler cancellare questo \"{title}\" utente?",
"errorDelete": "Si è verificato un errore rimuovendo l'utente:",
"errorSaving": "Si è verificato un errore salvando questo utente:",
"selectedGroups": "GRUPPI SELEZIONATI",
- "requiredFiedsMessage": "I campi contrassegnati con l'asterisco (*) sono obbligatori"
+ "requiredFiedsMessage": "I campi contrassegnati con l'asterisco (*) sono obbligatori",
+ "usersFound": "{count, plural, =0 {0 Utenti trovati} =1 {1 Utente trovato} other {# Utenti trovati}}",
+ "admin": "Amministratore",
+ "active": "Attivo",
+ "inactive": "Inattivo"
},
"usergroups": {
"searchGroups": "Cerca gruppi...",
@@ -1424,9 +1430,12 @@
"noUsers": "Nessun utente membro di questo gruppo",
"errorSaving": "Si è verificato un errore salvando questo gruppo:",
"errorDelete": "Si è verificato un errore rimuovendo questo utente:",
- "confirmDeleteGroup": "Sei sicuro di voler cancellare questo gruppo?",
+ "confirmDeleteGroup": "Sei sicuro di voler cancellare questo \"{title}\" gruppo?",
"generalInformation": "Generale",
- "members": "Membri"
+ "members": "Membri",
+ "userGroupsFound": "{count, plural, =0 {0 Gruppi trovati} =1 {1 Gruppo trovato} other {# Gruppi trovati}}",
+ "active": "Attivo",
+ "inactive": "Inattivo"
},
"share": {
"title": "Condividi",
@@ -4311,6 +4320,7 @@
"filterMapsByContext": "Mappe per contesto",
"tags": "Tag",
"deleteResource": "Elimina",
+ "editResource": "Modifica",
"deleteResourceTitle": "Vuoi davvero eliminare questa risorsa?",
"deleteResourceDescription": "Questa risorsa e tutte le risorse collegate verranno eliminate",
"deleteResourceConfirm": "Elimina",
diff --git a/web/client/translations/data.nl-NL.json b/web/client/translations/data.nl-NL.json
index d306d3d0e70..c0d3ec979dc 100644
--- a/web/client/translations/data.nl-NL.json
+++ b/web/client/translations/data.nl-NL.json
@@ -1373,11 +1373,15 @@
"userCreated": "Aangemaakt!",
"deleting": "Verwijderen...",
"delete": "Verwijder",
- "confirmDeleteUser": "Weet u zeker dat u deze gebruiker wilt verwijderen??",
+ "confirmDeleteUser": "Weet u zeker dat u deze gebruiker wilt \"{title}\" verwijderen??",
"errorDelete": "Er is een fout opgetreden bij het verwijderen van deze gebruiker:",
"errorSaving": "Er is een fout opgetreden bij het opslaan van de gebruiker:",
"selectedGroups": "GESELECTEERDE GROEPEN",
- "requiredFiedsMessage": "Velden gemarkeerd met een ster (*) zijn verplicht"
+ "requiredFiedsMessage": "Velden gemarkeerd met een ster (*) zijn verplicht",
+ "usersFound": "{count, plural, =0 {0 Users found} =1 {1 User found} other {# Users found}}",
+ "admin": "Admin",
+ "active": "Active",
+ "inactive": "Inactive"
},
"usergroups": {
"searchGroups": "Zoek groepen...",
@@ -1402,9 +1406,12 @@
"noUsers": "Geen gebruikers voor deze groep",
"errorSaving": "Er is een fout opgetreden bij het opslaan van deze groep",
"errorDelete": "Er is een fout opgetreden bij het verwijderen van deze groep",
- "confirmDeleteGroup": "Weet u zeker dat u deze groep wilt verwijderen?",
+ "confirmDeleteGroup": "Weet u zeker dat u deze groep wilt \"{title}\" verwijderen?",
"generalInformation": "Algemeen",
- "members": "Leden"
+ "members": "Leden",
+ "userGroupsFound": "{count, plural, =0 {0 Groups found} =1 {1 Group found} other {# Groups found}}",
+ "active": "Active",
+ "inactive": "Inactive"
},
"share": {
"title": "Delen",
@@ -4293,6 +4300,7 @@
"filterMapsByContext": "Maps by context",
"tags": "Tags",
"deleteResource": "Delete",
+ "editResource": "Edit",
"deleteResourceTitle": "Are you sure you want to delete this resource?",
"deleteResourceDescription": "This resource and all linked resources will be deleted",
"deleteResourceConfirm": "Delete",
diff --git a/web/client/translations/data.pt-PT.json b/web/client/translations/data.pt-PT.json
index 27d2c837c19..ad6241b3ae7 100644
--- a/web/client/translations/data.pt-PT.json
+++ b/web/client/translations/data.pt-PT.json
@@ -996,11 +996,15 @@
"userCreated": "Created!",
"deleting": "Deleting...",
"delete": "Delete",
- "confirmDeleteUser": "Are you sure you want to delete this user?",
+ "confirmDeleteUser": "Are you sure you want to delete \"{title}\" user?",
"errorDelete": "There was an error deleting this user:",
"errorSaving": "There was an error saving the user:",
"selectedGroups": "SELECTED GROUPS",
- "requiredFiedsMessage": "Fields marked with asterisk (*) are required"
+ "requiredFiedsMessage": "Fields marked with asterisk (*) are required",
+ "usersFound": "{count, plural, =0 {0 Users found} =1 {1 User found} other {# Users found}}",
+ "admin": "Admin",
+ "active": "Active",
+ "inactive": "Inactive"
},
"usergroups": {
"searchGroups": "Search Groups...",
@@ -1025,7 +1029,10 @@
"noUsers": "No users for this group",
"errorSaving": "There was an error saving this group",
"errorDelete": "There was an error deleting this group",
- "confirmDeleteGroup": "Are you sure you want to delete this group?"
+ "confirmDeleteGroup": "Are you sure you want to delete this \"{title}\" group?",
+ "userGroupsFound": "{count, plural, =0 {0 Groups found} =1 {1 Group found} other {# Groups found}}",
+ "active": "Active",
+ "inactive": "Inactive"
},
"share": {
"title": "Share",
@@ -2078,6 +2085,7 @@
"filterMapsByContext": "Maps by context",
"tags": "Tags",
"deleteResource": "Delete",
+ "editResource": "Edit",
"deleteResourceTitle": "Are you sure you want to delete this resource?",
"deleteResourceDescription": "This resource and all linked resources will be deleted",
"deleteResourceConfirm": "Delete",
diff --git a/web/client/translations/data.sk-SK.json b/web/client/translations/data.sk-SK.json
index b27f3828568..22ba1451e5a 100644
--- a/web/client/translations/data.sk-SK.json
+++ b/web/client/translations/data.sk-SK.json
@@ -1238,11 +1238,15 @@
"userCreated": "Vytvorené!",
"deleting": "Odstraňuje sa...",
"delete": "Odstrániť",
- "confirmDeleteUser": "Si si istý, že chceš odstrániť tohto používateľa?",
+ "confirmDeleteUser": "Si si istý, že chceš odstrániť tohto \"{title}\" používateľa?",
"errorDelete": "Pri odstraňovaní tohto používateľa sa vyskytla chyba:",
"errorSaving": "Pri ukladaní používateľa sa vyskytla chyba:",
"selectedGroups": "VYBRANÉ SKUPINY",
- "requiredFiedsMessage": "Polia označené hviezdičkou (*) sú povinné"
+ "requiredFiedsMessage": "Polia označené hviezdičkou (*) sú povinné",
+ "usersFound": "{count, plural, =0 {0 Users found} =1 {1 User found} other {# Users found}}",
+ "admin": "Admin",
+ "active": "Active",
+ "inactive": "Inactive"
},
"usergroups": {
"searchGroups": "Hladať skupiny...",
@@ -1267,7 +1271,10 @@
"noUsers": "V tejt skupine nie sú žiadni používatelia",
"errorSaving": "Pri ukladaní tejto skupiny sa vyskytla chyba",
"errorDelete": "Pri odstraňovaní tejto skupiny sa vyskytla chyba",
- "confirmDeleteGroup": "Si si istý, že chceš odstrániť túto skupinu?"
+ "confirmDeleteGroup": "Si si istý, že chceš odstrániť túto \"{title}\" skupinu?",
+ "userGroupsFound": "{count, plural, =0 {0 Groups found} =1 {1 Group found} other {# Groups found}}",
+ "active": "Active",
+ "inactive": "Inactive"
},
"share": {
"title": "Zdieľať",
@@ -3467,6 +3474,7 @@
"filterMapsByContext": "Maps by context",
"tags": "Tags",
"deleteResource": "Delete",
+ "editResource": "Edit",
"deleteResourceTitle": "Are you sure you want to delete this resource?",
"deleteResourceDescription": "This resource and all linked resources will be deleted",
"deleteResourceConfirm": "Delete",
diff --git a/web/client/translations/data.sv-SE.json b/web/client/translations/data.sv-SE.json
index 6ceae65d11d..a3c4e3e9442 100644
--- a/web/client/translations/data.sv-SE.json
+++ b/web/client/translations/data.sv-SE.json
@@ -1208,11 +1208,15 @@
"userCreated": "Skapad!",
"deleting": "Radera ...",
"delete": "Ta bort",
- "confirmDeleteUser": "Är du säker på att du vill ta bort den här användaren?",
+ "confirmDeleteUser": "Är du säker på att du vill ta bort den här \"{title}\" användaren?",
"errorDelete": "Ett fel uppstod när den här användaren skulle raderas:",
"errorSaving": "Ett fel uppstod när användaren skulle sparas:",
"selectedGroups": "VALDA GRUPPER",
- "requiredFiedsMessage": "Fält markerade med asterisk (*) är obligatoriska"
+ "requiredFiedsMessage": "Fält markerade med asterisk (*) är obligatoriska",
+ "usersFound": "{count, plural, =0 {0 Users found} =1 {1 User found} other {# Users found}}",
+ "admin": "Admin",
+ "active": "Active",
+ "inactive": "Inactive"
},
"usergroups": {
"searchGroups": "Sök grupper ...",
@@ -1237,7 +1241,10 @@
"noUsers": "Inga användare för den här gruppen",
"errorSaving": "Ett fel uppstod när den här gruppen skulle sparas",
"errorDelete": "Ett fel uppstod när den här gruppen skulle raderas",
- "confirmDeleteGroup": "Är du säker på att du vill ta bort den här gruppen?"
+ "confirmDeleteGroup": "Är du säker på att du vill ta bort den här \"{title}\" gruppen?",
+ "userGroupsFound": "{count, plural, =0 {0 Groups found} =1 {1 Group found} other {# Groups found}}",
+ "active": "Active",
+ "inactive": "Inactive"
},
"share": {
"title": "Dela",
@@ -3500,6 +3507,7 @@
"filterMapsByContext": "Maps by context",
"tags": "Tags",
"deleteResource": "Delete",
+ "editResource": "Edit",
"deleteResourceTitle": "Are you sure you want to delete this resource?",
"deleteResourceDescription": "This resource and all linked resources will be deleted",
"deleteResourceConfirm": "Delete",
diff --git a/web/client/translations/data.vi-VN.json b/web/client/translations/data.vi-VN.json
index 54dee0cecd1..38317571743 100644
--- a/web/client/translations/data.vi-VN.json
+++ b/web/client/translations/data.vi-VN.json
@@ -1716,7 +1716,7 @@
},
"usergroups": {
"addMember": "Thêm thành viên:",
- "confirmDeleteGroup": "Bạn có chắc chắn muốn xóa nhóm này?",
+ "confirmDeleteGroup": "Bạn có chắc chắn muốn xóa nhóm \"{title}\" này?",
"createGroup": "Tạo mới",
"creatingGroup": "Đang tạo...",
"deleteGroup": "Xóa nhóm",
@@ -1737,10 +1737,13 @@
"noUsers": "Không có người dùng cho nhóm này",
"removeUser": "Xóa người dùng",
"saveGroup": "Lưu lại",
- "searchGroups": "Tìm kiếm nhóm ..."
+ "searchGroups": "Tìm kiếm nhóm ...",
+ "userGroupsFound": "{count, plural, =0 {0 Groups found} =1 {1 Group found} other {# Groups found}}",
+ "active": "Active",
+ "inactive": "Inactive"
},
"users": {
- "confirmDeleteUser": "Bạn có chắc chắn muốn xóa người dùng này?",
+ "confirmDeleteUser": "Bạn có chắc chắn muốn xóa người dùng \"{title}\" này?",
"createUser": "Tạo mới",
"creatingUser": "Đang tạo...",
"delete": "Xóa",
@@ -1763,7 +1766,11 @@
"title": "Quản lý tài khoản",
"userCreated": "Đã tạo!",
"userSaved": "Đã lưu!",
- "users": "Người dùng"
+ "users": "Người dùng",
+ "usersFound": "{count, plural, =0 {0 Users found} =1 {1 User found} other {# Users found}}",
+ "admin": "Admin",
+ "active": "Active",
+ "inactive": "Inactive"
},
"vectorstyler": {
"addrulebtn": "Thêm quy tắc",
@@ -2098,7 +2105,6 @@
"createContext": "Create context",
"createMapFromContext": "Create map from this context",
"viewResourceProperties": "Open properties",
- "editResourceProperties": "Edit properties",
"uploadImage": "Upload image",
"removeThumbnail": "Remove thumbnail",
"apply": "Apply",
@@ -2109,6 +2115,7 @@
"filterMapsByContext": "Maps by context",
"tags": "Tags",
"deleteResource": "Delete",
+ "editResource": "Edit",
"deleteResourceTitle": "Are you sure you want to delete this resource?",
"deleteResourceDescription": "This resource and all linked resources will be deleted",
"deleteResourceConfirm": "Delete",
diff --git a/web/client/translations/data.zh-ZH.json b/web/client/translations/data.zh-ZH.json
index 839f5ebaa94..04796bc88cd 100644
--- a/web/client/translations/data.zh-ZH.json
+++ b/web/client/translations/data.zh-ZH.json
@@ -975,11 +975,15 @@
"userCreated": "Created!",
"deleting": "Deleting...",
"delete": "Delete",
- "confirmDeleteUser": "Are you sure you want to delete this user?",
+ "confirmDeleteUser": "Are you sure you want to delete \"{title}\" user?",
"errorDelete": "There was an error deleting this user:",
"errorSaving": "There was an error saving the user:",
"selectedGroups": "SELECTED GROUPS",
- "requiredFiedsMessage": "Fields marked with asterisk (*) are required"
+ "requiredFiedsMessage": "Fields marked with asterisk (*) are required",
+ "usersFound": "{count, plural, =0 {0 Users found} =1 {1 User found} other {# Users found}}",
+ "admin": "Admin",
+ "active": "Active",
+ "inactive": "Inactive"
},
"usergroups": {
"searchGroups": "Search Groups...",
@@ -1004,7 +1008,10 @@
"noUsers": "No users for this group",
"errorSaving": "There was an error saving this group",
"errorDelete": "There was an error deleting this group",
- "confirmDeleteGroup": "Are you sure you want to delete this group?"
+ "confirmDeleteGroup": "Are you sure you want to delete this \"{title}\" group?",
+ "userGroupsFound": "{count, plural, =0 {0 Groups found} =1 {1 Group found} other {# Groups found}}",
+ "active": "Active",
+ "inactive": "Inactive"
},
"share": {
"title": "Share",
@@ -2043,7 +2050,6 @@
"createContext": "Create context",
"createMapFromContext": "Create map from this context",
"viewResourceProperties": "Open properties",
- "editResourceProperties": "Edit properties",
"uploadImage": "Upload image",
"removeThumbnail": "Remove thumbnail",
"apply": "Apply",
@@ -2054,6 +2060,7 @@
"filterMapsByContext": "Maps by context",
"tags": "Tags",
"deleteResource": "Delete",
+ "editResource": "Edit",
"deleteResourceTitle": "Are you sure you want to delete this resource?",
"deleteResourceDescription": "This resource and all linked resources will be deleted",
"deleteResourceConfirm": "Delete",