Merge pull request #426 from vtex-apps/revert/v4.47.2

Revert v4.47.2
vtex-apps · Jun 28, 2022 · d3485a0 · d3485a0
2 parents a951c8e + 10eb705
commit d3485a0
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 22 deletions.
diff --git a/.vtexignore b/.vtexignore
@@ -2,7 +2,7 @@
 src
 
 .gitignore
-./CHANGELOG.md
+CHANGELOG.md
 README.md
 
 **/.DS_Store

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,22 +7,30 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Fixed
+
+- Revert v4.47.1
+
 ## [4.48.0] - 2022-06-27
 
 ### Added
+
 - Thai translation.
 
 ### Fixed
+
 - Bulgarian, English, Spanish, French, Italian, Japanese, Korean, Dutch, Portuguese and Romanian translations.
 
 ## [4.47.2] - 2022-06-03
 
 ### Changed
+
 - Disable editor changes in subcategory pages.
 
 ## [4.47.1] - 2022-05-19
 
 ### Changed
+
 - Upgrade the dependency `admin-cms` to 1.x.
 
 ## [4.47.0] - 2022-02-23

diff --git a/messages/context.json b/messages/context.json
@@ -167,7 +167,6 @@
   "admin/pages.editor.component-list.untitled": "admin/pages.editor.component-list.untitled",
   "admin/pages.editor.components.arrayTemplate.button.add": "admin/pages.editor.components.arrayTemplate.button.add",
   "admin/pages.editor.components.status.alert": "admin/pages.editor.components.status.alert",
-  "admin/pages.editor.components.editable.alert": "admin/pages.editor.components.editable.alert",
   "admin/pages.editor.components.button.cancel": "admin/pages.editor.components.button.cancel",
   "admin/pages.editor.components.button.save": "admin/pages.editor.components.button.save",
   "admin/pages.editor.components.condition.date.title": "admin/pages.editor.components.condition.date.title",

diff --git a/messages/en.json b/messages/en.json
@@ -164,9 +164,8 @@
   "admin/pages.editor.component-list.status.inactive": "Inactive",
   "admin/pages.editor.component-list.status.scheduled": "Scheduled",
   "admin/pages.editor.component-list.title": "Versions",
-  "admin/pages.editor.component-list.untitled": "Untitled block",
-  "admin/pages.editor.components.status.alert": "This version of the content is not being shown in the preview or to visitors.",
-  "admin/pages.editor.components.editable.alert": "Changes in this page will be reflected on every subcategory page. If you want the content to be inherited from its parent (category) level, reset it.",
+  "admin/pages.editor.component-list.untitled": "Untitled Block",
+  "admin/pages.editor.components.status.alert": "This version of the content is not being shown in the preview and to visitors.",
   "admin/pages.editor.components.arrayTemplate.button.add": "Add",
   "admin/pages.editor.components.button.cancel": "Cancel",
   "admin/pages.editor.components.button.save": "Save",

diff --git a/react/components/EditorContainer/Sidebar/BlockEditor/BlockConfigurationEditor/index.tsx b/react/components/EditorContainer/Sidebar/BlockEditor/BlockConfigurationEditor/index.tsx
@@ -184,11 +184,6 @@ const BlockConfigurationEditor: React.FunctionComponent<Props> = ({
     statement => statement.verb === 'to'
   )
 
-  const isSubcategoryPage = !!(
-    iframeRuntime.route.pageContext?.id === 'search' &&
-    iframeRuntime.route.pageContext?.type === 'subcategory'
-  )
-
   const getStatusWarningText = () => {
     if (statusFromRuntime === ConfigurationStatus.ACTIVE) {
       return intl.formatMessage(messages.activationDisabledLabel)
@@ -222,15 +217,6 @@ const BlockConfigurationEditor: React.FunctionComponent<Props> = ({
               />
             </p>
           )}
-
-          {isSubcategoryPage && (
-            <p className="pt4 pb4 pl4 pr2 bg-warning--faded lh-copy">
-              <FormattedMessage
-                id="admin/pages.editor.components.editable.alert"
-                defaultMessage="Editing this page will reflect on every subcategory page. If you want to have the content inherited from its parent(category) level, reset it."
-              />
-            </p>
-          )}
         </div>
 
         <div

diff --git a/react/components/EditorContainer/Sidebar/BlockEditor/hooks.ts b/react/components/EditorContainer/Sidebar/BlockEditor/hooks.ts
@@ -190,7 +190,6 @@ export const useFormHandlers: UseFormHandlers = ({
       await saveContent({
         variables: {
           bindingId: iframeRuntime.binding?.id,
-          route: iframeRuntime.route,
           blockId,
           configuration: newConfiguration,
           lang: iframeRuntime.culture.locale,

diff --git a/react/components/EditorContainer/graphql/SaveContent.graphql b/react/components/EditorContainer/graphql/SaveContent.graphql
@@ -1,6 +1,5 @@
 mutation saveContent(
   $bindingId: String
-  $route: JSONObject
   $blockId: String
   $configuration: ContentConfigurationInput
   $template: String
@@ -9,7 +8,6 @@ mutation saveContent(
 ) {
   saveContent(
     bindingId: $bindingId
-    route: $route
     blockId: $blockId
     configuration: $configuration
     template: $template