Add an Add and Delete tree ranks option

specifyweb/businessrules/orm_signal_handler.py

@@ -1,3 +1,4 @@
+from inspect import getfullargspec
 from typing import Callable, Literal, Optional, Hashable
 
 from django.db.models import signals
@@ -26,7 +27,16 @@ def handler(sender, **kwargs):
             def handler(sender, **kwargs):
                 if kwargs.get('raw', False):
                     return
-                rule(sender, kwargs['instance'])
+
+                instance = kwargs['instance']
+                created = kwargs.get('created', None)
+                argspec = getfullargspec(rule)
+                rule_has_created = 'created' in argspec.args
+
+                if created is not None and rule_has_created:
+                    rule(sender, instance, created)
+                else:
+                    rule(sender, instance)
 
         return receiver(getattr(signals, signal), **receiver_kwargs)(handler)
     return _dec

specifyweb/businessrules/rules/tree_rules.py

@@ -2,13 +2,28 @@
 
 from specifyweb.businessrules.orm_signal_handler import orm_signal_handler
 from specifyweb.businessrules.exceptions import TreeBusinessRuleException
+from specifyweb.specify.tree_extras import is_instance_of_tree_def_item
+from specifyweb.specify.tree_ranks import *
 
 logger = logging.getLogger(__name__)
 
+@orm_signal_handler('pre_save')
+def pre_tree_rank_initiation_handler(sender, obj):
+    if is_instance_of_tree_def_item(obj) and obj.pk is None: # is it a treedefitem? 
+        if obj.pk is None: # is it a new object?
+            pre_tree_rank_init(obj)
+            verify_rank_parent_chain_integrity(obj, RankOperation.CREATED)
+        else:
+            verify_rank_parent_chain_integrity(obj, RankOperation.UPDATED)
+
+@orm_signal_handler('post_save')
+def post_tree_rank_initiation_handler(sender, obj, created):
+    if is_instance_of_tree_def_item(obj) and created: # is it a treedefitem?
+        post_tree_rank_save(sender, obj)
 
 @orm_signal_handler('pre_delete')
 def cannot_delete_root_treedefitem(sender, obj):
-    if hasattr(obj, 'treedef'):  # is it a treedefitem?
+    if is_instance_of_tree_def_item(obj):  # is it a treedefitem?
         if sender.objects.get(id=obj.id).parent is None:
             raise TreeBusinessRuleException(
                 "cannot delete root level tree definition item",
@@ -17,9 +32,18 @@ def cannot_delete_root_treedefitem(sender, obj):
                  "node": {
                      "id": obj.id
                  }})
+        pre_tree_rank_deletion(sender, obj)
+        verify_rank_parent_chain_integrity(obj, RankOperation.DELETED)
 
+@orm_signal_handler('post_delete')
+def post_tree_rank_deletion_handler(sender, obj):
+    if is_instance_of_tree_def_item(obj): # is it a treedefitem?
+        post_tree_rank_deletion(obj)
 
 @orm_signal_handler('pre_save')
 def set_is_accepted_if_prefereed(sender, obj):
     if hasattr(obj, 'isaccepted'):
         obj.isaccepted = obj.accepted_id == None
+
+
+

specifyweb/frontend/js_src/lib/components/DataModel/schemaExtras.ts

@@ -3,9 +3,8 @@
  */
 
 import type { IR, RA, RR } from '../../utils/types';
-import { filterArray } from '../../utils/types';
 import { getField } from './helpers';
-import type { FilterTablesByEndsWith, TableFields } from './helperTypes';
+import type { TableFields } from './helperTypes';
 import { schema } from './schema';
 import { LiteralField, Relationship } from './specifyField';
 import type { SpecifyTable } from './specifyTable';
@@ -25,30 +24,6 @@ export const schemaAliases: RR<'', IR<string>> & {
   },
 };
 
-const treeDefinitionFields = [
-  'fullNameSeparator',
-  'isEnforced',
-  'isInFullName',
-  'textAfter',
-  'textBefore',
-];
-
-const treeDefItem = (
-  table: SpecifyTable<FilterTablesByEndsWith<'TreeDefItem'>>
-) =>
-  [
-    [],
-    (): void =>
-      filterArray(
-        treeDefinitionFields.map((fieldName) =>
-          table.getLiteralField(fieldName)
-        )
-      ).forEach((field) => {
-        field.isReadOnly = true;
-        field.overrides.isReadOnly = true;
-      }),
-  ] as const;
-
 export const schemaExtras: {
   readonly [TABLE_NAME in keyof Tables]?: (
     table: SpecifyTable<Tables[TABLE_NAME]>
@@ -384,9 +359,4 @@ export const schemaExtras: {
       }),
     ],
   ],
-  GeographyTreeDefItem: treeDefItem,
-  StorageTreeDefItem: treeDefItem,
-  TaxonTreeDefItem: treeDefItem,
-  GeologicTimePeriodTreeDefItem: treeDefItem,
-  LithoStratTreeDefItem: treeDefItem,
 };

