Skip to content

feat(trees): add tree options for rebuilding names #7307

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

Draft
wants to merge 19 commits into
base: main
Choose a base branch
from
Draft

feat(trees): add tree options for rebuilding names #7307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
1edc016
feat(icons): add and use wrench icon for repair
grantfitzsimmons Aug 14, 2025
5709f51
feat(trees): add `rebuild_fullname` API endpoint
grantfitzsimmons Aug 14, 2025
878693d
feat(permissions): add permission for rebuilding
grantfitzsimmons Aug 14, 2025
e6c35d2
fix: correct icon order
grantfitzsimmons Aug 14, 2025
5145631
feat(trees): add tree options menu
grantfitzsimmons Aug 14, 2025
6a27734
fix(localization): fix tests
grantfitzsimmons Aug 14, 2025
a462780
Lint code with ESLint and Prettier
grantfitzsimmons Aug 14, 2025
b8355c6
fix: do not bypass type check
grantfitzsimmons Aug 16, 2025
81981fb
fix: rename permission
grantfitzsimmons Aug 16, 2025
d839f48
Merge branch 'issue-7138' of https://github.com/specify/specify7 into…
grantfitzsimmons Aug 16, 2025
e3b098f
Lint code with ESLint and Prettier
grantfitzsimmons Aug 16, 2025
baeadcf
refactor: rebuild response parsing
grantfitzsimmons Aug 16, 2025
7646cdb
Merge branch 'issue-7138' of https://github.com/specify/specify7 into…
grantfitzsimmons Aug 16, 2025
8f6712d
Lint code with ESLint and Prettier
grantfitzsimmons Aug 16, 2025
cc6fae0
Merge branch 'main' into issue-7138
grantfitzsimmons Aug 20, 2025
75f5225
Lint code with ESLint and Prettier
grantfitzsimmons Aug 20, 2025
ecf79e6
Merge branch 'main' into issue-7138
grantfitzsimmons Aug 25, 2025
66167b0
Lint code with ESLint and Prettier
grantfitzsimmons Aug 25, 2025
a8f71c2
refactor: improve names
grantfitzsimmons Sep 12, 2025
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
1 change: 1 addition & 0 deletions specifyweb/frontend/js_src/lib/components/Atoms/Icons.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ export const icons = {
userCircle: <svg aria-hidden className={iconClassName} fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path clipRule="evenodd" d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-6-3a2 2 0 11-4 0 2 2 0 014 0zm-2 4a5 5 0 00-4.546 2.916A5.986 5.986 0 0010 16a5.986 5.986 0 004.546-2.084A5 5 0 0010 11z" fillRule="evenodd" /></svg>,
variable: <svg aria-hidden className={iconClassName} fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path clipRule="evenodd" d="M4.649 3.084A1 1 0 015.163 4.4 13.95 13.95 0 004 10c0 1.993.416 3.886 1.164 5.6a1 1 0 01-1.832.8A15.95 15.95 0 012 10c0-2.274.475-4.44 1.332-6.4a1 1 0 011.317-.516zM12.96 7a3 3 0 00-2.342 1.126l-.328.41-.111-.279A2 2 0 008.323 7H8a1 1 0 000 2h.323l.532 1.33-1.035 1.295a1 1 0 01-.781.375H7a1 1 0 100 2h.039a3 3 0 002.342-1.126l.328-.41.111.279A2 2 0 0011.677 14H12a1 1 0 100-2h-.323l-.532-1.33 1.035-1.295A1 1 0 0112.961 9H13a1 1 0 100-2h-.039zm1.874-2.6a1 1 0 011.833-.8A15.95 15.95 0 0118 10c0 2.274-.475 4.44-1.332 6.4a1 1 0 11-1.832-.8A13.949 13.949 0 0016 10c0-1.993-.416-3.886-1.165-5.6z" fillRule="evenodd" /></svg>,
viewList: <svg aria-hidden className={iconClassName} fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path clipRule="evenodd" d="M3 4a1 1 0 011-1h12a1 1 0 110 2H4a1 1 0 01-1-1zm0 4a1 1 0 011-1h12a1 1 0 110 2H4a1 1 0 01-1-1zm0 4a1 1 0 011-1h12a1 1 0 110 2H4a1 1 0 01-1-1zm0 4a1 1 0 011-1h12a1 1 0 110 2H4a1 1 0 01-1-1z" fillRule="evenodd" /></svg>,
wrench: <svg aria-hidden className={iconClassName} fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path clipRule="evenodd" d="M19 5.5a4.5 4.5 0 0 1-4.791 4.49c-.873-.055-1.808.128-2.368.8l-6.024 7.23a2.724 2.724 0 1 1-3.837-3.837L9.21 8.16c.672-.56.855-1.495.8-2.368a4.5 4.5 0 0 1 5.873-4.575c.324.105.39.51.15.752L13.34 4.66a.455.455 0 0 0-.11.494 3.01 3.01 0 0 0 1.617 1.617c.17.07.363.02.493-.111l2.692-2.692c.241-.241.647-.174.752.15.14.435.216.9.216 1.382ZM4 17a1 1 0 1 0 0-2 1 1 0 0 0 0 2Z" fillRule="evenodd" /></svg>,
x: <svg aria-hidden className={iconClassName} fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path clipRule="evenodd" d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z" fillRule="evenodd" /></svg>,
} as const;

Expand Down
2 changes: 1 addition & 1 deletion specifyweb/frontend/js_src/lib/components/Header/userToolDefinitions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ const rawUserTools = ensure<IR<IR<Omit<MenuItem, 'name'>>>>()({
repairTree: {
title: headerText.repairTree(),
url: '/specify/overlay/tree-repair/',
icon: icons.checkCircle,
icon: icons.wrench,
enabled: () =>
getDisciplineTrees().some((treeName) =>
hasPermission(`/tree/edit/${toLowerCase(treeName)}`, 'repair')
Expand Down
9 changes: 7 additions & 2 deletions specifyweb/frontend/js_src/lib/components/Permissions/definitions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,42 +23,47 @@ export const operationPolicies = {
'copy_from_library',
],
'/permissions/library/roles': ['read', 'create', 'update', 'delete'],
'/tree/edit/taxon': ['merge', 'move', 'synonymize', 'desynonymize', 'repair'],
'/tree/edit/taxon': ['merge', 'move', 'synonymize', 'desynonymize', 'repair', 'rebuild_full_names'],
'/tree/edit/geography': [
'merge',
'move',
'synonymize',
'desynonymize',
'repair',
'rebuild_full_names',
],
'/tree/edit/storage': [
'merge',
'move',
'bulk_move',
'synonymize',
'desynonymize',
'repair',
'bulk_move',
'rebuild_full_names',
],
'/tree/edit/geologictimeperiod': [
'merge',
'move',
'synonymize',
'desynonymize',
'repair',
'rebuild_full_names',
],
'/tree/edit/lithostrat': [
'merge',
'move',
'synonymize',
'desynonymize',
'repair',
'rebuild_full_names',
],
'/tree/edit/tectonicunit': [
'merge',
'move',
'synonymize',
'desynonymize',
'repair',
'rebuild_full_names',
],
'/querybuilder/query': [
'execute',
Expand Down
Loading