Normalization fixes

kausaltech · Nov 29, 2024 · 64c37df · 64c37df
1 parent 93c67b6
commit 64c37df
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 9 deletions.
diff --git a/components/Header.tsx b/components/Header.tsx
@@ -133,7 +133,6 @@ function Header() {
 
   const googleAnalyticsId = theme.settings?.googleAnalyticsId;
 
-  console.log('navlinks', navLinks);
   return (
     <header style={{ position: 'relative' }}>
       <SkipToContent />

diff --git a/components/paths/InventoryNodeSummary.tsx b/components/paths/InventoryNodeSummary.tsx
@@ -69,6 +69,7 @@ type PathsBasicNodeContentProps = {
   node: CausalGridNodeFragment;
   onLoaded: (id: string, impact: number) => void;
   displayGoals: InstanceGoalEntry[];
+  refetching: boolean;
 };
 
 type EmissionDisplay = {
@@ -86,7 +87,7 @@ type Emissions = {
 };
 
 const InventoryNodeSummary = (props: PathsBasicNodeContentProps) => {
-  const { categoryId, node, onLoaded, displayGoals } = props;
+  const { categoryId, node, onLoaded, displayGoals, refetching } = props;
   const yearRange = useReactiveVar(yearRangeVar);
   const format = useFormatter();
 
@@ -197,7 +198,7 @@ const InventoryNodeSummary = (props: PathsBasicNodeContentProps) => {
     onLoaded(categoryId, 100);
     // using exhausive deps here causes an infinite loop
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [yearRange[1]]);
+  }, [yearRange[1], refetching]);
 
   return (
     <>

diff --git a/components/paths/PathsNodeSummary.tsx b/components/paths/PathsNodeSummary.tsx
@@ -101,6 +101,7 @@ const PathsNodeSummary = React.memo((props: PathsNodeContentProps) => {
           node={data.node}
           onLoaded={onLoaded ? onLoaded : () => void 0}
           displayGoals={displayGoals}
+          refetching={refetching}
         />
       );
     }

diff --git a/components/paths/toolbar/CompleteSettings.tsx b/components/paths/toolbar/CompleteSettings.tsx
@@ -167,11 +167,6 @@ const CompleteSettings = (props) => {
                     <h5>{t('change-scenario')}</h5>
                     <ScenarioSelector />
                   </Widget>
-                  <Widget>
-                    <h5>{t('actions')}</h5>
-                    {/*<ActionsSummary activeScenario={activeScenario} />*/}
-                    (coming soon)
-                  </Widget>
                   <Widget>
                     {hasGlobalParameters && (
                       <>

diff --git a/components/paths/toolbar/GoalOutcomeBar.tsx b/components/paths/toolbar/GoalOutcomeBar.tsx
@@ -190,7 +190,7 @@ const outcomeAsText = (
 ) => {
   if (isForecast)
     return t.markup('outcome-bar-summary-forecast', {
-      scenarioName: 'sfsdfsd',
+      scenarioName: scenarioName,
       goalType: goalType,
       selectedYear: selectedYear,
       selectedYearValue: selectedYearValue,

diff --git a/utils/paths/PathsActionNode.ts b/utils/paths/PathsActionNode.ts
@@ -29,6 +29,8 @@ export default class PathsActionNode {
 
   getUnit(): string | null | undefined {
     return (
+      this.data.metricDim?.unit?.htmlShort ||
+      this.data.metricDim?.unit?.short ||
       this.data.unit?.htmlShort ||
       this.data.unit?.htmlLong ||
       this.data.unit?.short ||