wtv

cms/version.py

@@ -1 +1 @@
-VERSION = "7.3.0"
+VERSION = "7.991.0"

files/views/media.py

@@ -168,7 +168,7 @@ class MediaList(APIView):
             if not self.request.user.is_authenticated:
                 media = Media.objects.none()
             else:
-                media = Media.objects.filter(permissions__owner_user=self.request.user).prefetch_related("user", "tags")
+                media = Media.objects.filter(permissions__owner_user=self.request.user).prefetch_related("user", "tags").distinct()
         elif show_param == "shared_with_me":
             if not self.request.user.is_authenticated:
                 media = Media.objects.none()

frontend/src/static/js/pages/ProfileMediaPage.js

@@ -23,24 +23,6 @@ import { Page } from './_Page';
 
 import '../components/profile-page/ProfilePage.scss';
 
-function EmptyChannelMedia(props) {
-  return (
-    <LinksConsumer>
-      {(links) => (
-        <div className="empty-media empty-channel-media">
-          <div className="welcome-title">{translateString('Welcome')} {props.name}</div>
-          <div className="start-uploading">
-            {translateString('Start uploading media and sharing your work. Media that you upload will show up here.')}
-          </div>
-          <a href={links.user.addMedia} title={translateString('Upload media')} className="button-link">
-            <i className="material-icons" data-icon="video_call"></i>{translateString('UPLOAD MEDIA')}
-          </a>
-        </div>
-      )}
-    </LinksConsumer>
-  );
-}
-
 export class ProfileMediaPage extends Page {
   constructor(props, pageSlug) {
     super(props, 'string' === typeof pageSlug ? pageSlug : 'author-home');
@@ -940,9 +922,6 @@ export class ProfileMediaPage extends Page {
               onItemsUpdate={this.handleItemsUpdate}
               onResponseDataLoaded={this.onResponseDataLoaded}
             />
-            {isMediaAuthor && 0 === this.state.channelMediaCount && !this.state.query ? (
-              <EmptyChannelMedia name={this.state.author.name} />
-            ) : null}
           </MediaListWrapper>
         </ProfilePagesContent>
       ) : null,

frontend/src/static/js/pages/ProfileSharedByMePage.js

@@ -10,7 +10,9 @@ import { LazyLoadItemListAsync } from '../components/item-list/LazyLoadItemListA
 import { ProfileMediaFilters } from '../components/search-filters/ProfileMediaFilters';
 import { ProfileMediaTags } from '../components/search-filters/ProfileMediaTags';
 import { ProfileMediaSorting } from '../components/search-filters/ProfileMediaSorting';
+import { BulkActionsModals } from '../components/BulkActionsModals';
 import { translateString } from '../utils/helpers';
+import { withBulkActions } from '../utils/hoc/withBulkActions';
 
 import { Page } from './_Page';
 
@@ -31,7 +33,7 @@ function EmptySharedByMe(props) {
   );
 }
 
-export class ProfileSharedByMePage extends Page {
+class ProfileSharedByMePage extends Page {
   constructor(props, pageSlug) {
     super(props, 'string' === typeof pageSlug ? pageSlug : 'author-shared-by-me');
 
@@ -320,14 +322,20 @@ export class ProfileSharedByMePage extends Page {
       this.state.author ? (
         <ProfilePagesContent key="ProfilePagesContent">
           <MediaListWrapper
-            title={!isMediaAuthor || 0 < this.state.channelMediaCount ? this.state.title : null}
+            title={this.state.title}
             className="items-list-ver"
+            showBulkActions={isMediaAuthor}
+            selectedCount={this.props.bulkActions.selectedMedia.size}
+            totalCount={this.props.bulkActions.availableMediaIds.length}
+            onBulkAction={this.props.bulkActions.handleBulkAction}
+            onSelectAll={this.props.bulkActions.handleSelectAll}
+            onDeselectAll={this.props.bulkActions.handleDeselectAll}
           >
             <ProfileMediaFilters hidden={this.state.hiddenFilters} tags={this.state.availableTags} onFiltersUpdate={this.onFiltersUpdate} />
             <ProfileMediaTags hidden={this.state.hiddenTags} tags={this.state.availableTags} onTagSelect={this.onTagSelect} />
             <ProfileMediaSorting hidden={this.state.hiddenSorting} onSortSelect={this.onSortSelect} />
             <LazyLoadItemListAsync
-              key={this.state.requestUrl}
+              key={`${this.state.requestUrl}-${this.props.bulkActions.listKey}`}
               requestUrl={this.state.requestUrl}
               hideAuthor={true}
               itemsCountCallback={this.state.requestUrl ? this.getCountFunc : null}
@@ -335,6 +343,11 @@ export class ProfileSharedByMePage extends Page {
               hideDate={!PageStore.get('config-media-item').displayPublishDate}
               canEdit={false}
               onResponseDataLoaded={this.onResponseDataLoaded}
+              showSelection={isMediaAuthor}
+              hasAnySelection={this.props.bulkActions.selectedMedia.size > 0}
+              selectedMedia={this.props.bulkActions.selectedMedia}
+              onMediaSelection={this.props.bulkActions.handleMediaSelection}
+              onItemsUpdate={this.props.bulkActions.handleItemsUpdate}
             />
             {isMediaAuthor && 0 === this.state.channelMediaCount && !this.state.query ? (
               <EmptySharedByMe name={this.state.author.name} />
@@ -342,14 +355,51 @@ export class ProfileSharedByMePage extends Page {
           </MediaListWrapper>
         </ProfilePagesContent>
       ) : null,
+      this.state.author && isMediaAuthor ? (
+        <BulkActionsModals
+          key="BulkActionsModals"
+          {...this.props.bulkActions}
+          selectedMediaIds={Array.from(this.props.bulkActions.selectedMedia)}
+          csrfToken={this.props.bulkActions.getCsrfToken()}
+          username={this.state.author.username}
+          onConfirmCancel={this.props.bulkActions.handleConfirmCancel}
+          onConfirmProceed={this.props.bulkActions.handleConfirmProceed}
+          onPermissionModalCancel={this.props.bulkActions.handlePermissionModalCancel}
+          onPermissionModalSuccess={this.props.bulkActions.handlePermissionModalSuccess}
+          onPermissionModalError={this.props.bulkActions.handlePermissionModalError}
+          onPlaylistModalCancel={this.props.bulkActions.handlePlaylistModalCancel}
+          onPlaylistModalSuccess={this.props.bulkActions.handlePlaylistModalSuccess}
+          onPlaylistModalError={this.props.bulkActions.handlePlaylistModalError}
+          onChangeOwnerModalCancel={this.props.bulkActions.handleChangeOwnerModalCancel}
+          onChangeOwnerModalSuccess={this.props.bulkActions.handleChangeOwnerModalSuccess}
+          onChangeOwnerModalError={this.props.bulkActions.handleChangeOwnerModalError}
+          onPublishStateModalCancel={this.props.bulkActions.handlePublishStateModalCancel}
+          onPublishStateModalSuccess={this.props.bulkActions.handlePublishStateModalSuccess}
+          onPublishStateModalError={this.props.bulkActions.handlePublishStateModalError}
+          onCategoryModalCancel={this.props.bulkActions.handleCategoryModalCancel}
+          onCategoryModalSuccess={this.props.bulkActions.handleCategoryModalSuccess}
+          onCategoryModalError={this.props.bulkActions.handleCategoryModalError}
+          onTagModalCancel={this.props.bulkActions.handleTagModalCancel}
+          onTagModalSuccess={this.props.bulkActions.handleTagModalSuccess}
+          onTagModalError={this.props.bulkActions.handleTagModalError}
+        />
+      ) : null,
     ];
   }
 }
 
 ProfileSharedByMePage.propTypes = {
   title: PropTypes.string.isRequired,
+  bulkActions: PropTypes.object.isRequired,
 };
 
 ProfileSharedByMePage.defaultProps = {
   title: 'Shared by me',
 };
+
+// Wrap with HOC and export as named export for compatibility
+const WrappedProfileSharedByMePage = withBulkActions(ProfileSharedByMePage);
+
+// Export both the wrapped component as named export (for build system) and default export
+export { WrappedProfileSharedByMePage as ProfileSharedByMePage };
+export default WrappedProfileSharedByMePage;

frontend/src/static/js/pages/ProfileSharedWithMePage.js

@@ -320,7 +320,7 @@ export class ProfileSharedWithMePage extends Page {
       this.state.author ? (
         <ProfilePagesContent key="ProfilePagesContent">
           <MediaListWrapper
-            title={!isMediaAuthor || 0 < this.state.channelMediaCount ? this.state.title : null}
+            title={this.state.title}
             className="items-list-ver"
           >
             <ProfileMediaFilters hidden={this.state.hiddenFilters} tags={this.state.availableTags} onFiltersUpdate={this.onFiltersUpdate} />

frontend/src/static/js/utils/hooks/index.ts

@@ -10,3 +10,4 @@ export * from './useMediaItem';
 export * from './usePopup';
 export * from './useTheme';
 export * from './useUser';
+export * from './useBulkActions';