Skip to content

Commit

Permalink
Some UI changes to the Share panel (#470)
Browse files Browse the repository at this point in the history
  • Loading branch information
@luorlandini
luorlandini authored Sep 7, 2021
1 parent a11f281 commit 500f68a
Show file tree
Hide file tree
Showing 9 changed files with 77 additions and 132 deletions.
124 changes: 64 additions & 60 deletions geonode_mapstore_client/client/js/components/Permissions/Permissions.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,68 @@ function Permissions({

return (
<div className="gn-share-permissions-container">

<ul className="gn-share-permissions-list">
<li className="gn-share-permissions-pinned">
{permissionsGroups
.map((group) => {
return (
<PermissionsRow
key={group.id}
{...group}
hideIcon
onChange={handleUpdateGroup.bind(null, group.id)}
name={<strong>{<Message msgId={`gnviewer.${group.name}`} />}</strong>}
options={groupOptions[group.name] || defaultGroupOptions}
/>
);
})}
</li>

{filteredEntries
.filter((item) => item.permissions !== 'owner' )
.map((entry, idx) => {
return (
<li
key={entry.id + '-' + idx}
>
<PermissionsRow
{...entry}
onChange={handleUpdateEntry.bind(null, entry.id)}
options={options}
>
{entry.permissions !== 'owner' &&
<>
{enableGeoLimits && <Popover
placement="left"
onOpen={(open) => {
if (open && !entry.features) {
handleRequestGeoLimits(entry);
}
}}
content={
<GeoLimits
key={entry.geoLimitsLoading}
layers={layers}
features={entry.features}
loading={entry.geoLimitsLoading}
onChange={(changes) => handleUpdateEntry(entry.id, { ...changes, isGeoLimitsChanged: true })}
onRefresh={handleRequestGeoLimits.bind(null, entry)}
/>
}>
<Button>
<FaIcon name="globe" />
</Button>
</Popover>}
<Button onClick={handleRemoveEntry.bind(null, entry)}>
<FaIcon name="trash" />
</Button>
</>}
</PermissionsRow>
</li>
);
})}
</ul>
<div className="gn-share-permissions-list-head">
<Popover
placement="bottom"
Expand Down Expand Up @@ -208,7 +270,7 @@ function Permissions({
</div>
</div>
}>
<Button size="sm">
<Button variant={'primary'} size="sm">
<FaIcon name="plus" />{' '}<Message msgId="gnviewer.addPermissionsEntry"/>
</Button>
</Popover>
Expand All @@ -222,6 +284,7 @@ function Permissions({
<FaIcon name="times"/>
</Button>}
</div>

<div className="gn-share-permissions-head">
<div className="gn-share-permissions-row">
<div className="gn-share-permissions-name">
Expand All @@ -239,65 +302,6 @@ function Permissions({
</div>
</div>
</div>
<ul className="gn-share-permissions-list">
<li className="gn-share-permissions-pinned">
{permissionsGroups
.map((group) => {
return (
<PermissionsRow
key={group.id}
{...group}
hideIcon
onChange={handleUpdateGroup.bind(null, group.id)}
name={<strong>{<Message msgId={`gnviewer.${group.name}`} />}</strong>}
options={groupOptions[group.name] || defaultGroupOptions}
/>
);
})}
</li>
{filteredEntries
.map((entry, idx) => {
return (
<li
key={entry.id + '-' + idx}
>
<PermissionsRow
{...entry}
onChange={handleUpdateEntry.bind(null, entry.id)}
options={options}
>
{entry.permissions !== 'owner' &&
<>
{enableGeoLimits && <Popover
placement="left"
onOpen={(open) => {
if (open && !entry.features) {
handleRequestGeoLimits(entry);
}
}}
content={
<GeoLimits
key={entry.geoLimitsLoading}
layers={layers}
features={entry.features}
loading={entry.geoLimitsLoading}
onChange={(changes) => handleUpdateEntry(entry.id, { ...changes, isGeoLimitsChanged: true })}
onRefresh={handleRequestGeoLimits.bind(null, entry)}
/>
}>
<Button>
<FaIcon name="globe" />
</Button>
</Popover>}
<Button onClick={handleRemoveEntry.bind(null, entry)}>
<FaIcon name="trash" />
</Button>
</>}
</PermissionsRow>
</li>
);
})}
</ul>
{(filteredEntries.length === 0) &&
<div className="gn-permissions-alert">
<Message msgId="gnviewer.permissionsEntriesNoResults" />
Expand Down
15 changes: 7 additions & 8 deletions geonode_mapstore_client/client/js/components/Permissions/PermissionsRow.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ function PermissionsRow({
clearable,
onChange
}) {

return (
<div
className="gn-share-permissions-row"
Expand All @@ -38,14 +39,12 @@ function PermissionsRow({
{children}
</div>
{!hideOptions && <div className="gn-share-permissions-options">
{permissions === 'owner'
? <Message msgId="gnviewer.permissionOwner" />
: <Select
clearable={clearable}
options={options.map(({ value, labelId }) => ({ value, label: <Message msgId={labelId} /> }))}
value={permissions}
onChange={(option) => onChange({ permissions: option?.value || '' })}
/>}
<Select
clearable={clearable}
options={options.map(({ value, labelId }) => ({ value, label: <Message msgId={labelId} /> }))}
value={permissions}
onChange={(option) => onChange({ permissions: option?.value || '' })}
/>
</div>}
</div>
);
Expand Down
11 changes: 1 addition & 10 deletions geonode_mapstore_client/client/js/plugins/Share.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import Permissions from '@js/components/Permissions';
import { getUsers, getGroups } from '@js/api/geonode/v2';
import { resourceToPermissionEntry } from '@js/utils/ResourceUtils';
import SharePageLink from '@js/plugins/share/SharePageLink';
import ShareEmbedLink from '@js/plugins/share/ShareEmbedLink';
import { getCurrentResourcePermissionsLoading } from '@js/selectors/resourceservice';

const entriesTabs = [
Expand Down Expand Up @@ -94,12 +93,9 @@ function Share({
canEdit,
permissionsGroupOptions,
permissionsDefaultGroupOptions,
permissionsLoading,
embedUrl
permissionsLoading
}) {

const shareUrl = embedUrl;

return (
<OverlayContainer
enabled={enabled}
Expand All @@ -116,12 +112,7 @@ function Share({
</div>
<div className="gn-share-panel-body">
<SharePageLink />
<div className="gn-share-panel-label"><label><Message msgId="gnviewer.embed" />:</label></div>
<ShareEmbedLink
shareUrl={shareUrl}
/>
{canEdit && <>
<div className="gn-share-panel-label"><label><Message msgId="gnviewer.permissions" />:</label></div>
<Permissions
compactPermissions={compactPermissions}
layers={layers} entriesTabs={entriesTabs}
Expand Down
49 changes: 0 additions & 49 deletions geonode_mapstore_client/client/js/plugins/share/ShareEmbedLink.jsx
View file

This file was deleted.

2 changes: 1 addition & 1 deletion geonode_mapstore_client/client/static/mapstore/translations/data.de-DE.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
"anonymous": "Jeder",
"registered-members": "Registrierte Mitglieder",
"permissionsEntriesNoResults": "Keine Ergebnisse...",
"shareThisResource": "Diese Ressource teilen",
"shareThisResource": "Mit Personen und Gruppen teilen",
"embed": "Einbetten",
"deleteResourceTitle": "{count, plural, =1 {Möchten Sie diese Ressource wirklich löschen?} other {Möchten Sie diese Ressourcen wirklich löschen?}}",
"deleteResourceNo": "{count, plural, =1 {Nein, nicht löschen} other {Nein, lösche sie nicht}}",
Expand Down
2 changes: 1 addition & 1 deletion geonode_mapstore_client/client/static/mapstore/translations/data.en-US.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
"anonymous": "Anyone",
"registered-members": "Registered members",
"permissionsEntriesNoResults": "No Results...",
"shareThisResource": "Share this resource",
"shareThisResource": "Share with people and groups",
"embed": "Embed",
"deleteResourceTitle": "{count, plural, =1 {Are you sure you want to delete this resource?} other {Are you sure you want to delete these resources?}}",
"deleteResourceNo": "{count, plural, =1 {No, don't delete it} other {No, don't delete them}}",
Expand Down
2 changes: 1 addition & 1 deletion geonode_mapstore_client/client/static/mapstore/translations/data.es-ES.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
"anonymous": "Cualquiera",
"registered-members": "Miembros registrados",
"permissionsEntriesNoResults": "Sin resultados ...",
"shareThisResource": "Comparte este recurso",
"shareThisResource": "Comparte con personas y grupos",
"embed": "Insertar",
"deleteResourceTitle": "{count, plural, =1 {¿Estás seguro de que deseas eliminar este recurso?} other {¿Está seguro de que desea eliminar estos recursos?}}",
"deleteResourceNo": "{count, plural, =1 {No, no lo borres} other {No, no los borres}}",
Expand Down
2 changes: 1 addition & 1 deletion geonode_mapstore_client/client/static/mapstore/translations/data.fr-FR.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
"anonymous": "Personne",
"registered-members": "Membres enregistrés",
"permissionsEntriesNoResults": "Aucun résultat...",
"shareThisResource": "Partager cette ressource",
"shareThisResource": "Partager avec des personnes et des groupes",
"embed": "Intégrer",
"deleteResourceTitle": "{count, plural, =1 {Voulez-vous vraiment supprimer cette ressource?} other {Voulez-vous vraiment supprimer ces ressources?}}",
"deleteResourceNo": "{count, plural, =1 {Non, ne le supprime pas} other {Non, ne les supprime pas}}",
Expand Down
2 changes: 1 addition & 1 deletion geonode_mapstore_client/client/static/mapstore/translations/data.it-IT.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
"anonymous": "Chiunque",
"registered-members": "Membri registrati",
"permissionsEntriesNoResults": "Nessun risultato...",
"shareThisResource": "Condividi questa risorsa",
"shareThisResource": "Condividi con utenti e gruppi",
"embed": "Incorpora",
"deleteResourceTitle": "{count, plural, =1 {Sei sicuro di voler eliminare questa risorsa?} other {Sei sicuro di voler eliminare queste risorse?}}",
"deleteResourceNo": "{count, plural, =1 {No, non eliminarlo} other {No, non eliminarli}}",
Expand Down

0 comments on commit 500f68a

Please sign in to comment.