Fix geosolutions-it#10776 Review the open properties icon and the ord…

…er of item in the viewer navbar
allyoucanmap · Feb 20, 2025 · 864d1ac · 864d1ac
1 parent d4883a9
commit 864d1ac
Show file tree

Hide file tree

Showing 15 changed files with 853 additions and 765 deletions.
diff --git a/web/client/plugins/ResourcesCatalog/BrandNavbar.jsx b/web/client/plugins/ResourcesCatalog/BrandNavbar.jsx
@@ -178,9 +178,9 @@ function BrandNavbar({
                     variant={variant}
                     menuItemComponent={BrandNavbarMenuItem}
                     items={[
-                        ...leftMenuItems,
+                        ...leftMenuItems.map((menuItem, idx) => ({ ...menuItem, position: idx + 1 })),
                         ...pluginLeftMenuItems
-                    ]}
+                    ].sort((a, b) => a.position - b.position)}
                 />
                 <Menu
                     centerChildrenVertically
@@ -190,9 +190,9 @@ function BrandNavbar({
                     size={size}
                     menuItemComponent={BrandNavbarMenuItem}
                     items={[
-                        ...rightMenuItems,
+                        ...rightMenuItems.map((menuItem, idx) => ({ ...menuItem, position: idx + 1 })),
                         ...pluginRightMenuItems
-                    ]}
+                    ].sort((a, b) => a.position - b.position)}
                 />
             </FlexBox>
         </>

diff --git a/web/client/plugins/ResourcesCatalog/DeleteResource.jsx b/web/client/plugins/ResourcesCatalog/DeleteResource.jsx
@@ -114,7 +114,7 @@ export default createPlugin('DeleteResource', {
             Component: DeleteResourcePlugin
         },
         BrandNavbar: {
-            target: 'right-menu',
+            target: 'left-menu',
             position: 4,
             priority: 3,
             Component: DeleteResourcePlugin

diff --git a/web/client/plugins/ResourcesCatalog/ResourceDetails.jsx b/web/client/plugins/ResourcesCatalog/ResourceDetails.jsx
@@ -348,10 +348,7 @@ function BrandNavbarDetailsButton({
     };
     const { title } = getResourceTypesInfo(resource || selectedResource);
     return (
-        <FlexBox centerChildrenVertically gap="xs">
-            <Text ellipsis>
-                {title}
-            </Text>
+        <FlexBox component="li" centerChildrenVertically gap="xs">
             <ButtonWithTooltip
                 active={show}
                 square
@@ -365,8 +362,11 @@ function BrandNavbarDetailsButton({
                 }}
                 borderTransparent
             >
-                <Icon glyph="file-code-o" />
+                <Icon glyph="details" type="glyphicon" />
             </ButtonWithTooltip>
+            <Text ellipsis>
+                {title}
+            </Text>
         </FlexBox>
     );
 }
@@ -376,10 +376,10 @@ export default createPlugin('ResourceDetails', {
     containers: {
         BrandNavbar: {
             priority: 1,
-            target: 'right-menu',
+            target: 'left-menu',
             Component: resourceDetailsConnect(BrandNavbarDetailsButton),
             doNotHide: true,
-            position: 1
+            position: 5
         },
         ResourcesGrid: {
             priority: 2,
@@ -404,7 +404,8 @@ export default createPlugin('ResourceDetails', {
                 return (
                     <Component
                         onClick={handleClick}
-                        glyph="file-code-o"
+                        glyph="details"
+                        iconType="glyphicon"
                         square
                         labelId="resourcesCatalog.viewResourceProperties"
                     />

diff --git a/web/client/plugins/ResourcesCatalog/Save.jsx b/web/client/plugins/ResourcesCatalog/Save.jsx
@@ -179,7 +179,7 @@ export default createPlugin('Save', {
     component: ConnectedPendingStatePrompt,
     containers: {
         BrandNavbar: {
-            target: 'right-menu',
+            target: 'left-menu',
             position: 2,
             priority: 3,
             Component: SavePlugin,

diff --git a/web/client/plugins/ResourcesCatalog/SaveAs.jsx b/web/client/plugins/ResourcesCatalog/SaveAs.jsx
@@ -219,7 +219,7 @@ export default createPlugin('SaveAs', {
     component: () => null,
     containers: {
         BrandNavbar: {
-            target: 'right-menu',
+            target: 'left-menu',
             position: 3,
             priority: 3,
             Component: SaveAsPlugin

diff --git a/web/client/plugins/ResourcesCatalog/components/ResourcesMenu.jsx b/web/client/plugins/ResourcesCatalog/components/ResourcesMenu.jsx
@@ -217,7 +217,7 @@ const ResourcesMenu = forwardRef(({
                     onClick={handleToggleCardLayoutStyle}
                     square
                 >
-                    <Icon glyph={cardLayoutStyle === 'grid' ? 'list' : 'th'} />
+                    <Icon glyph={cardLayoutStyle === 'grid' ? 'th-list' : 'th'} type="glyphicon"/>
                 </Button>}
                 {orderAlign === 'right' ? orderButtonNode : null}
             </FlexBox>

diff --git a/web/client/plugins/tocitemssettings/defaultSettingsTabs.js b/web/client/plugins/tocitemssettings/defaultSettingsTabs.js
@@ -160,7 +160,7 @@ export default ({ showFeatureInfoTab = true, loadedPlugins, items, onToggleStyle
             id: 'fields',
             titleId: 'layerProperties.fields.title',
             tooltipId: 'layerProperties.fields.tooltip',
-            glyph: 'th-list',
+            glyph: 'list',
             visible: isLayerNode(props) && hasFields(props?.element),
             Component: Fields
         },