fix: Child block should not be link if parent is a link

frappe · Feb 19, 2025 · 3251abd · 3251abd
1 parent 4c80aa8
commit 3251abd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 15 deletions.
diff --git a/frontend/src/components/BlockLayers.vue b/frontend/src/components/BlockLayers.vue
@@ -72,7 +72,9 @@
 							:blocks="element.children"
 							:ref="childLayer"
 							:indent="childIndent"
-							:disable-draggable="element.children.length && element.children[0].isChildOfComponentBlock()" />
+							:disable-draggable="
+								Boolean(element.children.length && element.children[0].isChildOfComponentBlock())
+							" />
 					</div>
 				</div>
 			</template>

diff --git a/frontend/src/components/BlockPropertySections/LinkSection.ts b/frontend/src/components/BlockPropertySections/LinkSection.ts
@@ -1,6 +1,4 @@
 import InlineInput from "@/components/Controls/InlineInput.vue";
-import { webPages } from "@/data/webPage";
-import { BuilderPage } from "@/types/Builder/BuilderPage";
 import blockController from "@/utils/blockController";
 import { computed, nextTick } from "vue";
 
@@ -10,18 +8,7 @@ const linkSectionProperties = [
 		getProps: () => {
 			return {
 				label: "Link To",
-				type: "autocomplete",
 				showInputAsOption: true,
-				options: (webPages.data || [])
-					.filter((page: BuilderPage) => {
-						return page.route && !page.dynamic_route;
-					})
-					.map((page: BuilderPage) => {
-						return {
-							value: `/${page.route}`,
-							label: `/${page.route}`,
-						};
-					}),
 				modelValue: blockController.getAttribute("href"),
 			};
 		},
@@ -78,5 +65,7 @@ export default {
 	name: "Link",
 	properties: linkSectionProperties,
 	collapsed: computed(() => !blockController.isLink()),
-	condition: () => !blockController.multipleBlocksSelected(),
+	condition: () =>
+		!blockController.multipleBlocksSelected() &&
+		!blockController.getSelectedBlocks()[0].parentBlock?.isLink(),
 };