diff --git a/src/taxonomy/data/types.ts b/src/taxonomy/data/types.ts index d8ca63d1e7..ee5f1db8e3 100644 --- a/src/taxonomy/data/types.ts +++ b/src/taxonomy/data/types.ts @@ -38,7 +38,6 @@ export interface QueryOptions { export interface TagData { childCount: number; - descendantCount: number; depth: number; externalId: string; id: number; diff --git a/src/taxonomy/tag-list/TagListTable.test.jsx b/src/taxonomy/tag-list/TagListTable.test.jsx index 6074dc1e23..3e9fd9ff8e 100644 --- a/src/taxonomy/tag-list/TagListTable.test.jsx +++ b/src/taxonomy/tag-list/TagListTable.test.jsx @@ -58,7 +58,6 @@ const mockTagsResponse = { ...tagDefaults, value: 'root tag 1', child_count: 1, - descendant_count: 14, _id: 1001, sub_tags_url: '/request/to/load/subtags/1', usage_count: 1, @@ -67,7 +66,6 @@ const mockTagsResponse = { ...tagDefaults, value: 'root tag 2', child_count: 1, - descendant_count: 10, _id: 1002, sub_tags_url: '/request/to/load/subtags/2', usage_count: 0, @@ -76,7 +74,6 @@ const mockTagsResponse = { ...tagDefaults, value: 'root tag 3', child_count: 1, - descendant_count: 5, _id: 1003, sub_tags_url: '/request/to/load/subtags/3', usage_count: 3, @@ -310,7 +307,6 @@ describe('', () => { ...tagDefaults, value: 'a new tag', child_count: 0, - descendant_count: 0, _id: 1234, }); const { creatingRow, input } = await openTopLevelDraftRow(); @@ -357,7 +353,6 @@ describe('', () => { ...tagDefaults, value: 'a new tag', child_count: 0, - descendant_count: 0, _id: 1234, }]); }, 100); @@ -376,7 +371,6 @@ describe('', () => { ...tagDefaults, value: 'a new tag', child_count: 0, - descendant_count: 0, _id: 1234, }); const { creatingRow, input } = await openTopLevelDraftRow(); @@ -403,7 +397,6 @@ describe('', () => { ...tagDefaults, value: 'a new tag', child_count: 0, - descendant_count: 0, _id: 1234, }); const { creatingRow, input } = await openTopLevelDraftRow(); @@ -420,7 +413,6 @@ describe('', () => { ...tagDefaults, value: 'xyz tag', child_count: 0, - descendant_count: 0, _id: 1234, }); const { creatingRow, input } = await openTopLevelDraftRow(); @@ -442,7 +434,6 @@ describe('', () => { ...tagDefaults, value: 'xyz tag', child_count: 0, - descendant_count: 0, _id: 1234, }); const { creatingRow, input } = await openTopLevelDraftRow(); @@ -477,7 +468,6 @@ describe('', () => { ...tagDefaults, value: requestData.tag, child_count: 0, - descendant_count: 0, _id: Math.floor(Math.random() * 10000), }]; }); @@ -546,7 +536,6 @@ describe('', () => { ...tagDefaults, value: 'Tag A', child_count: 0, - descendant_count: 0, _id: 4567, }); @@ -837,7 +826,6 @@ describe(' isolated async subtag tests', () => { ...tagDefaults, value: 'child-new', child_count: 0, - descendant_count: 0, _id: 2222, parent_value: 'root tag 1', }); @@ -858,7 +846,6 @@ describe(' isolated async subtag tests', () => { ...tagDefaults, value: 'child appears immediately', child_count: 0, - descendant_count: 0, _id: 3333, parent_value: 'root tag 1', }); @@ -879,7 +866,6 @@ describe(' isolated async subtag tests', () => { ...tagDefaults, value: 'nested child', child_count: 0, - descendant_count: 0, _id: 4444, parent_value: 'the child tag', }); @@ -903,7 +889,6 @@ describe(' isolated async subtag tests', () => { ...tagDefaults, value: 'nested child appears immediately', child_count: 0, - descendant_count: 0, _id: 5555, parent_value: 'the child tag', }); @@ -928,7 +913,6 @@ describe(' isolated async subtag tests', () => { ...tagDefaults, value: 'great grandchild', child_count: 0, - descendant_count: 0, _id: 6666, parent_value: 'the grandchild tag', }); @@ -951,7 +935,6 @@ describe(' isolated async subtag tests', () => { ...tagDefaults, value: 'great grandchild appears immediately', child_count: 0, - descendant_count: 0, _id: 7777, parent_value: 'the grandchild tag', }); diff --git a/src/taxonomy/tag-list/hooks.ts b/src/taxonomy/tag-list/hooks.ts index a350e3eabe..3848894c01 100644 --- a/src/taxonomy/tag-list/hooks.ts +++ b/src/taxonomy/tag-list/hooks.ts @@ -125,7 +125,6 @@ const useEditActions = ({ parentValue: parentTagValue, depth: parentTag ? parentTag.depth + 1 : 0, childCount: 0, - descendantCount: 0, subTagsUrl: null, externalId: '', }, parentTagValue); diff --git a/src/taxonomy/tag-list/mockData.ts b/src/taxonomy/tag-list/mockData.ts index 77d88cb60a..a5e8b0bc3f 100644 --- a/src/taxonomy/tag-list/mockData.ts +++ b/src/taxonomy/tag-list/mockData.ts @@ -6,7 +6,6 @@ export const rawData: TagData[] = [ value: 'ab', externalId: 'some-external-id', childCount: 2, - descendantCount: 4, depth: 0, parentValue: null, id: 31, @@ -18,7 +17,6 @@ export const rawData: TagData[] = [ value: 'aaa', externalId: 'some-external-id', childCount: 1, - descendantCount: 1, depth: 1, parentValue: 'ab', id: 49, @@ -30,7 +28,6 @@ export const rawData: TagData[] = [ value: 'aa', externalId: 'some-external-id', childCount: 0, - descendantCount: 0, depth: 2, parentValue: 'aaa', id: 52, @@ -42,7 +39,6 @@ export const rawData: TagData[] = [ value: 'ab2', externalId: 'some-external-id', childCount: 1, - descendantCount: 1, depth: 1, parentValue: 'ab', id: 50, @@ -54,7 +50,6 @@ export const rawData: TagData[] = [ value: 'S3', externalId: 'some-external-id', childCount: 0, - descendantCount: 0, depth: 2, parentValue: 'ab2', id: 51, @@ -66,7 +61,6 @@ export const rawData: TagData[] = [ value: 'Brass2', externalId: 'some-external-id', childCount: 0, - descendantCount: 0, depth: 0, parentValue: null, id: 36, @@ -78,7 +72,6 @@ export const rawData: TagData[] = [ value: 'Celli', externalId: 'some-external-id', childCount: 1, - descendantCount: 2, depth: 0, parentValue: null, id: 34, @@ -90,7 +83,6 @@ export const rawData: TagData[] = [ value: 'ViolaDaGamba', externalId: 'some-external-id', childCount: 1, - descendantCount: 1, depth: 1, parentValue: 'Celli', id: 42, @@ -102,7 +94,6 @@ export const rawData: TagData[] = [ value: 'Soprano', externalId: 'some-external-id', childCount: 0, - descendantCount: 0, depth: 2, parentValue: 'ViolaDaGamba', id: 46, @@ -114,7 +105,6 @@ export const rawData: TagData[] = [ value: 'Contrabass', externalId: 'some-external-id', childCount: 0, - descendantCount: 0, depth: 0, parentValue: null, id: 35, @@ -126,7 +116,6 @@ export const rawData: TagData[] = [ value: 'Electrodrum', externalId: 'some-external-id', childCount: 0, - descendantCount: 0, depth: 0, parentValue: null, id: 38, @@ -138,7 +127,6 @@ export const rawData: TagData[] = [ value: 'Electronic instruments', externalId: 'ELECTRIC', childCount: 2, - descendantCount: 2, depth: 0, parentValue: null, id: 3, @@ -150,7 +138,6 @@ export const rawData: TagData[] = [ value: 'Synthesizer', externalId: 'SYNTH', childCount: 0, - descendantCount: 0, depth: 1, parentValue: 'Electronic instruments', id: 25, @@ -162,7 +149,6 @@ export const rawData: TagData[] = [ value: 'Theramin', externalId: 'THERAMIN', childCount: 0, - descendantCount: 0, depth: 1, parentValue: 'Electronic instruments', id: 9, @@ -174,7 +160,6 @@ export const rawData: TagData[] = [ value: 'Fiddle', externalId: 'some-external-id', childCount: 0, - descendantCount: 0, depth: 0, parentValue: null, id: 54, @@ -186,7 +171,6 @@ export const rawData: TagData[] = [ value: 'grand piano', externalId: 'some-external-id', childCount: 0, - descendantCount: 0, depth: 0, parentValue: null, id: 48, @@ -198,7 +182,6 @@ export const rawData: TagData[] = [ value: 'Horns', externalId: 'some-external-id', childCount: 1, - descendantCount: 2, depth: 0, parentValue: null, id: 55, @@ -210,7 +193,6 @@ export const rawData: TagData[] = [ value: 'English Horn', externalId: 'some-external-id', childCount: 1, - descendantCount: 1, depth: 1, parentValue: 'Horns', id: 56, @@ -222,7 +204,6 @@ export const rawData: TagData[] = [ value: 'Small English Horn', externalId: 'some-external-id', childCount: 0, - descendantCount: 0, depth: 2, parentValue: 'English Horn', id: 57, @@ -234,7 +215,6 @@ export const rawData: TagData[] = [ value: 'Keyboard', externalId: 'some-external-id', childCount: 0, - descendantCount: 0, depth: 0, parentValue: null, id: 37, @@ -246,7 +226,6 @@ export const rawData: TagData[] = [ value: 'Kid drum', externalId: 'some-external-id', childCount: 0, - descendantCount: 0, depth: 0, parentValue: null, id: 33, @@ -258,7 +237,6 @@ export const rawData: TagData[] = [ value: 'Mezzosopranocello', externalId: 'some-external-id', childCount: 0, - descendantCount: 0, depth: 0, parentValue: null, id: 41, @@ -270,7 +248,6 @@ export const rawData: TagData[] = [ value: 'Oriental', externalId: 'some-external-id', childCount: 0, - descendantCount: 0, depth: 0, parentValue: null, id: 53, @@ -282,7 +259,6 @@ export const rawData: TagData[] = [ value: 'Percussion instruments', externalId: 'PERCUSS', childCount: 4, - descendantCount: 11, depth: 0, parentValue: null, id: 2, @@ -294,7 +270,6 @@ export const rawData: TagData[] = [ value: 'Chordophone', externalId: 'CHORD', childCount: 1, - descendantCount: 1, depth: 1, parentValue: 'Percussion instruments', id: 10, @@ -306,7 +281,6 @@ export const rawData: TagData[] = [ value: 'Piano', externalId: 'PIANO', childCount: 0, - descendantCount: 0, depth: 2, parentValue: 'Chordophone', id: 29, @@ -318,7 +292,6 @@ export const rawData: TagData[] = [ value: 'Drum', externalId: 'some-external-id', childCount: 1, - descendantCount: 1, depth: 1, parentValue: 'Percussion instruments', id: 45, @@ -330,7 +303,6 @@ export const rawData: TagData[] = [ value: 'bass drum', externalId: 'some-external-id', childCount: 0, - descendantCount: 0, depth: 2, parentValue: 'Drum', id: 47, @@ -342,7 +314,6 @@ export const rawData: TagData[] = [ value: 'Idiophone', externalId: 'BELLS', childCount: 2, - descendantCount: 2, depth: 1, parentValue: 'Percussion instruments', id: 5, @@ -354,7 +325,6 @@ export const rawData: TagData[] = [ value: 'Celesta', externalId: 'CELESTA', childCount: 0, - descendantCount: 0, depth: 2, parentValue: 'Idiophone', id: 26, @@ -366,7 +336,6 @@ export const rawData: TagData[] = [ value: 'Hi-hat', externalId: 'HI-HAT', childCount: 0, - descendantCount: 0, depth: 2, parentValue: 'Idiophone', id: 27, @@ -378,7 +347,6 @@ export const rawData: TagData[] = [ value: 'Membranophone', externalId: 'DRUMS', childCount: 2, - descendantCount: 3, depth: 1, parentValue: 'Percussion instruments', id: 6, @@ -390,7 +358,6 @@ export const rawData: TagData[] = [ value: 'Cajón', externalId: 'CAJÓN', childCount: 1, - descendantCount: 1, depth: 2, parentValue: 'Membranophone', id: 7, @@ -402,7 +369,6 @@ export const rawData: TagData[] = [ value: 'Tabla', externalId: 'TABLA', childCount: 0, - descendantCount: 0, depth: 2, parentValue: 'Membranophone', id: 28, @@ -414,7 +380,6 @@ export const rawData: TagData[] = [ value: 'Recorder', externalId: 'some-external-id', childCount: 0, - descendantCount: 0, depth: 0, parentValue: null, id: 39, @@ -426,7 +391,6 @@ export const rawData: TagData[] = [ value: 'String instruments', externalId: 'STRINGS', childCount: 3, - descendantCount: 9, depth: 0, parentValue: null, id: 4, @@ -438,7 +402,6 @@ export const rawData: TagData[] = [ value: 'Bowed strings', externalId: 'BOW', childCount: 3, - descendantCount: 3, depth: 1, parentValue: 'String instruments', id: 18, @@ -450,7 +413,6 @@ export const rawData: TagData[] = [ value: 'Cello', externalId: 'CELLO', childCount: 0, - descendantCount: 0, depth: 2, parentValue: 'Bowed strings', id: 20, @@ -462,7 +424,6 @@ export const rawData: TagData[] = [ value: 'Viola', externalId: 'some-external-id', childCount: 0, - descendantCount: 0, depth: 2, parentValue: 'Bowed strings', id: 44, @@ -474,7 +435,6 @@ export const rawData: TagData[] = [ value: 'Violin', externalId: 'VIOLIN', childCount: 0, - descendantCount: 0, depth: 2, parentValue: 'Bowed strings', id: 19, @@ -486,7 +446,6 @@ export const rawData: TagData[] = [ value: 'Other strings', externalId: 'some-external-id', childCount: 0, - descendantCount: 0, depth: 1, parentValue: 'String instruments', id: 43, @@ -498,7 +457,6 @@ export const rawData: TagData[] = [ value: 'Plucked strings', externalId: 'PLUCK', childCount: 3, - descendantCount: 3, depth: 1, parentValue: 'String instruments', id: 14, @@ -510,7 +468,6 @@ export const rawData: TagData[] = [ value: 'Banjo', externalId: 'BANJO', childCount: 0, - descendantCount: 0, depth: 2, parentValue: 'Plucked strings', id: 17, @@ -522,7 +479,6 @@ export const rawData: TagData[] = [ value: 'Harp', externalId: 'HARP', childCount: 0, - descendantCount: 0, depth: 2, parentValue: 'Plucked strings', id: 16, @@ -534,7 +490,6 @@ export const rawData: TagData[] = [ value: 'Mandolin', externalId: 'MANDOLIN', childCount: 0, - descendantCount: 0, depth: 2, parentValue: 'Plucked strings', id: 15, @@ -546,7 +501,6 @@ export const rawData: TagData[] = [ value: 'Subbass', externalId: 'some-external-id', childCount: 0, - descendantCount: 0, depth: 0, parentValue: null, id: 40, @@ -558,7 +512,6 @@ export const rawData: TagData[] = [ value: 'Trumpets', externalId: 'some-external-id', childCount: 0, - descendantCount: 0, depth: 0, parentValue: null, id: 30, @@ -570,7 +523,6 @@ export const rawData: TagData[] = [ value: 'Wind instruments', externalId: 'WINDS', childCount: 2, - descendantCount: 7, depth: 0, parentValue: null, id: 1, @@ -582,7 +534,6 @@ export const rawData: TagData[] = [ value: 'Brass', externalId: 'BRASS', childCount: 2, - descendantCount: 2, depth: 1, parentValue: 'Wind instruments', id: 11, @@ -594,7 +545,6 @@ export const rawData: TagData[] = [ value: 'Trumpet', externalId: 'TRUMPET', childCount: 0, - descendantCount: 0, depth: 2, parentValue: 'Brass', id: 23, @@ -606,7 +556,6 @@ export const rawData: TagData[] = [ value: 'Tuba', externalId: 'TUBA', childCount: 0, - descendantCount: 0, depth: 2, parentValue: 'Brass', id: 24, @@ -618,7 +567,6 @@ export const rawData: TagData[] = [ value: 'Woodwinds', externalId: 'WOODS', childCount: 3, - descendantCount: 3, depth: 1, parentValue: 'Wind instruments', id: 12, @@ -630,7 +578,6 @@ export const rawData: TagData[] = [ value: 'Clarinet', externalId: 'CLARINET', childCount: 0, - descendantCount: 0, depth: 2, parentValue: 'Woodwinds', id: 21, @@ -642,7 +589,6 @@ export const rawData: TagData[] = [ value: 'Flute', externalId: 'FLUTE', childCount: 0, - descendantCount: 0, depth: 2, parentValue: 'Woodwinds', id: 13, @@ -654,7 +600,6 @@ export const rawData: TagData[] = [ value: 'Oboe', externalId: 'OBOE', childCount: 0, - descendantCount: 0, depth: 2, parentValue: 'Woodwinds', id: 22, @@ -666,7 +611,6 @@ export const rawData: TagData[] = [ value: 'Xyllophones', externalId: 'some-external-id', childCount: 0, - descendantCount: 0, depth: 0, parentValue: null, id: 32, @@ -681,7 +625,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'ab', externalId: 'some-external-id', childCount: 2, - descendantCount: 4, depth: 0, parentValue: null, id: 31, @@ -693,7 +636,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'aaa', externalId: 'some-external-id', childCount: 1, - descendantCount: 1, depth: 1, parentValue: 'ab', id: 49, @@ -705,7 +647,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'aa', externalId: 'some-external-id', childCount: 0, - descendantCount: 0, depth: 2, parentValue: 'aaa', id: 52, @@ -719,7 +660,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'ab2', externalId: 'some-external-id', childCount: 1, - descendantCount: 1, depth: 1, parentValue: 'ab', id: 50, @@ -731,7 +671,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'S3', externalId: 'some-external-id', childCount: 0, - descendantCount: 0, depth: 2, parentValue: 'ab2', id: 51, @@ -747,7 +686,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Brass2', externalId: 'some-external-id', childCount: 0, - descendantCount: 0, depth: 0, parentValue: null, id: 36, @@ -759,7 +697,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Celli', externalId: 'some-external-id', childCount: 1, - descendantCount: 2, depth: 0, parentValue: null, id: 34, @@ -771,7 +708,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'ViolaDaGamba', externalId: 'some-external-id', childCount: 1, - descendantCount: 1, depth: 1, parentValue: 'Celli', id: 42, @@ -783,7 +719,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Soprano', externalId: 'some-external-id', childCount: 0, - descendantCount: 0, depth: 2, parentValue: 'ViolaDaGamba', id: 46, @@ -799,7 +734,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Contrabass', externalId: 'some-external-id', childCount: 0, - descendantCount: 0, depth: 0, parentValue: null, id: 35, @@ -811,7 +745,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Electrodrum', externalId: 'some-external-id', childCount: 0, - descendantCount: 0, depth: 0, parentValue: null, id: 38, @@ -823,7 +756,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Electronic instruments', externalId: 'ELECTRIC', childCount: 2, - descendantCount: 2, depth: 0, parentValue: null, id: 3, @@ -835,7 +767,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Synthesizer', externalId: 'SYNTH', childCount: 0, - descendantCount: 0, depth: 1, parentValue: 'Electronic instruments', id: 25, @@ -847,7 +778,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Theramin', externalId: 'THERAMIN', childCount: 0, - descendantCount: 0, depth: 1, parentValue: 'Electronic instruments', id: 9, @@ -861,7 +791,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Fiddle', externalId: 'some-external-id', childCount: 0, - descendantCount: 0, depth: 0, parentValue: null, id: 54, @@ -873,7 +802,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'grand piano', externalId: 'some-external-id', childCount: 0, - descendantCount: 0, depth: 0, parentValue: null, id: 48, @@ -885,7 +813,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Horns', externalId: 'some-external-id', childCount: 1, - descendantCount: 2, depth: 0, parentValue: null, id: 55, @@ -897,7 +824,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'English Horn', externalId: 'some-external-id', childCount: 1, - descendantCount: 1, depth: 1, parentValue: 'Horns', id: 56, @@ -909,7 +835,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Small English Horn', externalId: 'some-external-id', childCount: 0, - descendantCount: 0, depth: 2, parentValue: 'English Horn', id: 57, @@ -925,7 +850,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Keyboard', externalId: 'some-external-id', childCount: 0, - descendantCount: 0, depth: 0, parentValue: null, id: 37, @@ -937,7 +861,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Kid drum', externalId: 'some-external-id', childCount: 0, - descendantCount: 0, depth: 0, parentValue: null, id: 33, @@ -949,7 +872,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Mezzosopranocello', externalId: 'some-external-id', childCount: 0, - descendantCount: 0, depth: 0, parentValue: null, id: 41, @@ -961,7 +883,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Oriental', externalId: 'some-external-id', childCount: 0, - descendantCount: 0, depth: 0, parentValue: null, id: 53, @@ -973,7 +894,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Percussion instruments', externalId: 'PERCUSS', childCount: 4, - descendantCount: 11, depth: 0, parentValue: null, id: 2, @@ -985,7 +905,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Chordophone', externalId: 'CHORD', childCount: 1, - descendantCount: 1, depth: 1, parentValue: 'Percussion instruments', id: 10, @@ -997,7 +916,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Piano', externalId: 'PIANO', childCount: 0, - descendantCount: 0, depth: 2, parentValue: 'Chordophone', id: 29, @@ -1011,7 +929,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Drum', externalId: 'some-external-id', childCount: 1, - descendantCount: 1, depth: 1, parentValue: 'Percussion instruments', id: 45, @@ -1023,7 +940,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'bass drum', externalId: 'some-external-id', childCount: 0, - descendantCount: 0, depth: 2, parentValue: 'Drum', id: 47, @@ -1037,7 +953,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Idiophone', externalId: 'BELLS', childCount: 2, - descendantCount: 2, depth: 1, parentValue: 'Percussion instruments', id: 5, @@ -1049,7 +964,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Celesta', externalId: 'CELESTA', childCount: 0, - descendantCount: 0, depth: 2, parentValue: 'Idiophone', id: 26, @@ -1061,7 +975,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Hi-hat', externalId: 'HI-HAT', childCount: 0, - descendantCount: 0, depth: 2, parentValue: 'Idiophone', id: 27, @@ -1075,7 +988,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Membranophone', externalId: 'DRUMS', childCount: 2, - descendantCount: 3, depth: 1, parentValue: 'Percussion instruments', id: 6, @@ -1087,7 +999,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Cajón', externalId: 'CAJÓN', childCount: 1, - descendantCount: 1, depth: 2, parentValue: 'Membranophone', id: 7, @@ -1099,7 +1010,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Tabla', externalId: 'TABLA', childCount: 0, - descendantCount: 0, depth: 2, parentValue: 'Membranophone', id: 28, @@ -1115,7 +1025,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Recorder', externalId: 'some-external-id', childCount: 0, - descendantCount: 0, depth: 0, parentValue: null, id: 39, @@ -1127,7 +1036,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'String instruments', externalId: 'STRINGS', childCount: 3, - descendantCount: 9, depth: 0, parentValue: null, id: 4, @@ -1139,7 +1047,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Bowed strings', externalId: 'BOW', childCount: 3, - descendantCount: 3, depth: 1, parentValue: 'String instruments', id: 18, @@ -1151,7 +1058,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Cello', externalId: 'CELLO', childCount: 0, - descendantCount: 0, depth: 2, parentValue: 'Bowed strings', id: 20, @@ -1163,7 +1069,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Viola', externalId: 'some-external-id', childCount: 0, - descendantCount: 0, depth: 2, parentValue: 'Bowed strings', id: 44, @@ -1175,7 +1080,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Violin', externalId: 'VIOLIN', childCount: 0, - descendantCount: 0, depth: 2, parentValue: 'Bowed strings', id: 19, @@ -1189,7 +1093,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Other strings', externalId: 'some-external-id', childCount: 0, - descendantCount: 0, depth: 1, parentValue: 'String instruments', id: 43, @@ -1201,7 +1104,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Plucked strings', externalId: 'PLUCK', childCount: 3, - descendantCount: 3, depth: 1, parentValue: 'String instruments', id: 14, @@ -1213,7 +1115,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Banjo', externalId: 'BANJO', childCount: 0, - descendantCount: 0, depth: 2, parentValue: 'Plucked strings', id: 17, @@ -1225,7 +1126,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Harp', externalId: 'HARP', childCount: 0, - descendantCount: 0, depth: 2, parentValue: 'Plucked strings', id: 16, @@ -1237,7 +1137,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Mandolin', externalId: 'MANDOLIN', childCount: 0, - descendantCount: 0, depth: 2, parentValue: 'Plucked strings', id: 15, @@ -1253,7 +1152,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Subbass', externalId: 'some-external-id', childCount: 0, - descendantCount: 0, depth: 0, parentValue: null, id: 40, @@ -1265,7 +1163,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Trumpets', externalId: 'some-external-id', childCount: 0, - descendantCount: 0, depth: 0, parentValue: null, id: 30, @@ -1277,7 +1174,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Wind instruments', externalId: 'WINDS', childCount: 2, - descendantCount: 7, depth: 0, parentValue: null, id: 1, @@ -1289,7 +1185,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Brass', externalId: 'BRASS', childCount: 2, - descendantCount: 2, depth: 1, parentValue: 'Wind instruments', id: 11, @@ -1301,7 +1196,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Trumpet', externalId: 'TRUMPET', childCount: 0, - descendantCount: 0, depth: 2, parentValue: 'Brass', id: 23, @@ -1313,7 +1207,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Tuba', externalId: 'TUBA', childCount: 0, - descendantCount: 0, depth: 2, parentValue: 'Brass', id: 24, @@ -1327,7 +1220,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Woodwinds', externalId: 'WOODS', childCount: 3, - descendantCount: 3, depth: 1, parentValue: 'Wind instruments', id: 12, @@ -1339,7 +1231,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Clarinet', externalId: 'CLARINET', childCount: 0, - descendantCount: 0, depth: 2, parentValue: 'Woodwinds', id: 21, @@ -1351,7 +1242,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Flute', externalId: 'FLUTE', childCount: 0, - descendantCount: 0, depth: 2, parentValue: 'Woodwinds', id: 13, @@ -1363,7 +1253,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Oboe', externalId: 'OBOE', childCount: 0, - descendantCount: 0, depth: 2, parentValue: 'Woodwinds', id: 22, @@ -1379,7 +1268,6 @@ export const treeRowData: TagTreeNode[] = [ value: 'Xyllophones', externalId: 'some-external-id', childCount: 0, - descendantCount: 0, depth: 0, parentValue: null, id: 32, diff --git a/src/taxonomy/tag-list/tagColumns.tsx b/src/taxonomy/tag-list/tagColumns.tsx index 2fad2e25c6..8b3291302e 100644 --- a/src/taxonomy/tag-list/tagColumns.tsx +++ b/src/taxonomy/tag-list/tagColumns.tsx @@ -24,7 +24,6 @@ import OptionalExpandLink from './OptionalExpandLink'; interface TagListRowData extends TreeRowData { depth: number; childCount: number; - descendantCount: number; usageCount?: number; isNew?: boolean; isEditing?: boolean; diff --git a/src/taxonomy/tag-list/tagTree.test.ts b/src/taxonomy/tag-list/tagTree.test.ts index 068005adb5..12e4d2103b 100644 --- a/src/taxonomy/tag-list/tagTree.test.ts +++ b/src/taxonomy/tag-list/tagTree.test.ts @@ -13,7 +13,6 @@ const newChildNode: TagData = { parentValue: 'ab', subTagsUrl: null, childCount: 0, - descendantCount: 0, depth: 1, }; @@ -70,7 +69,6 @@ describe('TagTree', () => { parentValue: null, subTagsUrl: null, childCount: 0, - descendantCount: 0, depth: 0, }; tree.addNode(newRow, null); @@ -151,7 +149,6 @@ describe('TagTree', () => { parentValue: 'missing-parent', subTagsUrl: null, childCount: 0, - descendantCount: 0, depth: 1, }, ]; @@ -173,7 +170,6 @@ describe('TagTree', () => { parentValue: null, subTagsUrl: null, childCount: 0, - descendantCount: 0, depth: 0, }, { @@ -185,7 +181,6 @@ describe('TagTree', () => { parentValue: null, subTagsUrl: null, childCount: 0, - descendantCount: 0, depth: 0, }, ]; @@ -204,7 +199,6 @@ describe('TagTree', () => { parentValue: 'b', subTagsUrl: null, childCount: 1, - descendantCount: 1, depth: 0, }, { @@ -216,7 +210,6 @@ describe('TagTree', () => { parentValue: 'a', subTagsUrl: null, childCount: 1, - descendantCount: 1, depth: 1, }, ]; @@ -241,7 +234,6 @@ describe('TagTree', () => { parentValue: null, subTagsUrl: null, childCount: 0, - descendantCount: 0, depth: 0, }; @@ -259,7 +251,6 @@ describe('TagTree', () => { parentValue: null, subTagsUrl: null, childCount: 0, - descendantCount: 0, depth: 0, }; @@ -275,7 +266,6 @@ describe('TagTree', () => { parentValue: null, subTagsUrl: null, childCount: 0, - descendantCount: 0, depth: 0, }; tree.addNode(nextNewNode, null); // Add another top-level node @@ -294,7 +284,6 @@ describe('TagTree', () => { parentValue: 'ab', subTagsUrl: null, childCount: 0, - descendantCount: 0, depth: 1, }; @@ -312,7 +301,6 @@ describe('TagTree', () => { parentValue: 'ab', subTagsUrl: null, childCount: 0, - descendantCount: 0, depth: 1, }; tree.addNode(nextNewChild, 'ab'); // Add another child to 'ab' diff --git a/src/taxonomy/tag-list/tagTree.ts b/src/taxonomy/tag-list/tagTree.ts index 881e3dc623..06d43a04b6 100644 --- a/src/taxonomy/tag-list/tagTree.ts +++ b/src/taxonomy/tag-list/tagTree.ts @@ -30,7 +30,6 @@ export class TagTree { * value: 'parent tag name', * externalId: null, * childCount: 2, - * descendantCount: 4, * depth: 0, * parentValue: null, * id: 1, @@ -42,7 +41,6 @@ export class TagTree { * value: 'child tag name', * externalId: null, * childCount: 0, - * descendantCount: 0, * depth: 1, * parentValue: 'parent tag name', * id: 2,