Skip to content

feat-AB-939 improve delete bp visibility #1273

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
neelasha-writer merged 1 commit into from
Jan 28, 2026
Merged

feat-AB-939 improve delete bp visibility #1273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions src/ui/src/builder/sidebar/BuilderSidebarComponentTree.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
class="rootBranch"
:component-id="rootComponentId"
:query="query"
@delete="handleComponentDelete"
/>
</div>

Expand All @@ -36,6 +37,7 @@
:key="blueprint.id"
:component-id="blueprint.id"
:query="query"
@delete="handleComponentDelete"
/>
<div
v-if="section.items.length === 0"
Expand Down Expand Up @@ -94,11 +96,8 @@ const wfbm = inject(injectionKeys.builderManager);
const query = ref("");

const tracking = useWriterTracking(wf);
const { createAndInsertComponent, setContentValue } = useComponentActions(
wf,
wfbm,
tracking,
);
const { createAndInsertComponent, setContentValue, removeComponentSubtree } =
useComponentActions(wf, wfbm, tracking);

const rootComponentId = wfbm.activeRootId;

Expand Down Expand Up @@ -201,6 +200,10 @@ async function addSharedBlueprint() {
wfbm.setSelection(pageId);
tracking.track("blueprints_shared_added");
}

function handleComponentDelete(componentId: string) {
removeComponentSubtree(componentId);
}
</script>

<style scoped>
Expand Down
24 changes: 22 additions & 2 deletions src/ui/src/builder/sidebar/BuilderSidebarComponentTreeBranch.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,15 @@
:disable-collapse="COMPONENT_TYPES_ROOT.has(component.type)"
:no-nested-space="COMPONENT_TYPES_ROOT.has(component.type)"
:collapsed="isOutsideActivePage"
:right-click-options="rightClickDropdownOptions"
:dropdown-options="
component?.type === 'blueprints_blueprint' &&
isDeleteAllowed(props.componentId)
? rightClickDropdownOptions
: undefined
"
@select="select"
@dropdown-select="handleDropdownSelect($event)"
@dragover="handleDragOver"
@dragstart="handleDragStart"
@dragend="handleDragEnd"
Expand Down Expand Up @@ -53,6 +61,7 @@
:component-id="childComponent.id"
:query="query"
@expand-branch="expand"
@delete="$emit('delete', $event)"
/>
</template>
</BuilderTree>
Expand Down Expand Up @@ -83,6 +92,7 @@ import {
COMPONENT_TYPES_TOP_LEVEL,
} from "@/constants/component";
import WdsIcon from "@/wds/WdsIcon.vue";
import type { WdsDropdownMenuOption } from "@/wds/WdsDropdownMenu.vue";

const props = defineProps({
componentId: { type: String, required: true },
Expand All @@ -91,6 +101,9 @@ const props = defineProps({

const treeBranch = ref<ComponentPublicInstance<typeof BuilderTree>>();

const rightClickDropdownOptions: WdsDropdownMenuOption[] = [
{ label: "Delete", value: "delete", icon: "trash-2" },
];
const wf = inject(injectionKeys.core);
const wfbm = inject(injectionKeys.builderManager);
const selected = computed(() => wfbm.isComponentIdSelected(props.componentId));
Expand All @@ -101,11 +114,12 @@ const {
moveComponent,
goToComponentParentPage,
isDraggingAllowed,
isDeleteAllowed,
} = useComponentActions(wf, wfbm, tracking);
const { getComponentInfoFromDrag, removeInsertionCandidacy, isParentSuitable } =
useDragDropComponent(wf);
const { isComponentVisible } = useEvaluator(wf);
const emit = defineEmits(["expandBranch"]);
const emits = defineEmits(["expandBranch", "delete"]);

const q = computed(() => props.query?.toLocaleLowerCase() ?? "");

Expand Down Expand Up @@ -145,7 +159,7 @@ async function select(ev: MouseEvent | KeyboardEvent) {
function expand() {
if (!treeBranch.value) return;
treeBranch.value.expand();
emit("expandBranch");
emits("expandBranch");
}

function scrollToShow() {
Expand Down Expand Up @@ -201,6 +215,12 @@ function handleDrop(ev: DragEvent) {
removeInsertionCandidacy(ev);
}

function handleDropdownSelect(action: string) {
if (action === "delete" && isDeleteAllowed(props.componentId)) {
emits("delete", props.componentId);
}
}

const isOutsideActivePage = computed(() => {
if (!wf.activePageId.value) return false;

Expand Down