Merge pull request #1142 from userlocalhost/bugfix/join_attr/enable_to_search_whole_items_using_join_attr_2

Fixed implementation to be able to grow advanced search result context

Author: hinashi

CHANGELOG.md

@@ -5,6 +5,9 @@
 ### Added
 
 ### Changed
+* Enable to get search advanced_search results sequentially and check its progres
+  when join_attr parameter is specified.
+  Contributed by @userlocalhost, @hinashi
 
 ### Fixed
 

apiclient/typescript-fetch/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dmm-com/airone-apiclient-typescript-fetch",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "description": "AirOne APIv2 client in TypeScript",
   "main": "src/autogenerated/index.ts",
   "scripts": {

entry/api_v2/serializers.py

@@ -1162,6 +1162,7 @@ class AdvancedSearchResultValueSerializer(serializers.Serializer):
 class AdvancedSearchResultSerializer(serializers.Serializer):
     count = serializers.IntegerField()
     values = AdvancedSearchResultValueSerializer(many=True)
+    total_count = serializers.IntegerField()
 
 
 class AdvancedSearchResultExportSerializer(serializers.Serializer):

entry/api_v2/views.py

@@ -373,6 +373,8 @@ def _get_ref_id_from_es_result(attrinfo):
             is_output_all,
             offset=entry_offset,
         )
+        # save total population number
+        total_count = deepcopy(resp["ret_count"])
 
         for join_attr in join_attrs:
             (will_filter_by_joined_attr, joined_resp) = _get_joined_resp(
@@ -501,7 +503,11 @@ def _get_typed_value(type: int) -> str:
                     ]
 
         serializer = AdvancedSearchResultSerializer(
-            data={"count": resp["ret_count"], "values": resp["ret_values"]}
+            data={
+                "count": resp["ret_count"],
+                "values": resp["ret_values"],
+                "total_count": total_count,
+            }
         )
 
         # TODO validate response data strictly, like below.

entry/tests/test_api_v2.py

@@ -2990,6 +2990,7 @@ def test_advanced_search(self):
             resp.json(),
             {
                 "count": 2,
+                "total_count": 2,
                 "values": [
                     {
                         "entity": {"id": self.entity.id, "name": "test-entity"},

frontend/src/components/entry/AdvancedSearchJoinModal.tsx

@@ -17,6 +17,7 @@ interface Props {
   targetAttrname: string;
   joinAttrs: AdvancedSearchJoinAttrInfo[];
   handleClose: () => void;
+  setSearchResults: (isJoinSearching: boolean) => void;
 }
 
 export const AdvancedSearchJoinModal: FC<Props> = ({
@@ -25,6 +26,7 @@ export const AdvancedSearchJoinModal: FC<Props> = ({
   targetAttrname,
   joinAttrs,
   handleClose,
+  setSearchResults,
 }) => {
   const history = useHistory();
   // This is join attributes that have been already been selected before.
@@ -67,6 +69,9 @@ export const AdvancedSearchJoinModal: FC<Props> = ({
       joinAttrs: newJoinAttrs,
     });
 
+    // update page by changing joined Attribute filter condition
+    setSearchResults(true);
+
     // Update Page URL parameters
     history.push({
       pathname: location.pathname,

frontend/src/components/entry/SearchResults.test.tsx

@@ -15,6 +15,7 @@ test("should render a component with essential props", function () {
         results={{
           count: 0,
           values: [],
+          totalCount: 0,
         }}
         page={1}
         changePage={() => {
@@ -27,7 +28,9 @@ test("should render a component with essential props", function () {
         hasReferral={false}
         entityIds={[]}
         joinAttrs={[]}
+        disablePaginationFooter={false}
         searchAllEntities={false}
+        setSearchResults={() => {}}
       />,
       { wrapper: TestWrapper }
     )

frontend/src/components/entry/SearchResults.tsx

@@ -61,6 +61,8 @@ interface Props {
   entityIds: number[];
   searchAllEntities: boolean;
   joinAttrs: AdvancedSearchJoinAttrInfo[];
+  disablePaginationFooter: boolean;
+  setSearchResults: () => void;
 }
 
 export const SearchResults: FC<Props> = ({
@@ -76,6 +78,8 @@ export const SearchResults: FC<Props> = ({
   entityIds,
   searchAllEntities,
   joinAttrs,
+  disablePaginationFooter,
+  setSearchResults,
 }) => {
   // NOTE attrTypes are guessed by the first element on the results. So if it has no appropriate attr,
   // the type guess doesn't work well. We should improve attr type API if more accurate type is needed.
@@ -104,6 +108,7 @@ export const SearchResults: FC<Props> = ({
               entityIds={entityIds}
               searchAllEntities={searchAllEntities}
               joinAttrs={joinAttrs}
+              setSearchResults={setSearchResults}
             />
             <TableBody>
               {results.values?.map((result) => (
@@ -169,12 +174,14 @@ export const SearchResults: FC<Props> = ({
           </Table>
         </TableContainer>
 
-        <PaginationFooter
-          count={results.count}
-          maxRowCount={AdvancedSerarchResultList.MAX_ROW_COUNT}
-          page={page}
-          changePage={changePage}
-        />
+        {!disablePaginationFooter && (
+          <PaginationFooter
+            count={results.count}
+            maxRowCount={AdvancedSerarchResultList.MAX_ROW_COUNT}
+            page={page}
+            changePage={changePage}
+          />
+        )}
       </StyledBox>
     </Box>
   );

frontend/src/components/entry/SearchResultsTableHead.tsx

@@ -1,6 +1,5 @@
 import {
   AdvancedSearchJoinAttrInfo,
-  AdvancedSearchResultAttrInfoFilterKeyEnum,
   EntryAttributeTypeTypeEnum,
 } from "@dmm-com/airone-apiclient-typescript-fetch";
 import AddIcon from "@mui/icons-material/Add";
@@ -23,6 +22,7 @@ import { SearchResultControlMenu } from "./SearchResultControlMenu";
 import { SearchResultControlMenuForEntry } from "./SearchResultControlMenuForEntry";
 import { SearchResultControlMenuForReferral } from "./SearchResultControlMenuForReferral";
 
+import { getIsFiltered } from "pages/AdvancedSearchResultsPage";
 import {
   AttrFilter,
   AttrsFilter,
@@ -53,6 +53,7 @@ interface Props {
   entityIds: number[];
   searchAllEntities: boolean;
   joinAttrs: AdvancedSearchJoinAttrInfo[];
+  setSearchResults: (isJoinSearching: boolean) => void;
 }
 
 export const SearchResultsTableHead: FC<Props> = ({
@@ -64,6 +65,7 @@ export const SearchResultsTableHead: FC<Props> = ({
   entityIds,
   searchAllEntities,
   joinAttrs,
+  setSearchResults,
 }) => {
   const location = useLocation();
   const history = useHistory();
@@ -105,17 +107,10 @@ export const SearchResultsTableHead: FC<Props> = ({
       Object.fromEntries(
         Object.keys(defaultAttrsFilter ?? {}).map((attrName: string) => {
           const attrFilter = defaultAttrsFilter[attrName];
-          switch (attrFilter?.filterKey) {
-            case AdvancedSearchResultAttrInfoFilterKeyEnum.EMPTY:
-            case AdvancedSearchResultAttrInfoFilterKeyEnum.NON_EMPTY:
-            case AdvancedSearchResultAttrInfoFilterKeyEnum.DUPLICATED:
-              return [attrName, true];
-            case AdvancedSearchResultAttrInfoFilterKeyEnum.TEXT_CONTAINED:
-              return [attrName, attrFilter.keyword !== ""];
-            case AdvancedSearchResultAttrInfoFilterKeyEnum.TEXT_NOT_CONTAINED:
-              return [attrName, attrFilter.keyword !== ""];
-          }
-          return [attrName, false];
+          return [
+            attrName,
+            getIsFiltered(attrFilter.filterKey, attrFilter.keyword),
+          ];
         })
       ),
     [defaultAttrsFilter]
@@ -159,6 +154,9 @@ export const SearchResultsTableHead: FC<Props> = ({
           .filter((v, i, a) => a.findIndex((t) => t.name === v.name) === i),
       });
 
+      setSearchResults(
+        getIsFiltered(attrFilter?.filterKey, attrFilter?.keyword)
+      );
       // simply reload with the new params
       history.push({
         pathname: location.pathname,
@@ -216,6 +214,14 @@ export const SearchResultsTableHead: FC<Props> = ({
                   targetAttrname={joinAttrName}
                   joinAttrs={joinAttrs}
                   handleClose={() => setJoinAttrname("")}
+                  setSearchResults={() =>
+                    setSearchResults(
+                      getIsFiltered(
+                        attrsFilter[attrName].filterKey,
+                        attrsFilter[attrName].keyword
+                      )
+                    )
+                  }
                 />
               )}
               <StyledIconButton

frontend/src/pages/AdvancedSearchResultsPage.test.tsx

@@ -63,6 +63,7 @@ test("should match snapshot", async () => {
       Promise.resolve({
         count: 1,
         values: results,
+        totalCount: 1,
       })
     );
   jest