Remove goal component type

Author: AJamesPhillips

app/frontend/src/home/LandingPage.tsx

@@ -128,10 +128,6 @@ export function LandingPage()
                         DataCurator is for anyone trying to understand a complex system and intervene in it, who has a lot of information to understand and interpret.
                     </p>
 
-                    <p>
-                        Use it for simple note-taking and organizing, or model and plan an entire intervention. Choose key indicators to simplify the map or use the goal-priority view to keep your goals on track.
-                    </p>
-
                     <h3>
                         How do I get started?
                     </h3>

app/frontend/src/state/derived/State.ts

@@ -59,7 +59,6 @@ export interface ComposedKnowledgeView extends Omit<KnowledgeView, "wc_id_map" |
 
     wc_id_connections_map: {[wc_id: string]: Set<string>}
     active_judgement_or_objective_ids_by_target_id: { [target_wcomponent_id: string]: string[] }
-    active_judgement_or_objective_ids_by_goal_or_action_id: { [target_wcomponent_id: string]: string[] }
 
 
     composed_datetime_line_config: ComposedDatetimeLineConfig
@@ -76,7 +75,7 @@ export interface ComposedKnowledgeView extends Omit<KnowledgeView, "wc_id_map" |
 }
 
 
-type ExtendedWComponentType = WComponentType | "judgement_or_objective" | "goal_or_action" | "has_objectives" | "any_link" | "any_node" | "any_state_VAPs" | "has_single_datetime"
+type ExtendedWComponentType = WComponentType | "judgement_or_objective" | "has_objectives" | "any_link" | "any_node" | "any_state_VAPs" | "has_single_datetime"
 export type WComponentIdsByType = { [t in ExtendedWComponentType]: Set<string> }
 
 
@@ -94,7 +93,6 @@ export interface DerivedState
     nested_knowledge_view_ids: NestedKnowledgeViewIds
 
     judgement_or_objective_ids_by_target_id: { [target_wcomponent_id: string]: string[] }
-    judgement_or_objective_ids_by_goal_or_action_id: { [goal_wcomponent_id: string]: string[] }
 
     current_composed_knowledge_view: ComposedKnowledgeView | undefined
 }

app/frontend/src/state/derived/get_wcomponent_ids_by_type.ts

@@ -25,10 +25,8 @@ export function get_empty_wcomponent_ids_by_type (): WComponentIdsByType
         judgement: new Set(),
         objective: new Set(),
         counterfactualv2: new Set(),
-        goal: new Set(),
 
         judgement_or_objective: new Set(),
-        goal_or_action: new Set(),
         has_objectives: new Set(),
         any_link: new Set(),
         any_node: new Set(),
@@ -63,9 +61,6 @@ export function get_wcomponent_ids_by_type (wcomponents_by_id: WComponentsById,
     })
 
     wc_ids_by_type.judgement_or_objective = set_union(wc_ids_by_type.judgement, wc_ids_by_type.objective)
-    wc_ids_by_type.goal_or_action = set_union(wc_ids_by_type.goal, wc_ids_by_type.action)
-    // Need to keep in sync with wcomponent_has_objectives
-    wc_ids_by_type.has_objectives = set_union(wc_ids_by_type.action, wc_ids_by_type.goal)
     wc_ids_by_type.any_link = set_union(wc_ids_by_type.causal_link, wc_ids_by_type.relation_link)
     wc_ids_by_type.any_node = set_difference(new Set(ids), wc_ids_by_type.any_link)
     // Need to keep in sync with wcomponent_is_allowed_to_have_state_VAP_sets

app/frontend/src/state/derived/knowledge_views/knowledge_views_derived_reducer.ts

