merge master to 13.0

haiwen · Feb 17, 2025 · 2116209 · 2116209
2 parents df2d8de + e85866b
commit 2116209
Show file tree

Hide file tree

Showing 39 changed files with 343 additions and 138 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/src/components/toolbar/single-dropdown-toolbar.js b/frontend/src/components/toolbar/single-dropdown-toolbar.js
@@ -1,10 +1,11 @@
-import React, { Fragment } from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
 import { Dropdown, DropdownToggle, DropdownMenu, DropdownItem } from 'reactstrap';
 
 import '../../css/single-dropdown-toolbar.css';
 
 const propTypes = {
+  withPlusIcon: PropTypes.bool,
   opList: PropTypes.array.isRequired
 };
 
@@ -37,36 +38,32 @@ class SingleDropdownToolbar extends React.Component {
     const { opList, withPlusIcon = false } = this.props;
 
     return (
-      <Fragment>
-        <Dropdown isOpen={this.state.isDropdownMenuOpen} toggle={this.toggleDropdownMenu}>
-          <DropdownToggle
-            tag="span"
-            role="button"
-            className={withPlusIcon ? 'ml-2 sf-dropdown-combined-toggle' : 'ml-1 sf-dropdown-toggle'}
-            onClick={this.toggleDropdownMenu}
-            onKeyDown={this.onDropdownToggleKeyDown}
-            data-toggle="dropdown"
-          >
-            {withPlusIcon
-              ? (<><i className="sf3-font-new sf3-font main-icon"></i><i className="sf3-font-down sf3-font"></i></>)
-              : <i className="sf3-font-down sf3-font"></i>
+      <Dropdown isOpen={this.state.isDropdownMenuOpen} toggle={this.toggleDropdownMenu} direction="down">
+        <DropdownToggle
+          tag="span"
+          role="button"
+          className={withPlusIcon ? 'ml-2 sf-dropdown-combined-toggle' : 'ml-1 sf-dropdown-toggle'}
+          onClick={this.toggleDropdownMenu}
+          onKeyDown={this.onDropdownToggleKeyDown}
+          data-toggle="dropdown"
+        >
+          {withPlusIcon && <i className="sf3-font-new sf3-font main-icon"></i>}
+          <i className="sf3-font-down sf3-font"></i>
+        </DropdownToggle>
+        <DropdownMenu positionFixed={true}>
+          {opList.map((item, index) => {
+            if (item == 'Divider') {
+              return <DropdownItem key={index} divider />;
+            } else {
+              return (
+                <DropdownItem key={index} onClick={item.onClick} onKeyDown={this.onMenuItemKeyDown.bind(this, item)}>
+                  {item.text}
+                </DropdownItem>
+              );
             }
-          </DropdownToggle>
-          <DropdownMenu>
-            {opList.map((item, index) => {
-              if (item == 'Divider') {
-                return <DropdownItem key={index} divider />;
-              } else {
-                return (
-                  <DropdownItem key={index} onClick={item.onClick} onKeyDown={this.onMenuItemKeyDown.bind(this, item)}>
-                    {item.text}
-                  </DropdownItem>
-                );
-              }
-            })}
-          </DropdownMenu>
-        </Dropdown>
-      </Fragment>
+          })}
+        </DropdownMenu>
+      </Dropdown>
     );
   }
 }

diff --git a/frontend/src/css/layout.css b/frontend/src/css/layout.css
@@ -334,12 +334,6 @@ img[src=""],img:not([src]) { /* for first loading img*/
   color: #444;
 }
 
-.path-container .add-wiki-dropdown .sf3-font-down {
-  color: #999;
-  cursor: pointer;
-  font-size: 12px;
-}
-
 .dir-tool>div {
   margin-left: 8px;
 }

diff --git a/frontend/src/metadata/api.js b/frontend/src/metadata/api.js
@@ -369,6 +369,14 @@ class MetadataManagerAPI {
     return this.req.post(url, params);
   };
 
+  setPeoplePhoto = (repoID, peopleId, recordId) => {
+    const url = this.server + '/api/v2.1/repos/' + repoID + '/metadata/people-cover-photo/' + peopleId + '/';
+    const params = {
+      record_id: recordId
+    };
+    return this.req.put(url, params);
+  };
+
   // ocr
   openOCR = (repoID) => {
     const url = this.server + '/api/v2.1/repos/' + repoID + '/metadata/ocr/';

diff --git a/frontend/src/metadata/context.js b/frontend/src/metadata/context.js
@@ -179,6 +179,14 @@ class Context {
     return viewId === FACE_RECOGNITION_VIEW_ID;
   };
 
+  canSetPeoplePhoto = () => {
+    const viewId = this.getSetting('viewID');
+    if (this.permission === 'r' || viewId !== FACE_RECOGNITION_VIEW_ID) {
+      return false;
+    }
+    return true;
+  };
+
   restoreRows = () => {
     // todo
   };
@@ -282,6 +290,11 @@ class Context {
     return this.metadataAPI.removePeoplePhotos(repoID, recordId, photoIds);
   };
 
+  setPeoplePhoto = (recordId, photoId) => {
+    const repoID = this.settings['repoID'];
+    return this.metadataAPI.setPeoplePhoto(repoID, recordId, photoId);
+  };
+
   // file tag
   updateFileTags = (data) => {
     const repoID = this.settings['repoID'];

diff --git a/frontend/src/metadata/store/index.js b/frontend/src/metadata/store/index.js
@@ -622,6 +622,14 @@ class Store {
     this.applyOperation(operation);
   };
 
+  setPeoplePhoto = (peopleId, selectedPhoto) => {
+    const type = OPERATION_TYPE.SET_PEOPLE_COVER_PHOTO;
+    const operation = this.createOperation({
+      type, repo_id: this.repoId, people_id: peopleId, selected_photo: selectedPhoto
+    });
+    this.applyOperation(operation);
+  };
+
   // tag
   updateFileTags = (data) => {
     const type = OPERATION_TYPE.UPDATE_FILE_TAGS;

diff --git a/frontend/src/metadata/store/operations/constants.js b/frontend/src/metadata/store/operations/constants.js
@@ -32,6 +32,7 @@ export const OPERATION_TYPE = {
   DELETE_PEOPLE_PHOTOS: 'delete_people_photos',
   REMOVE_PEOPLE_PHOTOS: 'remove_people_photos',
   ADD_PEOPLE_PHOTOS: 'add_people_photos',
+  SET_PEOPLE_COVER_PHOTO: 'set_people_cover_photo',
 
   // tag
   UPDATE_FILE_TAGS: 'update_file_tags',
@@ -72,6 +73,7 @@ export const OPERATION_ATTRIBUTES = {
   [OPERATION_TYPE.DELETE_PEOPLE_PHOTOS]: ['repo_id', 'people_id', 'deleted_photos'],
   [OPERATION_TYPE.REMOVE_PEOPLE_PHOTOS]: ['repo_id', 'people_id', 'removed_photos', 'success_callback'],
   [OPERATION_TYPE.ADD_PEOPLE_PHOTOS]: ['repo_id', 'people_id', 'old_people_id', 'added_photos', 'success_callback'],
+  [OPERATION_TYPE.SET_PEOPLE_COVER_PHOTO]: ['repo_id', 'people_id', 'selected_photo'],
 
   [OPERATION_TYPE.MODIFY_SETTINGS]: ['repo_id', 'view_id', 'settings'],
 

diff --git a/frontend/src/metadata/store/server-operator.js b/frontend/src/metadata/store/server-operator.js
@@ -234,6 +234,15 @@ class ServerOperator {
         });
         break;
       }
+      case OPERATION_TYPE.SET_PEOPLE_COVER_PHOTO: {
+        const { people_id, selected_photo } = operation;
+        window.sfMetadataContext.setPeoplePhoto(people_id, selected_photo).then(res => {
+          callback({ operation });
+        }).catch(error => {
+          callback({ error: gettext('Failed to set people cover photo') });
+        });
+        break;
+      }
 
       // tags
       case OPERATION_TYPE.UPDATE_FILE_TAGS: {

diff --git a/frontend/src/metadata/views/face-recognition/index.js b/frontend/src/metadata/views/face-recognition/index.js
@@ -31,6 +31,10 @@ const FaceRecognition = () => {
     store.removePeoplePhotos(peopleId, peoplePhotos, { success_callback });
   }, [store]);
 
+  const onSetPeoplePhoto = useCallback((peopleId, peoplePhoto) => {
+    store.setPeoplePhoto(peopleId, peoplePhoto);
+  }, [store]);
+
   const openPeople = useCallback((people) => {
     peopleRef.current = people;
     const name = people._is_someone ? (people._name || gettext('Person image')) : gettext('Unknown people');
@@ -64,6 +68,7 @@ const FaceRecognition = () => {
           onAddPeoplePhotos={onAddPeoplePhotos}
           onRemovePeoplePhotos={onRemovePeoplePhotos}
           onDeletePeoplePhotos={onDeletePeoplePhotos}
+          onSetPeoplePhoto={onSetPeoplePhoto}
         />
       ) : (
         <Peoples peoples={peoples} onRename={onRename} onOpenPeople={openPeople} />

diff --git a/frontend/src/metadata/views/face-recognition/person-photos/index.js b/frontend/src/metadata/views/face-recognition/person-photos/index.js
@@ -22,7 +22,7 @@ import '../../gallery/index.css';
 
 dayjs.extend(utc);
 
-const PeoplePhotos = ({ view, people, onClose, onDeletePeoplePhotos, onAddPeoplePhotos, onRemovePeoplePhotos }) => {
+const PeoplePhotos = ({ view, people, onClose, onDeletePeoplePhotos, onAddPeoplePhotos, onSetPeoplePhoto, onRemovePeoplePhotos }) => {
   const [isLoading, setLoading] = useState(true);
   const [isLoadingMore, setLoadingMore] = useState(false);
   const [metadata, setMetadata] = useState({ rows: [] });
@@ -148,6 +148,11 @@ const PeoplePhotos = ({ view, people, onClose, onDeletePeoplePhotos, onAddPeople
     });
   }, [people, onAddPeoplePhotos, deletedByIds]);
 
+  const handleSetPeoplePhoto = useCallback((selectedImage) => {
+    const { id } = selectedImage;
+    onSetPeoplePhoto(people._id, id);
+  }, [people, onSetPeoplePhoto]);
+
   const loadData = useCallback((view) => {
     setLoading(true);
     metadataAPI.getPeoplePhotos(repoID, people._id, 0, PER_LOAD_NUMBER).then(res => {
@@ -245,6 +250,7 @@ const PeoplePhotos = ({ view, people, onClose, onDeletePeoplePhotos, onAddPeople
         onDelete={handelDelete}
         onRemoveImage={people._is_someone ? handelRemove : null}
         onAddImage={!people._is_someone ? handelAdd : null}
+        onSetPeoplePhoto={handleSetPeoplePhoto}
       />
     </div>
   );