fix: make remove cc license an option

graasp · May 11, 2022 · fd44bf6 · fd44bf6
1 parent 7dfe7dc
commit fd44bf6
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 35 deletions.
diff --git a/src/components/item/publish/CCLicenseDialog.js b/src/components/item/publish/CCLicenseDialog.js
@@ -16,7 +16,6 @@ const CCLicenseDialog = ({
   disabled,
   className,
   buttonName,
-  dialogContent,
   handleSubmit,
 }) => {
   const { t } = useTranslation();
@@ -42,7 +41,11 @@ const CCLicenseDialog = ({
       <Dialog open={open} onClose={handleClose}>
         <DialogTitle>{t('Confirm Your Submission')}</DialogTitle>
         <DialogContent>
-          <DialogContentText>{dialogContent}</DialogContentText>
+          <DialogContentText>
+            {t(
+              'Please verify that your item fits the CC License, and do not change to a more restricted option.',
+            )}
+          </DialogContentText>
         </DialogContent>
         <DialogActions>
           <Button onClick={handleClose} autoFocus variant="text">
@@ -58,15 +61,15 @@ const CCLicenseDialog = ({
 CCLicenseDialog.propTypes = {
   open: PropTypes.bool.isRequired,
   setOpen: PropTypes.func.isRequired,
-  disabled: PropTypes.bool.isRequired,
+  disabled: PropTypes.bool,
   className: PropTypes.string,
   buttonName: PropTypes.string.isRequired,
-  dialogContent: PropTypes.string.isRequired,
   handleSubmit: PropTypes.func.isRequired,
 };
 
 CCLicenseDialog.defaultProps = {
   className: '',
+  disabled: false,
 };
 
 export default CCLicenseDialog;
diff --git a/src/components/item/publish/CCLicenseSelection.js b/src/components/item/publish/CCLicenseSelection.js
@@ -82,16 +82,6 @@ const CCLicenseSelection = ({ item }) => {
     setOpen(false);
   };
 
-  const handleRemove = (event) => {
-    event.preventDefault();
-    updateCCLicense({
-      id: itemId,
-      name: itemName,
-      settings: { ccLicenseAdaption: '' },
-    });
-    setOpen(false);
-  };
-
   return (
     <>
       <Typography variant="h6" className={classes.title}>
@@ -129,31 +119,19 @@ const CCLicenseSelection = ({ item }) => {
           control={<Radio color="primary" />}
           label={t('Only if others share alike')}
         />
+        <FormControlLabel
+          value={CC_LICENSE_ADAPTION_OPTIONS.NONE}
+          control={<Radio color="primary" />}
+          label={t('None')}
+        />
       </RadioGroup>
       <CCLicenseDialog
         open={open}
         setOpen={setOpen}
-        disabled={!optionValue}
         className={classes.button}
         buttonName={t('Submit')}
-        dialogContent={t(
-          'Please verify that your item fits the CC License, and do not change to a more restricted option.',
-        )}
         handleSubmit={handleSubmit}
       />
-      {settings?.ccLicenseAdaption !== '' && (
-        <CCLicenseDialog
-          open={open}
-          setOpen={setOpen}
-          disabled={!optionValue}
-          className={classes.button}
-          buttonName={t('Remove License')}
-          dialogContent={t(
-            'Are you sure to remove existing CC License? This action is not suggested, and may lead to license inconsistency.',
-          )}
-          handleSubmit={handleRemove}
-        />
-      )}
       <Typography variant="subtitle1">{t('Icon Preview')}</Typography>
       <CCLicenseIcon
         adaption={settings?.ccLicenseAdaption}

diff --git a/src/config/constants.js b/src/config/constants.js
@@ -196,6 +196,7 @@ export const ACCEPT_COOKIES_NAME = 'accept-all-cookies';
 export const CC_LICENSE_ADAPTION_OPTIONS = {
   ALLOW: 'allow',
   ALIKE: 'alike',
+  NONE: '',
 };
 
 export const CC_LICENSE_ABOUT_URL =

diff --git a/src/langs/en.json b/src/langs/en.json
@@ -173,8 +173,7 @@
     "Icon Preview": "Icon Preview",
     "Creative Commons License": "Creative Commons License",
     "CC License": "CC License",
-    "Attention: This Action is irreversible!": "Attention: This Action is irreversible!",
-    "Once you submit your choice, you cannot remove selected Creative Commons License, or change to a more restricted choice.": "Once you submit your choice, you cannot remove selected Creative Commons License, or change to a more restricted choice.",
+    "Please verify that your item fits the CC License, and do not change to a more restricted option.": "Please verify that your item fits the CC License, and do not change to a more restricted option.",
     "Confirm Your Submission": "Confirm Your Submission",
     "itemValidationFailureMessage": "Your item might contain inappropriate content. Please remove them and validate your item again. If you have any question, please contact {{contact, string}}.",
     "Publication On Explorer": "Publication On Explorer",

diff --git a/src/langs/fr.json b/src/langs/fr.json
@@ -79,8 +79,8 @@
     "Create Shortcut": "Créer un Raccourci",
     "Sign Out": "Déconnexion",
     "Confirm deletion": "Confirmer la suppression",
-    "itemDeleteMessage_one":  "Cet élément sera supprimé définitivement.",
-    "itemDeleteMessage_other":  "Ces éléments seront supprimés définitivement.",
+    "itemDeleteMessage_one": "Cet élément sera supprimé définitivement.",
+    "itemDeleteMessage_other": "Ces éléments seront supprimés définitivement.",
     "Allow Item Login": "Activer l'authentification pour l'élément",
     "Language": "Langue",
     "Storage Used": "Mémoire utilisée",