@@ -173,7 +173,6 @@ export function calculate_composed_knowledge_view (args: CalculateComposedKnowle
     const current_composed_knowledge_view = args.current_composed_knowledge_view || {
         composed_visible_wc_id_map: {},
         active_judgement_or_objective_ids_by_target_id: {},
-        active_judgement_or_objective_ids_by_goal_or_action_id: {},
         filters: {
             wc_ids_excluded_by_any_filter: new Set(),
             wc_ids_excluded_by_filters: new Set(),

app/frontend/src/state/derived/reducer.ts

@@ -1,8 +1,8 @@
 import { is_defined } from "../../shared/utils/is_defined"
 import { SortDirection, sort_list } from "../../shared/utils/sort"
 import { update_substate } from "../../utils/update_state"
-import type { WComponentHasObjectives, WComponentJudgement } from "../../wcomponent/interfaces/judgement"
-import { wcomponent_is_goal, wcomponent_is_judgement_or_objective } from "../../wcomponent/interfaces/SpecialisedObjects"
+import type { WComponentJudgement } from "../../wcomponent/interfaces/judgement"
+import { wcomponent_is_judgement_or_objective } from "../../wcomponent/interfaces/SpecialisedObjects"
 import { default_wcomponent_validity_value, get_wcomponent_validity_value } from "../../wcomponent_derived/get_wcomponent_validity_value"
 import { get_wcomponents_from_state } from "../specialised_objects/accessors"
 import type { RootState } from "../State"
@@ -26,13 +26,6 @@ export function derived_state_reducer (prev_state: RootState, state: RootState)
 
         const judgement_or_objective_ids_by_target_id = update_judgement_or_objective_ids_by_target_id(judgement_or_objectives)
         state = update_substate(state, "derived", "judgement_or_objective_ids_by_target_id", judgement_or_objective_ids_by_target_id)
-
-        const goals = get_wcomponents_from_state(state, state.derived.wcomponent_ids_by_type.goal)
-            .filter(is_defined)
-            .filter(wcomponent_is_goal)
-
-        const judgement_or_objective_ids_by_goal_or_action_id = update_judgement_or_objective_ids_by_goal_or_action_id(goals)
-        state = update_substate(state, "derived", "judgement_or_objective_ids_by_goal_or_action_id", judgement_or_objective_ids_by_goal_or_action_id)
     }
 
 
@@ -79,23 +72,6 @@ function update_judgement_or_objective_ids_by_target_id (judgement_or_objectives
 }
 
 
-
-function update_judgement_or_objective_ids_by_goal_or_action_id (goals_and_actions: WComponentHasObjectives[])
-{
-    const judgement_or_objective_ids_by_goal_or_action_id: { [goal_or_action_id: string]: string[] } = {}
-
-    goals_and_actions
-    // .sort () // some kind of sort so that front end display is stable and predictable
-    .forEach(({ id: goal_or_action_id, objective_ids }) =>
-    {
-        judgement_or_objective_ids_by_goal_or_action_id[goal_or_action_id] = objective_ids || []
-    })
-
-    return judgement_or_objective_ids_by_goal_or_action_id
-}
-
-
-
 function conditionally_update_active_judgement_or_objective_ids (prev_state: RootState, state: RootState): RootState
 {
     let { current_composed_knowledge_view } = state.derived
@@ -111,12 +87,10 @@ function conditionally_update_active_judgement_or_objective_ids (prev_state: Roo
 
     // todo: we should update when the order of elements in current_composed_knowledge_view
     // changes so that ... <todo insert reason.  Perhaps it's so that the list of judgements / objectives
-    // are in the correct order when they are rendered on/for their targets and for their goals or actions?>
+    // are in the correct order when they are rendered on/for their targets and for their actions?>
     if (current_composed_knowledge_view && (kv_id_changed || judgement_or_objective_ids_by_target_id_changed || created_at_ms_changed || sim_ms_changed))
     {
         const active_judgement_or_objective_ids_by_target_id: { [id: string]: string[] } = {}
-        const active_judgement_or_objective_ids_by_goal_or_action_id: { [id: string]: string[] } = {}
-
 
         const { wc_ids_by_type, composed_visible_wc_id_map } = current_composed_knowledge_view
         const judgement_or_objectives = get_judgement_or_objectives(state, wc_ids_by_type.judgement_or_objective)
@@ -153,15 +127,12 @@ function conditionally_update_active_judgement_or_objective_ids (prev_state: Roo
 
         const {
             judgement_or_objective_ids_by_target_id,
-            judgement_or_objective_ids_by_goal_or_action_id,
         } = state.derived
 
         Object.keys(composed_visible_wc_id_map)
         .forEach(id =>
         {
             const target_ids = judgement_or_objective_ids_by_target_id[id]
-            const ids_from_goal_or_action = judgement_or_objective_ids_by_goal_or_action_id[id]
-
             if (target_ids)
             {
                 const active_judgement_or_objective_ids = target_ids.filter(judgement_or_objective_id_is_active)
@@ -172,24 +143,12 @@ function conditionally_update_active_judgement_or_objective_ids (prev_state: Roo
                     active_judgement_or_objective_ids_by_target_id[id] = sorted
                 }
             }
-
-            if (ids_from_goal_or_action)
-            {
-                const active_judgement_or_objective_ids = ids_from_goal_or_action.filter(judgement_or_objective_id_is_active)
-                if (active_judgement_or_objective_ids.length)
-                {
-                    const sorted = sort_list(active_judgement_or_objective_ids, get_wcomponent_ids_sort_key, SortDirection.descending)
-
-                    active_judgement_or_objective_ids_by_goal_or_action_id[id] = sorted
-                }
-            }
         })
 
 
         current_composed_knowledge_view = {
             ...current_composed_knowledge_view,
             active_judgement_or_objective_ids_by_target_id,
-            active_judgement_or_objective_ids_by_goal_or_action_id,
         }
         state = update_substate(state, "derived", "current_composed_knowledge_view", current_composed_knowledge_view)
     }

app/frontend/src/state/derived/starting_state.ts

@@ -13,7 +13,6 @@ export function get_derived_starting_state (): DerivedState
         nested_knowledge_view_ids: { top_ids: [], map: {} },
 
         judgement_or_objective_ids_by_target_id: {},
-        judgement_or_objective_ids_by_goal_or_action_id: {},
 
         current_composed_knowledge_view: undefined,
     }

app/frontend/src/state/specialised_objects/get_default_parent_action_ids.ts

@@ -0,0 +1,18 @@
+import type { KnowledgeViewsById } from "../../shared/interfaces/knowledge_view"
+import { WComponentsById, wcomponent_is_action } from "../../wcomponent/interfaces/SpecialisedObjects"
+
+
+
+export function get_default_parent_action_ids (knowledge_view_id: string | undefined, knowledge_views_by_id: KnowledgeViewsById, wcomponents_by_id: WComponentsById)
+{
+    let kv = knowledge_view_id ? knowledge_views_by_id[knowledge_view_id] : undefined
+
+    while (kv)
+    {
+        const wc = wcomponents_by_id[kv.id]
+        if (wcomponent_is_action(wc)) return [wc.id]
+        kv = kv.parent_knowledge_view_id ? knowledge_views_by_id[kv.parent_knowledge_view_id] : undefined
+    }
+
+    return []
+}

app/frontend/src/state/specialised_objects/get_default_parent_goal_or_action_ids.ts

@@ -23,7 +23,7 @@ import {
     get_current_composed_knowledge_view_from_state,
     get_wcomponent_from_state,
 } from "../accessors"
-import { get_default_parent_goal_or_action_ids } from "../get_default_parent_goal_or_action_ids"
+import { get_default_parent_action_ids } from "../get_default_parent_action_ids"
 import type { AddToKnowledgeViewArgs } from "./actions"
 
 
@@ -108,7 +108,7 @@ function set_parent_goal_or_action_ids (wcomponent: WComponent, state: RootState
     const { wcomponents_by_id, knowledge_views_by_id } = state.specialised_objects
 
     const knowledge_view_id = composed_knowledge_view?.id
-    const parent_goal_or_action_ids = get_default_parent_goal_or_action_ids(knowledge_view_id, knowledge_views_by_id, wcomponents_by_id)
+    const parent_goal_or_action_ids = get_default_parent_action_ids(knowledge_view_id, knowledge_views_by_id, wcomponents_by_id)
 
     return {
         ...wcomponent,

app/frontend/src/state/specialised_objects/wcomponents/create_wcomponent_type.ts

@@ -3,7 +3,6 @@ import { get_new_id } from "datacurator-core/utils/ids"
 
 import type { HasBaseId } from "../../shared/interfaces/base"
 import type { WComponentNodeAction } from "../interfaces/action"
-import type { WComponentNodeGoal } from "../interfaces/goal"
 import type { WComponentJudgement } from "../interfaces/judgement"
 import { WComponent, WComponentConnection, WComponentNode, wcomponent_is_causal_link } from "../interfaces/SpecialisedObjects"
 import type { WComponentNodeStateV2 } from "../interfaces/state"
@@ -78,16 +77,6 @@ export function prepare_new_contextless_wcomponent_object (partial_wcomponent: P
         }
         wcomponent = statev2
     }
-    else if (partial_wcomponent.type === "goal")
-    {
-        const goal: WComponentNodeGoal = {
-            ...base,
-            objective_ids: [],
-            ...partial_wcomponent,
-            type: partial_wcomponent.type, // only added to remove type warning
-        }
-        wcomponent = goal
-    }
     else if (partial_wcomponent.type === "action")
     {
         const action: WComponentNodeAction = {