Merge branch 'fix/allow-deletion-empty-resources-and-collections' into develop

Author: brumasribera

packages/collection/src/webapp/components/organisms/MainCollectionCard/MainCollectionCard.tsx

@@ -196,17 +196,16 @@ export const MainCollectionCard: FC<MainCollectionCardProps> = ({
       }
     : null
 
-  const deleteButton: FloatingMenuContentItem | null =
-    !empty && canDelete
-      ? {
-          Element: (
-            <div key="delete-button" onClick={() => setIsToDelete(true)}>
-              <Delete />
-              Delete
-            </div>
-          ),
-        }
-      : null
+  const deleteButton: FloatingMenuContentItem | null = canDelete
+    ? {
+        Element: (
+          <div key="delete-button" onClick={() => setIsToDelete(true)}>
+            <Delete />
+            Delete
+          </div>
+        ),
+      }
+    : null
 
   const unpublishButton: FloatingMenuContentItem | null =
     canPublish && isPublished
@@ -278,6 +277,7 @@ export const MainCollectionCard: FC<MainCollectionCardProps> = ({
                 className={`${isCurrentlySaving ? 'loading' : ''}`}
                 color="green"
                 onClick={isCurrentlySaving ? handleOnEditClick : handleOnSaveClick}
+                disabled={empty}
               >
                 <div
                   className="loading"

packages/ed-resource/src/webapp/components/organisms/MainResourceCard/MainResourceCard.tsx

@@ -161,7 +161,6 @@ export const MainResourceCard: FC<MainResourceCardProps> = ({
   const handleOnSaveClick = () => {
     setisWaitingForSaving(true)
     setShouldShowErrors(false)
-
     save()
   }
 
@@ -297,16 +296,15 @@ export const MainResourceCard: FC<MainResourceCardProps> = ({
         }
       : null
 
-  const deleteButton: FloatingMenuContentItem | null =
-    canDelete && !empty
-      ? {
-          Element: (
-            <div key="delete-button" onClick={() => setIsToDelete(true)}>
-              <Delete /> Delete
-            </div>
-          ),
-        }
-      : null
+  const deleteButton: FloatingMenuContentItem | null = canDelete
+    ? {
+        Element: (
+          <div key="delete-button" onClick={() => setIsToDelete(true)}>
+            <Delete /> Delete
+          </div>
+        ),
+      }
+    : null
 
   const publishButton: FloatingMenuContentItem | null =
     canPublish && !isPublished
@@ -412,7 +410,7 @@ export const MainResourceCard: FC<MainResourceCardProps> = ({
   ].filter((item): item is FloatingMenuContentItem => !!item)
 
   const moreButton =
-    !empty && updatedMoreButtonItems.length > 0 ? (
+    updatedMoreButtonItems.length > 0 ? (
       // updatedMoreButtonItems.length === 1 ? (
       //   updatedMoreButtonItems.map(i => {
       //     return (
@@ -449,6 +447,7 @@ export const MainResourceCard: FC<MainResourceCardProps> = ({
                 className={`${isCurrentlySaving ? 'loading' : ''}`}
                 color="green"
                 onClick={isCurrentlySaving ? handleOnEditClick : handleOnSaveClick}
+                disabled={empty}
               >
                 <div
                   className="loading"

packages/storybook/src/components/pages/Collection/Collection.stories.tsx

@@ -53,6 +53,7 @@ export const LoggedIn: CollectionStory = () => {
 
 export const New: CollectionStory = () => {
   const props = useCollectionStoryProps({
+    isEditingAtStart: true,
     mainColumnItems: [],
     data: {
       mnUrl: 'moodle.com',

packages/storybook/src/components/pages/Collection/CollectionProps.stories.tsx

@@ -152,14 +152,16 @@ export const useCollectionStoryProps = (
     id: 'qjnwglkd69io-sports',
     mnUrl: 'collection.url',
     ...overrides?.data,
-    image: {
-      location:
-        'https://images.unsplash.com/photo-1543964198-d54e4f0e44e3?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=2670&q=80',
-      credits: {
-        owner: { name: 'Leonard Rush', url: 'https://unsplash.com/@lennyrush' },
-        provider: { name: 'Unsplash', url: 'https://unsplash.com' },
-      },
-    },
+    image: overrides?.data?.image
+      ? {
+          location:
+            'https://images.unsplash.com/photo-1543964198-d54e4f0e44e3?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=2670&q=80',
+          credits: {
+            owner: { name: 'Leonard Rush', url: 'https://unsplash.com/@lennyrush' },
+            provider: { name: 'Unsplash', url: 'https://unsplash.com' },
+          },
+        }
+      : undefined,
   }
 
   const collectionForm: CollectionFormProps = {