Handle content rename if it's in the current path (#1250)

SenseNet · Mar 23, 2021 · a222d81 · a222d81
1 parent 868a580
commit a222d81
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/apps/sensenet/src/components/content/Explore.tsx b/apps/sensenet/src/components/content/Explore.tsx
@@ -88,6 +88,7 @@ export function Explore({
   const uiSettings = useContext(ResponsivePersonalSettings)
   const activeContent = useQuery().get('content') ?? ''
   const contentTypeName = useQuery().get('content-type')
+  const pathFromUrl = useQuery().get('path')
   const snRoute = useSnRoute()
   const activeAction = snRoute.match!.params.action
 
@@ -117,7 +118,18 @@ export function Explore({
             key={activeContent}
             actionName={activeAction}
             contentPath={`${rootPath}${activeContent}`}
-            submitCallback={() => navigateToAction({ history, routeMatch: snRoute.match })}
+            submitCallback={(savedContent) => {
+              const contentNameBeforeEdit = PathHelper.getSegments(activeContent).pop()
+              if (contentNameBeforeEdit && contentNameBeforeEdit !== savedContent.Name && pathFromUrl) {
+                return navigateToAction({
+                  history,
+                  routeMatch: snRoute.match,
+                  queryParams: { path: pathFromUrl.replace(contentNameBeforeEdit, savedContent.Name) },
+                })
+              }
+
+              navigateToAction({ history, routeMatch: snRoute.match })
+            }}
           />
         )
       case 'new':

diff --git a/apps/sensenet/src/components/view-controls/edit-view.tsx b/apps/sensenet/src/components/view-controls/edit-view.tsx
@@ -19,7 +19,7 @@ import { ViewTitle } from './common/view-title'
 export interface EditViewProps {
   renderIcon?: (name: string) => ReactElement
   handleCancel?: () => void
-  submitCallback?: () => void
+  submitCallback?: (savedContent: GenericContent) => void
   actionName?: ActionNameType
   isFullPage?: boolean
   contentPath: string
@@ -76,7 +76,7 @@ export const EditView: React.FC<EditViewProps> = (props) => {
             },
           },
         })
-        props.submitCallback?.()
+        props.submitCallback?.(response.d)
       } catch (error) {
         logger.error({
           message: