Merge branch 'develop' into fix/password-title

SenseNet · Nov 14, 2023 · f05d9a7 · f05d9a7
2 parents e7256c6 + e45ac59
commit f05d9a7
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 22 deletions.
diff --git a/apps/sensenet/src/components/appbar/desktop-nav-menu.tsx b/apps/sensenet/src/components/appbar/desktop-nav-menu.tsx
@@ -2,7 +2,6 @@ import { Grid, IconButton, ListItemIcon, ListItemText, MenuItem, MenuList, Paper
 import ClickAwayListener from '@material-ui/core/ClickAwayListener'
 import { createStyles, makeStyles, Theme, useTheme } from '@material-ui/core/styles'
 import KeyboardArrowDown from '@material-ui/icons/KeyboardArrowDown'
-import Notifications from '@material-ui/icons/Notifications'
 import { Switch } from '@sensenet/controls-react'
 import { useInjector, useRepository } from '@sensenet/hooks-react'
 import { clsx } from 'clsx'
@@ -102,13 +101,6 @@ export const DesktopNavMenu: FunctionComponent = () => {
 
   return (
     <div className={clsx(globalClasses.centered, classes.navMenu)}>
-      <IconButton
-        id="olvy-trigger"
-        aria-label={localization.topMenu.openNewMenu}
-        className={classes.iconButton}
-        style={{ marginRight: '16px' }}>
-        <Notifications className={classes.icon} />
-      </IconButton>
       <>
         <UserAvatar
           user={currentUser}

diff --git a/apps/sensenet/src/components/settings/index.tsx b/apps/sensenet/src/components/settings/index.tsx
@@ -77,11 +77,6 @@ export const Settings: React.FunctionComponent = () => {
       displayName: localizationDrawer.titles.Webhooks,
       url: resolvePathParams({ path: PATHS.settings.appPath, params: { submenu: 'webhooks' } }),
     },
-    {
-      name: 'adminui',
-      displayName: localizationDrawer.titles.AdminUiCustomization,
-      url: resolvePathParams({ path: PATHS.settings.appPath, params: { submenu: 'adminui' } }),
-    },
   ]
 
   const renderContent = () => {

diff --git a/apps/sensenet/src/components/tree/tree.tsx b/apps/sensenet/src/components/tree/tree.tsx
@@ -159,7 +159,7 @@ export function Tree({ treeData, itemCount, onItemClick, loadMore, isLoading, ac
       )
     }
     return (
-      <MuiList key={key} style={style}>
+      <MuiList key={key} style={{ display: 'flex', paddingTop: '0px', paddingBottom: '0px', flexDirection: 'column' }}>
         {renderItem(treeData.children?.[index], index.toString(), 10)}
       </MuiList>
     )
@@ -189,6 +189,7 @@ export function Tree({ treeData, itemCount, onItemClick, loadMore, isLoading, ac
               }
               setElements([...loadMoreElements])
             }}
+            containerStyle={{ overflow: 'initial' }}
             rowRenderer={rowRenderer}
             rowCount={itemCount}
             style={{ outline: 'none' }}

diff --git a/apps/sensenet/src/services/CommandProviders/NavigationCommandProvider.ts b/apps/sensenet/src/services/CommandProviders/NavigationCommandProvider.ts
@@ -39,14 +39,6 @@ export class NavigationCommandProvider implements CommandProvider {
         keywords: 'saved query search find',
         hits: [term],
       },
-      {
-        primaryText: this.localizationValues.eventsPrimary,
-        url: resolvePathParams({ path: PATHS.events.appPath }),
-        secondaryText: this.localizationValues.eventsSecondary,
-        content: { Icon: 'EventLog' } as any,
-        keywords: 'event events error warning log logs',
-        hits: [term],
-      },
     ]
   }
 

diff --git a/packages/sn-controls-react/src/fieldcontrols/reference-grid/reference-grid.tsx b/packages/sn-controls-react/src/fieldcontrols/reference-grid/reference-grid.tsx
@@ -7,6 +7,7 @@ import {
   FormHelperText,
   InputLabel,
   List,
+  TextField,
   Typography,
 } from '@material-ui/core'
 import { deepMerge, PathHelper } from '@sensenet/client-utils'
@@ -183,6 +184,14 @@ export const ReferenceGrid: React.FC<ReferenceGridProps> = (props) => {
     case 'edit':
       return (
         <FormControl style={styles.root as any} component={'fieldset' as 'div'} required={props.settings.Compulsory}>
+          <TextField
+            name={props.content?.Name}
+            autoComplete="off"
+            value={fieldValue.length === 0 ? '' : 'selected'}
+            required={props.settings.Compulsory}
+            style={{ opacity: '0', pointerEvents: 'none', height: '0px' }}
+          />
+
           <InputLabel shrink={true} htmlFor={props.settings.Name}>
             {props.settings.DisplayName}
           </InputLabel>

diff --git a/packages/sn-controls-react/src/viewcontrols/edit-view.tsx b/packages/sn-controls-react/src/viewcontrols/edit-view.tsx
@@ -177,6 +177,7 @@ export const EditView: React.FC<EditViewProps> = (props) => {
         <Button
           aria-label={props.localization?.submit || 'Submit'}
           type="submit"
+          data-test="submit"
           form={`edit-form-${uniqueId}`}
           variant="contained"
           color="primary">