Skip to content

Commit

Permalink
🔨 revert variable mdim refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
danyx23 committed Nov 4, 2024
1 parent 2f1ebae commit 4cf6efb
Showing 1 changed file with 8 additions and 11 deletions.
19 changes: 8 additions & 11 deletions site/multiDim/MultiDimDataPageContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ const useVarDatapageData = (
null
)
const [grapherConfigIsReady, setGrapherConfigIsReady] = useState(false)
const [variableId, setVariableId] = useState<number | null>(null)

useEffect(() => {
setGrapherConfigIsReady(false)
Expand All @@ -151,7 +150,6 @@ const useVarDatapageData = (
? yIndicatorOrIndicators[0]
: yIndicatorOrIndicators
if (!variableId) return
setVariableId(variableId)

const datapageDataPromise = cachedGetVariableMetadata(variableId).then(
(json) =>
Expand Down Expand Up @@ -194,7 +192,6 @@ const useVarDatapageData = (
varDatapageData,
varGrapherConfig: grapherConfig,
grapherConfigIsReady,
variableId,
}
}

Expand Down Expand Up @@ -231,12 +228,8 @@ export const MultiDimDataPageContent = ({
})

const currentView = useView(currentSettings, config)
const {
varDatapageData,
varGrapherConfig,
grapherConfigIsReady,
variableId,
} = useVarDatapageData(config, currentView)
const { varDatapageData, varGrapherConfig, grapherConfigIsReady } =
useVarDatapageData(config, currentView)

// This is the ACTUAL grapher instance being used, because GrapherFigureView/GrapherWithFallback are doing weird things and are not actually using the grapher instance we pass into it
// and therefore we can not access the grapher state (e.g. tab, selection) from the grapher instance we pass into it
Expand Down Expand Up @@ -285,7 +278,11 @@ export const MultiDimDataPageContent = ({
}

if (!grapherConfigIsReady) return baseConfig
const editUrl = variableId ? `variables/${variableId}/config` : ""
const variables = currentView?.indicators?.["y"]
const editUrl =
variables?.length === 1
? `variables/${variables[0]}/config`
: undefined
return {
...varGrapherConfig,
...baseConfig,
Expand All @@ -300,7 +297,7 @@ export const MultiDimDataPageContent = ({
grapherConfigIsReady,
bounds,
canonicalUrl,
variableId,
currentView?.indicators,
])

const hasTopicTags = !!config.config.topicTags?.length
Expand Down

0 comments on commit 4cf6efb

Please sign in to comment.