feat: removal of orphan entities by sokumon [frappe] PR#34817
From: https://github.com/frappe/frappe/pull/34817
Date: 2025-12-04 13:14:00+05:30
- Merge pull request #34817 from sokumon/remove-orphans
- fix: dont pass list pass first item
- fix: use correct filter for dashboard
- fix: check for if the record exists
- fix: semgrep issue
- fix: handle renamed icons via removing icons with no fixture
- fix: delete icon and sidebar based on workspace
- feat: removal of orphan entities
Diagnostics
pre-commit failed for source commit: 2b9f1e08a79d7af2fa7624b803ea657b636b3c37
warning: The following rules have been removed and ignoring them has no effect:
- UP038
F811 Redefinition of unused `delete_desktop_icon` from line 142
--> frappe/desk/doctype/workspace/workspace.py:161:6
|
159 | frappe.delete_doc("Workspace Sidebar", workspace_sidebar[0])
160 |
161 | def delete_desktop_icon(self):
| ^^^^^^^^^^^^^^^^^^^ `delete_desktop_icon` redefined here
162 | if self.public:
163 | desktop_icon = frappe.get_all(
|
::: frappe/desk/doctype/workspace/workspace.py:142:6
|
140 | delete_folder(self.module, "Workspace", self.name)
141 |
142 | def delete_desktop_icon(self):
| ------------------- previous definition of `delete_desktop_icon` here
143 | if self.public:
144 | desktop_icon = frappe.get_all(
|
help: Remove definition: `delete_desktop_icon`
F811 Redefinition of unused `delete_workspace_sidebar` from line 153
--> frappe/desk/doctype/workspace/workspace.py:172:6
|
170 | frappe.delete_doc("Desktop Icon", desktop_icon[0])
171 |
172 | def delete_workspace_sidebar(self):
| ^^^^^^^^^^^^^^^^^^^^^^^^ `delete_workspace_sidebar` redefined here
173 | if self.public:
174 | workspace_sidebar = frappe.get_all(
|
::: frappe/desk/doctype/workspace/workspace.py:153:6
|
151 | frappe.delete_doc("Desktop Icon", desktop_icon[0])
152 |
153 | def delete_workspace_sidebar(self):
| ------------------------ previous definition of `delete_workspace_sidebar` here
154 | if self.public:
155 | workspace_sidebar = frappe.get_all(
|
help: Remove definition: `delete_workspace_sidebar`
Found 2 errors.
Suspicious merge commit detected: 2b9f1e08a79d7af2fa7624b803ea657b636b3c37
Checkout instructions
# Checkout locally
git fetch upstream
git switch ft-pr-34817
# Alternatively, re-take the changes
git switch develop
ft take ft-pr-34817
# Make changes then rebase
git rebase -i develop
# Fix or ignore conflicts
git checkout --theirs .
git rebase --continue
# Force-push changes
git push --force-with-lease