specifyweb/frontend/js_src/lib/components/FormSliders/IntegratedRecordSelector.tsx

@@ -21,10 +21,8 @@ import type { FormType } from '../FormParse';
 import type { SubViewSortField } from '../FormParse/cells';
 import { augmentMode, ResourceView } from '../Forms/ResourceView';
 import { useFirstFocus } from '../Forms/SpecifyForm';
-import {
-  interactionPrepTables,
-  InteractionWithPreps,
-} from '../Interactions/helpers';
+import type { InteractionWithPreps } from '../Interactions/helpers';
+import { interactionPrepTables } from '../Interactions/helpers';
 import { InteractionDialog } from '../Interactions/InteractionDialog';
 import { hasTablePermission } from '../Permissions/helpers';
 import { relationshipIsToMany } from '../WbPlanView/mappingHelpers';

specifyweb/frontend/js_src/lib/components/Formatters/__tests__/__snapshots__/formatters.test.ts.snap

@@ -2371,6 +2371,9 @@ exports[`getMainTableFields 1`] = `
   ],
   "GeographyTreeDefItem": [
     "name",
+    "fullNameSeparator",
+    "textAfter",
+    "textBefore",
     "title",
   ],
   "GeologicTimePeriod": [
@@ -2382,6 +2385,9 @@ exports[`getMainTableFields 1`] = `
   ],
   "GeologicTimePeriodTreeDefItem": [
     "name",
+    "fullNameSeparator",
+    "textAfter",
+    "textBefore",
     "title",
   ],
   "Gift": [
@@ -2434,6 +2440,9 @@ exports[`getMainTableFields 1`] = `
   ],
   "LithoStratTreeDefItem": [
     "name",
+    "fullNameSeparator",
+    "textAfter",
+    "textBefore",
     "title",
   ],
   "Loan": [
@@ -2645,6 +2654,9 @@ exports[`getMainTableFields 1`] = `
   ],
   "StorageTreeDefItem": [
     "name",
+    "fullNameSeparator",
+    "textAfter",
+    "textBefore",
     "title",
   ],
   "Taxon": [
@@ -2665,6 +2677,9 @@ exports[`getMainTableFields 1`] = `
   ],
   "TaxonTreeDefItem": [
     "name",
+    "fullNameSeparator",
+    "textAfter",
+    "textBefore",
     "title",
   ],
   "TreatmentEvent": [

specifyweb/frontend/js_src/lib/components/Forms/ResourceView.tsx

@@ -37,15 +37,11 @@ import { propsToFormMode } from './useViewDefinition';
  */
 export const FORBID_ADDING = new Set<keyof Tables>([
   'TaxonTreeDef',
-  'TaxonTreeDefItem',
   'GeographyTreeDef',
-  'GeographyTreeDefItem',
   'StorageTreeDef',
-  'StorageTreeDefItem',
   'GeologicTimePeriodTreeDef',
   'GeologicTimePeriodTreeDefItem',
   'LithoStratTreeDef',
-  'LithoStratTreeDefItem',
   'Institution',
   'Division',
   'Discipline',

specifyweb/frontend/js_src/lib/components/Interactions/InteractionDialog.tsx

@@ -26,8 +26,8 @@ import { Button } from '../Atoms/Button';
 import { Link } from '../Atoms/Link';
 import { LoadingContext, ReadOnlyContext } from '../Core/Contexts';
 import type {
-  AnySchema,
   AnyInteractionPreparation,
+  AnySchema,
   SerializedResource,
 } from '../DataModel/helperTypes';
 import type { SpecifyResource } from '../DataModel/legacyTypes';

specifyweb/frontend/js_src/lib/components/TreeView/AddRank.tsx

@@ -0,0 +1,106 @@
+import React from 'react';
+
+import { commonText } from '../../localization/common';
+import { interactionsText } from '../../localization/interactions';
+import { treeText } from '../../localization/tree';
+import type { RA } from '../../utils/types';
+import { Button } from '../Atoms/Button';
+import { Form, Label, Select } from '../Atoms/Form';
+import type {
+  FilterTablesByEndsWith,
+  SerializedResource,
+} from '../DataModel/helperTypes';
+import { tables } from '../DataModel/tables';
+import { ResourceView } from '../Forms/ResourceView';
+import { Dialog } from '../Molecules/Dialog';
+import { Submit } from '../Atoms/Submit';
+import { useId } from '../../hooks/useId';
+
+export function AddRank({
+  treeDefinitionItems,
+}: {
+  readonly treeDefinitionItems: RA<
+    SerializedResource<FilterTablesByEndsWith<'TreeDefItem'>>
+  >;
+}): JSX.Element {
+  const [state, setState] = React.useState<'add' | 'initial' | 'parent'>(
+    'initial'
+  );
+
+  const [parentRank, setParentRank] = React.useState(
+    treeDefinitionItems[0].resource_uri
+  );
+
+  const treeDef = treeDefinitionItems[0].treeDef;
+
+  const treeResource = React.useMemo(() => {
+    const resource = new tables[treeDefinitionItems[0]._tableName].Resource();
+    resource.set('treeDef', treeDef);
+    return resource;
+  }, [treeDef]);
+  const id = useId('add-rank');
+
+  return (
+    <>
+      <Button.Icon
+        icon="plus"
+        title={treeText.addNewRank()}
+        onClick={() => setState('parent')}
+      />
+      {state === 'parent' && (
+        <Dialog
+          buttons={
+            <>
+              <Button.DialogClose>{commonText.cancel()}</Button.DialogClose>
+              <Submit.Save
+                onClick={() => {
+                  treeResource.set('parent', parentRank);
+                  setState('add');
+                }}
+                form={id('form')}
+              >
+                {interactionsText.continue()}
+              </Submit.Save>
+            </>
+          }
+          header={treeText.chooseParentRank()}
+          onClose={() => setState('initial')}
+        >
+          <Form id={id('form')}>
+            <Label.Block className="gap-2">
+              {treeText.chooseParentRank()}
+              <Select
+                className="w-full min-w-[theme(spacing.40)]"
+                value={parentRank}
+                onChange={({ target }): void => {
+                  setParentRank(target.value);
+                }}
+              >
+                {treeDefinitionItems.map((rank, index) => (
+                  <option key={index} value={rank.resource_uri}>
+                    {rank.name}
+                  </option>
+                ))}
+              </Select>
+            </Label.Block>
+          </Form>
+        </Dialog>
+      )}
+      {state === 'add' && (
+        <ResourceView
+          dialog="modal"
+          isDependent={false}
+          isSubForm={false}
+          resource={treeResource}
+          title={treeText.addNewRank()}
+          onAdd={undefined}
+          onClose={(): void => setState('initial')}
+          onDeleted={undefined}
+          onSaved={() => {
+            globalThis.location.reload();
+          }}
+        />
+      )}
+    </>
+  );
+}

specifyweb/frontend/js_src/lib/components/TreeView/Tree.tsx

@@ -17,8 +17,10 @@ import type {
 import { deserializeResource } from '../DataModel/serializers';
 import { ResourceView } from '../Forms/ResourceView';
 import { getPref } from '../InitialContext/remotePrefs';
+import { hasTablePermission } from '../Permissions/helpers';
 import { useHighContrast } from '../Preferences/Hooks';
 import { userPreferences } from '../Preferences/userPreferences';
+import { AddRank } from './AddRank';
 import type { Conformations, Row, Stats } from './helpers';
 import { fetchStats } from './helpers';
 import { TreeRow } from './Row';
@@ -47,7 +49,7 @@ export function Tree<SCHEMA extends AnyTree>({
   searchBoxRef,
   baseUrl,
   setLastFocusedTree,
-  handleToggleEditingRanks,
+  onToggleEditingRanks: handleToggleEditingRanks,
 }: {
   readonly treeDefinitionItems: RA<
     SerializedResource<FilterTablesByEndsWith<'TreeDefItem'>>
@@ -66,7 +68,7 @@ export function Tree<SCHEMA extends AnyTree>({
   readonly searchBoxRef: React.RefObject<HTMLInputElement | null>;
   readonly baseUrl: string;
   readonly setLastFocusedTree: () => void;
-  readonly handleToggleEditingRanks: () => void;
+  readonly onToggleEditingRanks: () => void;
 }): JSX.Element {
   const highContrast = useHighContrast();
 
@@ -151,12 +153,21 @@ export function Tree<SCHEMA extends AnyTree>({
                 role="columnheader"
               >
                 {index === 0 ? (
-                  <Button.Icon
-                    aria-pressed={isEditingRanks}
-                    icon="pencil"
-                    title={treeText.editRanks()}
-                    onClick={handleToggleEditingRanks}
-                  />
+                  <>
+                    <Button.Icon
+                      aria-pressed={isEditingRanks}
+                      icon="pencil"
+                      title={treeText.editRanks()}
+                      onClick={handleToggleEditingRanks}
+                    />
+                    {isEditingRanks &&
+                    hasTablePermission(
+                      treeDefinitionItems[0]._tableName,
+                      'create'
+                    ) ? (
+                      <AddRank treeDefinitionItems={treeDefinitionItems} />
+                    ) : null}
+                  </>
                 ) : null}
                 <Button.LikeLink
                   id={id(rank.rankId.toString())}
@@ -257,7 +268,7 @@ function EditTreeRank({
           resource={resource}
           onAdd={undefined}
           onClose={handleClose}
-          onDeleted={undefined}
+          onDeleted={(): void => globalThis.location.reload()}
           onSaved={(): void => globalThis.location.reload()}
         />
       ) : null}