Merge branch 'develop' into feature/Shortcut-panel-in-reference-picker

SenseNet · Nov 14, 2023 · 9cd7964 · 9cd7964
2 parents 9c1c8b6 + e219923
commit 9cd7964
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 25 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/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/password.tsx b/packages/sn-controls-react/src/fieldcontrols/password.tsx
@@ -48,13 +48,14 @@ export const Password: React.FC<ReactClientFieldSetting> = (props) => {
     case 'new':
       return (
         <FormControl fullWidth={true} className={classes.root}>
-          <InputLabel htmlFor={props.settings.Name}>{props.settings.DisplayName}</InputLabel>
+          <InputLabel htmlFor={props.settings.Name} shrink={true}>
+            {props.settings.DisplayName}
+          </InputLabel>
           <Input
             autoComplete="new-password"
             type={showPassword ? 'text' : 'password'}
             name={props.settings.Name}
             id={props.settings.Name}
-            placeholder={props.settings.DisplayName}
             required={props.settings.Compulsory}
             disabled={props.settings.ReadOnly}
             onChange={handleChange}

diff --git a/packages/sn-controls-react/test/__snapshots__/password.test.tsx.snap b/packages/sn-controls-react/test/__snapshots__/password.test.tsx.snap
@@ -7,6 +7,7 @@ exports[`Password field control should set all the props 1`] = `
 >
   <WithStyles(ForwardRef(InputLabel))
     htmlFor="Password"
+    shrink={true}
   >
     Password
   </WithStyles(ForwardRef(InputLabel))>
@@ -31,7 +32,6 @@ exports[`Password field control should set all the props 1`] = `
     id="Password"
     name="Password"
     onChange={[Function]}
-    placeholder="Password"
     required={true}
     type="password"
     value=""

diff --git a/packages/sn-controls-react/test/password.test.tsx b/packages/sn-controls-react/test/password.test.tsx
@@ -35,7 +35,6 @@ describe('Password field control', () => {
     expect(wrapper.find(InputLabel).text()).toBe(defaultSettings.DisplayName)
     expect(wrapper.find(Input).prop('name')).toBe(defaultSettings.Name)
     expect(wrapper.find(Input).prop('id')).toBe(defaultSettings.Name)
-    expect(wrapper.find(Input).prop('placeholder')).toBe(defaultSettings.DisplayName)
     expect(wrapper.find(Input).prop('required')).toBeTruthy()
     expect(wrapper.find(Input).prop('disabled')).toBeTruthy()
     expect(wrapper.find(FormHelperText).text()).toBe(defaultSettings.Description)