UI bugfixes

src/components/routes/manage/workflows/components/Actions.tsx

@@ -177,22 +177,30 @@ type EditWorkflowActionProps = {
 export const EditWorkflowAction: React.FC<EditWorkflowActionProps> = React.memo(({ id = null, workflow = null }) => {
   const { t } = useTranslation(['manageWorkflowDetail']);
   const theme = useTheme();
-  const { user: currentUser } = useALContext();
+  const { user: currentUser, configuration } = useALContext();
+  // Editing of workflows aren't allowed if it wasn't created on the current instance
+  const editingDisabled = workflow?.origin !== configuration.ui.fqdn;
+  console.log(location);
 
   if (!id || !currentUser.roles.includes('workflow_manage')) return null;
   else if (!workflow)
     return <Skeleton variant="circular" height="2.5rem" width="2.5rem" style={{ margin: theme.spacing(0.5) }} />;
   else
     return (
-      <Tooltip title={t('edit')}>
+      <Tooltip title={editingDisabled ? t('edit.disabled') : t('edit')}>
         <div>
           <IconButton
             style={{ color: theme.palette.primary.main }}
             component={Link}
-            to={`${location.pathname}${location.search}#/create/${id}`}
+            to={
+              location.pathname === '/manage/workflows'
+                ? `/manage/workflows${location.search}#/create/${id}`
+                : location.pathname.replace('detail', 'create')
+            }
             size="large"
+            disabled={editingDisabled}
           >
-            <EditOutlinedIcon />
+            <EditOutlinedIcon color={editingDisabled ? 'disabled' : 'primary'} />
           </IconButton>
         </div>
       </Tooltip>

src/components/routes/manage/workflows/create.tsx

@@ -71,7 +71,6 @@ const WrappedWorkflowCreate = ({ id: propID = null, onClose = () => null }: Prop
   const { t } = useTranslation(['manageWorkflowDetail']);
   const { id: paramID } = useParams<Params>();
   const theme = useTheme();
-  const classes = useStyles();
   const location = useLocation();
   const { apiCall } = useMyAPI();
   const { c12nDef, configuration, user: currentUser } = useALContext();
@@ -168,7 +167,7 @@ const WrappedWorkflowCreate = ({ id: propID = null, onClose = () => null }: Prop
   );
 
   useEffect(() => {
-    if (!id || !currentUser.roles.includes('workflow_manage')) return;
+    if (!id || !currentUser.roles.includes('workflow_manage') || originalWorkflow) return;
 
     apiCall<Workflow>({
       url: `/api/v4/workflow/${id}/`,
@@ -188,7 +187,7 @@ const WrappedWorkflowCreate = ({ id: propID = null, onClose = () => null }: Prop
       }
     });
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [currentUser.roles, id, onClose]);
+  }, [currentUser.roles, id, onClose, originalWorkflow]);
 
   useEffect(() => {
     setOriginalWorkflow(defaultWorkflow);

src/components/routes/submission/detail.tsx

@@ -1190,7 +1190,7 @@ function WrappedSubmissionDetail() {
                 {submission ? (
                   submission.state === 'completed' ? (
                     <div style={{ display: 'flex' }}>
-                      {currentUser.roles.includes('submission_delete') && (
+                      {(currentUser.roles.includes('administration') || (currentUser.roles.includes('submission_delete') && submission.params.submitter === currentUser.uname)) && (
                         <Tooltip title={t('delete')}>
                           <IconButton
                             onClick={() => setDeleteDialog(true)}

src/components/routes/submit.tsx

@@ -116,8 +116,10 @@ const Submit = () => {
 
   const state: SubmitState = location.state as SubmitState;
   const params = new URLSearchParams(location.search);
-  const stringInputTitle = t('urlHash.input_title');
-  const stringInputText = stringInputTitle + t('urlHash.input_suffix');
+  const stringInputTitle: string = configuration.ui.allow_url_submissions
+    ? `${t('urlHash.input_title_hash')}/${t('urlHash.input_title_url')}`
+    : t('urlHash.input_title_hash');
+  const stringInputText: string = stringInputTitle + t('urlHash.input_suffix');
 
   const handleChange = (event, newValue) => {
     setValue(newValue);

src/locales/en/submit.json

@@ -42,7 +42,8 @@
   "terms3": "Terms of Service",
   "urlHash.button": "Scan",
   "urlHash.input_suffix": " to Scan",
-  "urlHash.input_title": "Hash/URL",
+  "urlHash.input_title_hash": "Hash",
+  "urlHash.input_title_url": "URL",
   "validate.acceptText": "Continue",
   "validate.cancelText": "Deselect external services",
   "validate.text": "You've enabled URL analysis to the Internet or selected a service outside Assemblyline's infrastructure. Do you want to continue?",

src/locales/fr/submit.json

@@ -42,7 +42,8 @@
   "terms3": "Conditions d'utilisation",
   "urlHash.button": "Analyser",
   "urlHash.input_suffix": " à Analyser",
-  "urlHash.input_title": "Hachage/URL",
+  "urlHash.input_title_hash": "Hachage",
+  "urlHash.input_title_url": "URL",
   "validate.acceptText": "Continuer",
   "validate.cancelText": "Désélectionner les services externes",
   "validate.text": "Vous avez activé l'analyze d'URL sur Internet ou avez selectioné un service à l'extérieur de l'infrastructure d'Assemblyline. Voulez-vous continuez?",