feat: hide settings folder

SenseNet · May 12, 2024 · 68cc155 · 68cc155
1 parent 28179b2
commit 68cc155
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/apps/sensenet/src/components/content-list/content-list.tsx b/apps/sensenet/src/components/content-list/content-list.tsx
@@ -268,7 +268,7 @@ export const ContentList = <T extends GenericContent = GenericContent>(props: Co
         }, []),
       ],
       orderby: [[currentOrder as any, currentDirection as any]],
-      filter: !userPersonalSettings.showHiddenItems ? SETTINGS_FOLDER_FILTER : '',
+      filter: !userPersonalSettings.showHiddenItems ? `(${SETTINGS_FOLDER_FILTER})` : '',
     })
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [

diff --git a/apps/sensenet/src/components/tree/tree-with-data.tsx b/apps/sensenet/src/components/tree/tree-with-data.tsx
@@ -18,7 +18,7 @@ type TreeWithDataProps = {
 let lastRequest: { path: string; lastIndex: number } | undefined
 
 const ITEM_THRESHOLD = 50
-export const SETTINGS_FOLDER_FILTER = `not (Name eq 'Settings')`
+export const SETTINGS_FOLDER_FILTER = `not ((Name eq 'Settings') and (isOf('SystemFolder')))`
 
 const walkTree = (node: ItemType, callBack: (node: ItemType) => void) => {
   if (node?.children?.length) {

diff --git a/apps/sensenet/src/components/view-controls/common/view-title.tsx b/apps/sensenet/src/components/view-controls/common/view-title.tsx
@@ -37,7 +37,9 @@ const useStyles = makeStyles(() => {
       color: 'grey',
       marginLeft: '5px',
     },
-
+    actionText: {
+      marginRight: '5px',
+    },
     viewTitle: {
       '& span': {
         display: 'inline-block',
@@ -76,7 +78,8 @@ export const ViewTitle: React.FunctionComponent<ViewTitleProps> = (props) => {
   return (
     <div className={clsx(classes.title, globalClasses.centered)}>
       <div data-test="viewtitle" className={classes.viewTitle}>
-        {props.title} <span className={classes.textBolder}>{props.titleBold}</span>
+        <span className={classes.actionText}>{props.title}</span>
+        <span className={classes.textBolder}>{props.titleBold}</span>
         <span className={classes.typeinfo}>({props.content!.Type})</span>
       </div>
       <div className={classes.actionBar}>