feat: impove attached files screen

axelor · Dec 17, 2024 · 087e9c0 · 087e9c0
1 parent c069c5a
commit 087e9c0
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 6 deletions.
diff --git a/changelogs/unreleased/88612_SearchTreeView.json b/changelogs/unreleased/88612_SearchTreeView.json
@@ -0,0 +1,5 @@
+{
+  "title": "SearchTreeView: add possibility to hide parent search bar",
+  "type": "feat",
+  "packages": "core"
+}
diff --git a/changelogs/unreleased/88612_TreeView.json b/changelogs/unreleased/88612_TreeView.json
@@ -0,0 +1,5 @@
+{
+  "title": "TreeView: add possibility to hide branch filter quick action",
+  "type": "feat",
+  "packages": "ui"
+}
diff --git a/packages/apps/dms/src/components/templates/DocumentList/DocumentList.tsx b/packages/apps/dms/src/components/templates/DocumentList/DocumentList.tsx
@@ -38,9 +38,13 @@ import {File} from '../../../types';
 
 interface DocumentListProps {
   defaultParent?: any;
+  isAttachedFilesList?: boolean;
 }
 
-const DocumentList = ({defaultParent}: DocumentListProps) => {
+const DocumentList = ({
+  defaultParent,
+  isAttachedFilesList = false,
+}: DocumentListProps) => {
   const I18n = useTranslator();
   const Colors = useThemeColor();
   const navigation = useNavigation();
@@ -152,6 +156,7 @@ const DocumentList = ({defaultParent}: DocumentListProps) => {
         }
         displayBreadcrumb
         defaultParent={defaultParent}
+        isParentSearchBarVisible={!isAttachedFilesList}
       />
     </Screen>
   );

diff --git a/packages/apps/dms/src/screens/AttachedFilesScreen.tsx b/packages/apps/dms/src/screens/AttachedFilesScreen.tsx
@@ -65,7 +65,9 @@ const AttachedFilesScreen = ({navigation, route}) => {
 
   return (
     <>
-      {!isVisible && <DocumentList defaultParent={parent} />}
+      {!isVisible && (
+        <DocumentList defaultParent={parent} isAttachedFilesList />
+      )}
       <Alert
         visible={isVisible}
         title={I18n.t('Dms_NoAttachedFiles')}

diff --git a/packages/core/src/components/templates/SearchTreeView/SearchTreeView.tsx b/packages/core/src/components/templates/SearchTreeView/SearchTreeView.tsx
@@ -70,6 +70,7 @@ interface SearchTreeViewProps {
   verticalActions?: boolean;
   displayBreadcrumb?: boolean;
   defaultParent?: any;
+  isParentSearchBarVisible?: boolean;
 }
 
 const SearchTreeView = ({
@@ -109,6 +110,7 @@ const SearchTreeView = ({
   verticalActions,
   displayBreadcrumb = false,
   defaultParent,
+  isParentSearchBarVisible = true,
 }: SearchTreeViewProps) => {
   const I18n = useTranslator();
   const dispatch = useDispatch();
@@ -252,7 +254,9 @@ const SearchTreeView = ({
         topChildren={
           <>
             {headerTopChildren}
-            {isHideableParentSearch && renderParentSearchBar()}
+            {isHideableParentSearch &&
+              isParentSearchBarVisible &&
+              renderParentSearchBar()}
           </>
         }
         fixedItems={
@@ -271,6 +275,7 @@ const SearchTreeView = ({
       {displayBreadcrumb && (
         <Breadcrumb
           style={styles.breadcrumb}
+          disabled={!isParentSearchBarVisible}
           items={parent.map((item, index) =>
             item === EMPTY_PARENT
               ? EMPTY_PARENT
@@ -295,6 +300,7 @@ const SearchTreeView = ({
         fetchBranchData={fetchBranchData}
         branchCondition={branchCondition}
         onBranchFilterPress={handleChangeParent}
+        isBranchFilterVisible={isParentSearchBarVisible}
         moreLoading={moreLoading}
         isListEnd={isListEnd}
         translator={I18n.t}

diff --git a/packages/ui/src/components/molecules/Breadcrumb/Breadcrumb.tsx b/packages/ui/src/components/molecules/Breadcrumb/Breadcrumb.tsx
@@ -32,11 +32,17 @@ interface Item {
 
 interface BreadcrumbProps {
   style?: any;
+  disabled?: boolean;
   items: Item[];
   onHomePress: () => void;
 }
 
-const Breadcrumb = ({style, items, onHomePress}: BreadcrumbProps) => {
+const Breadcrumb = ({
+  style,
+  disabled = false,
+  items,
+  onHomePress,
+}: BreadcrumbProps) => {
   const Colors = useThemeColor();
 
   const [visibleItems, setVisibleItems] = useState(items);
@@ -86,7 +92,11 @@ const Breadcrumb = ({style, items, onHomePress}: BreadcrumbProps) => {
     <View
       style={[styles.container, style]}
       onLayout={e => setContainerWidth(e?.nativeEvent?.layout?.width)}>
-      <Icon name="house-door-fill" touchable onPress={onHomePress} />
+      <Icon
+        name="house-door-fill"
+        touchable={!disabled}
+        onPress={onHomePress}
+      />
       {visibleItems.map((item, index) => (
         <View
           style={styles.contentContainer}
@@ -96,7 +106,7 @@ const Breadcrumb = ({style, items, onHomePress}: BreadcrumbProps) => {
           <TouchableOpacity
             style={styles.textContainer}
             activeOpacity={0.7}
-            disabled={!item.onPress}
+            disabled={disabled || !item.onPress}
             onPress={item.onPress}>
             <Text>{item.title}</Text>
           </TouchableOpacity>

diff --git a/packages/ui/src/components/templates/TreeView/Branch.tsx b/packages/ui/src/components/templates/TreeView/Branch.tsx
@@ -132,6 +132,7 @@ interface BranchProps {
   fetchBranchData: (idParent: number) => Promise<any>;
   branchCondition: (item: any) => boolean;
   onBranchFilterPress: (branch: any) => void;
+  isBranchFilterVisible?: boolean;
   translator: (translationKey: string) => string;
 }
 
@@ -148,6 +149,7 @@ const Branch = ({
   fetchBranchData,
   branchCondition,
   onBranchFilterPress,
+  isBranchFilterVisible,
   translator,
 }: BranchProps) => {
   const handleBranchPress = useCallback(() => {
@@ -194,6 +196,7 @@ const Branch = ({
         isOpen={isBranchOpen}
         parent={branch.item}
         onFilterPress={onBranchFilterPress}
+        isBranchFilterVisible={isBranchFilterVisible}
         infoButtonIndication={branchCardInfoButtonIndication}
         actionList={getBranchActions?.(branch)}
         translator={translator}

diff --git a/packages/ui/src/components/templates/TreeView/BranchCard.tsx b/packages/ui/src/components/templates/TreeView/BranchCard.tsx
@@ -64,6 +64,7 @@ interface BranchActionCardProps {
   isOpen: boolean;
   parent: any;
   onFilterPress: (branch: any) => void;
+  isBranchFilterVisible?: boolean;
   infoButtonIndication: string;
   actionList?: ActionCardType[];
   translator: (translationKey: string) => string;
@@ -75,6 +76,7 @@ const BranchActionCard = ({
   isOpen,
   parent,
   onFilterPress,
+  isBranchFilterVisible,
   infoButtonIndication,
   actionList = [],
   translator,
@@ -87,6 +89,7 @@ const BranchActionCard = ({
         helper: infoButtonIndication,
         large: true,
         onPress: () => onFilterPress(parent),
+        hidden: !isBranchFilterVisible,
       }}
       translator={translator}>
       <BranchCard onPress={onPress} children={children} isOpen={isOpen} />

diff --git a/packages/ui/src/components/templates/TreeView/TreeView.tsx b/packages/ui/src/components/templates/TreeView/TreeView.tsx
@@ -52,6 +52,7 @@ interface TreeViewProps {
    */
   branchCondition: (item: any) => boolean;
   onBranchFilterPress: (branch: any) => void;
+  isBranchFilterVisible?: boolean;
   moreLoading: boolean;
   isListEnd: boolean;
   filter?: boolean;
@@ -75,6 +76,7 @@ const TreeView = ({
   fetchBranchData,
   branchCondition,
   onBranchFilterPress,
+  isBranchFilterVisible = true,
   moreLoading = false,
   isListEnd = false,
   filter = false,
@@ -104,6 +106,7 @@ const TreeView = ({
         fetchBranchData={fetchBranchData}
         branchCondition={branchCondition}
         onBranchFilterPress={onBranchFilterPress}
+        isBranchFilterVisible={isBranchFilterVisible}
         translator={translator}
       />
     ) : (