Merge pull request #1632 from SenseNet/fix/1620-upload_new_CTD_single…

…_quates_name

Fix/1620 upload new ctd single quates name

apps/sensenet/src/components/ContentBreadcrumbs.tsx

@@ -22,11 +22,16 @@ const useStyles = makeStyles((theme: Theme) => {
       marginLeft: 'auto',
       display: 'flex',
       marginRight: '8px',
+      height: '40px',
     },
     buttonsWrapper: {
       display: 'flex',
       alignItems: 'center',
     },
+    actionButton: {
+      width: '40px',
+      marginRight: '2px',
+    },
   })
 })
 
@@ -87,6 +92,7 @@ export const ContentBreadcrumbs = <T extends GenericContent = GenericContent>(pr
         <div className={classes.batchActionWrapper} data-test="batch-actions">
           <Tooltip title={localization.batchActions.delete} placement="bottom">
             <IconButton
+              className={classes.actionButton}
               data-test="batch-delete"
               aria-label="delete"
               onClick={() => {
@@ -101,6 +107,7 @@ export const ContentBreadcrumbs = <T extends GenericContent = GenericContent>(pr
           </Tooltip>
           <Tooltip title={localization.batchActions.move} placement="bottom">
             <IconButton
+              className={classes.actionButton}
               data-test="batch-move"
               aria-label="move"
               onClick={() => {
@@ -123,6 +130,7 @@ export const ContentBreadcrumbs = <T extends GenericContent = GenericContent>(pr
           </Tooltip>
           <Tooltip title={localization.batchActions.copy} placement="bottom">
             <IconButton
+              className={classes.actionButton}
               data-test="batch-copy"
               aria-label="copy"
               onClick={() => {

apps/sensenet/src/components/editor/text-editor.tsx

@@ -3,7 +3,7 @@ import { PathHelper } from '@sensenet/client-utils'
 import { ActionModel, GenericContent, Settings, File as SnFile } from '@sensenet/default-content-types'
 import { useLogger, useRepository } from '@sensenet/hooks-react'
 import React, { useEffect, useState } from 'react'
-import { useLocalization } from '../../hooks'
+import { useLocalization, useSelectionService } from '../../hooks'
 import { getMonacoLanguage } from '../../services/content-context-service'
 import { ContentBreadcrumbs } from '../ContentBreadcrumbs'
 import { FullScreenLoader } from '../full-screen-loader'
@@ -50,6 +50,11 @@ export const TextEditor: React.FunctionComponent<TextEditorProps> = (props) => {
   const [hasChanges, setHasChanges] = useState(false)
   const logger = useLogger('TextEditor')
   const [error, setError] = useState<Error | undefined>()
+  const selectionService = useSelectionService()
+
+  useEffect(() => {
+    selectionService.selection.setValue([props.content])
+  }, [props, selectionService.selection])
 
   const saveContent = async () => {
     try {

apps/sensenet/src/components/view-controls/browse-view.tsx

@@ -43,9 +43,10 @@ export const BrowseView: React.FC<BrowseViewProps> = (props) => {
       })
       setContent(expanedContentResponse.d)
       selectionService.activeContent.setValue(expanedContentResponse.d)
+      selectionService.selection.setValue([expanedContentResponse.d])
     }
     getExpandedContent()
-  }, [repository, props.contentPath, selectionService.activeContent])
+  }, [repository, props.contentPath, selectionService.activeContent, selectionService.selection])
 
   if (content === undefined) {
     return null

apps/sensenet/src/components/view-controls/edit-view.tsx

@@ -49,9 +49,10 @@ export const EditView: React.FC<EditViewProps> = (props) => {
       })
       setContent(expanedContentResponse.d)
       selectionService.activeContent.setValue(expanedContentResponse.d)
+      selectionService.selection.setValue([expanedContentResponse.d])
     }
     getExpandedContent()
-  }, [repository, props.contentPath, selectionService.activeContent])
+  }, [repository, props.contentPath, selectionService.activeContent, selectionService.selection])
 
   if (content === undefined) {
     return null

apps/sensenet/src/components/view-controls/new-view.tsx

@@ -73,7 +73,7 @@ export const NewView: React.FC<NewViewProps> = (props) => {
         routeMatch={routeMatch}
         savePath={PATHS.contentTypes.snPath}
         loadContent={loadDefaultContentType}
-        getFileNameFromText={(text) => text.match(/<ContentType.*name="([^"]*)".*>/m)?.[1] || ''}
+        getFileNameFromText={(text) => text.match(/<ContentType.*name=['"]([^'"]*)['"].*>/m)?.[1] || ''}
       />
     )
   } else if (props.contentTypeName === 'Resource') {