Skip to content

Update of Nextjs and other packages #289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: dev
Choose a base branch
from
Open

Update of Nextjs and other packages #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b09b70b
NextJS updated to version 15
Abhishekfm Sep 11, 2025
3937109
Update of react-query and other packages
Abhishekfm Sep 18, 2025
f84207c
Lock file updated
Abhishekfm Sep 18, 2025
90dc39c
Ci Issue
Abhishekfm Sep 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
182 changes: 86 additions & 96 deletions app/[locale]/[state]/analytics/components/analytics-layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,14 @@ export function AnalyticsMainLayout() {
const [view, setView] = useQueryState('view');
const routerParams = useParams();

const statesListData = useQuery([`states_list`], () =>
GraphQL(
`${process.env.NEXT_PUBLIC_DATA_MANAGEMENT_LAYER_URL}/graphql`,
PLATFORM_STATES_LIST
)
);
const statesListData = useQuery({
queryKey: [`states_list`],
queryFn: () =>
GraphQL(
`${process.env.NEXT_PUBLIC_DATA_MANAGEMENT_LAYER_URL}/graphql`,
PLATFORM_STATES_LIST
),
});

const [currentSelectedState, setCurrentSelectedState] = useState(
statesListData.data?.getStates.find(
Expand All @@ -81,11 +83,11 @@ export function AnalyticsMainLayout() {

// const stateCode = STATE_CODES[routerParams.state as keyof typeof STATE_CODES];

const mapData = useQuery(
[
const mapData = useQuery({
queryKey: [
`mapQuery_district_${currentSelectedState.code}_${indicator}_${timePeriodSelected}`,
],
() =>
queryFn: () =>
GraphQL(
`${process.env.NEXT_PUBLIC_DATA_MANAGEMENT_LAYER_URL}/graphql`,
ANALYTICS_DISTRICT_MAP_DATA,
Expand All @@ -97,19 +99,18 @@ export function AnalyticsMainLayout() {
},
}
),
{
enabled: Boolean(view === 'map'),
refetchOnMount: false,
refetchOnWindowFocus: false,
refetchOnReconnect: false,
}
);

const revenueMapData = useQuery(
[
enabled: Boolean(view === 'map'),
refetchOnMount: false,
refetchOnWindowFocus: false,
refetchOnReconnect: false,
});

const revenueMapData = useQuery({
queryKey: [
`mapQuery_revenue-circle_${currentSelectedState.code}_${indicator}_${timePeriodSelected}`,
],
() =>
queryFn: () =>
GraphQL(
`${process.env.NEXT_PUBLIC_DATA_MANAGEMENT_LAYER_URL}/graphql`,
ANALYTICS_REVENUE_MAP_DATA,
Expand All @@ -121,17 +122,16 @@ export function AnalyticsMainLayout() {
},
}
),
{
enabled: Boolean(view === 'map'),
refetchOnMount: false,
refetchOnWindowFocus: false,
refetchOnReconnect: false,
}
);

const districtGeographiesData = useQuery(
[`geographies_data_district_${currentSelectedState.code}`],
() =>
enabled: Boolean(view === 'map'),
refetchOnMount: false,
refetchOnWindowFocus: false,
refetchOnReconnect: false,
});

const districtGeographiesData = useQuery({
queryKey: [`geographies_data_district_${currentSelectedState.code}`],
queryFn: () =>
GraphQL(
`${process.env.NEXT_PUBLIC_DATA_MANAGEMENT_LAYER_URL}/graphql`,
ANALYTICS_GEOGRAPHY_DATA,
Expand All @@ -142,16 +142,14 @@ export function AnalyticsMainLayout() {
},
}
),
{
refetchOnMount: false,
refetchOnWindowFocus: false,
refetchOnReconnect: false,
}
);

const revenueGeographiesData = useQuery(
[`geographies_data_revenue_${currentSelectedState.code}`],
() =>
refetchOnMount: false,
refetchOnWindowFocus: false,
refetchOnReconnect: false,
});

const revenueGeographiesData = useQuery({
queryKey: [`geographies_data_revenue_${currentSelectedState.code}`],
queryFn: () =>
GraphQL(
`${process.env.NEXT_PUBLIC_DATA_MANAGEMENT_LAYER_URL}/graphql`,
ANALYTICS_GEOGRAPHY_DATA,
Expand All @@ -162,48 +160,44 @@ export function AnalyticsMainLayout() {
},
}
),
{
refetchOnMount: false,
refetchOnWindowFocus: false,
refetchOnReconnect: false,
}
);

const timePeriods = useQuery(
[`timePeriods`],
() =>
refetchOnMount: false,
refetchOnWindowFocus: false,
refetchOnReconnect: false,
});

const timePeriods = useQuery({
queryKey: [`timePeriods`],
queryFn: () =>
GraphQL(
`${process.env.NEXT_PUBLIC_DATA_MANAGEMENT_LAYER_URL}/graphql`,
ANALYTICS_TIME_PERIODS
),
{
refetchOnMount: false,
refetchOnWindowFocus: false,
refetchOnReconnect: false,
}
);

const indicatorsData = useQuery(
[`indicators_${indicator}`],
() =>
refetchOnMount: false,
refetchOnWindowFocus: false,
refetchOnReconnect: false,
});

const indicatorsData = useQuery({
queryKey: [`indicators_${indicator}`],
queryFn: () =>
GraphQL(
`${process.env.NEXT_PUBLIC_DATA_MANAGEMENT_LAYER_URL}/graphql`,
ANALYTICS_INDICATORS,
{
indcFilter: { slug: indicator },
}
),
{
enabled: Boolean(view === 'map'),
refetchOnMount: false,
refetchOnWindowFocus: false,
refetchOnReconnect: false,
}
);

const tableData = useQuery(
[`table_data_${currentSelectedState.code}_${indicator}_${districtCode}`],
() =>
enabled: Boolean(view === 'map'),
refetchOnMount: false,
refetchOnWindowFocus: false,
refetchOnReconnect: false,
});

const tableData = useQuery({
queryKey: [
`table_data_${currentSelectedState.code}_${indicator}_${districtCode}`,
],
queryFn: () =>
GraphQL(
`${process.env.NEXT_PUBLIC_DATA_MANAGEMENT_LAYER_URL}/graphql`,
ANALYTICS_TABLE_DATA,
Expand All @@ -221,13 +215,11 @@ export function AnalyticsMainLayout() {
},
}
),
{
enabled: Boolean(view === 'table'),
refetchOnMount: false,
refetchOnWindowFocus: false,
refetchOnReconnect: false,
}
);
enabled: Boolean(view === 'table'),
refetchOnMount: false,
refetchOnWindowFocus: false,
refetchOnReconnect: false,
});

const [filteredTableData, setFilteredTableData] = useState(
tableData.data?.tableData
Expand Down Expand Up @@ -438,9 +430,11 @@ export function OutputWindowComponent({ currentState, time_period }: any) {
? ANALYTICS_DISTRICT_DATA
: ANALYTICS_REVENUE_TABLE_DATA;

const sidePaneData: any = useQuery(
[`sidePaneData_${indicator}_${region}_${boundary}_${time_period}`],
() =>
const sidePaneData: any = useQuery({
queryKey: [
`sidePaneData_${indicator}_${region}_${boundary}_${time_period}`,
],
queryFn: () =>
GraphQL(
`${process.env.NEXT_PUBLIC_DATA_MANAGEMENT_LAYER_URL}/graphql`,
sidePaneQuery,
Expand All @@ -455,29 +449,25 @@ export function OutputWindowComponent({ currentState, time_period }: any) {
},
}
),
{
refetchOnMount: false,
refetchOnWindowFocus: false,
refetchOnReconnect: false,
}
);

const indicatorDescriptions: any = useQuery(
[`indicators_${indicator}`],
() =>
refetchOnMount: false,
refetchOnWindowFocus: false,
refetchOnReconnect: false,
});

const indicatorDescriptions: any = useQuery({
queryKey: [`indicators_${indicator}`],
queryFn: () =>
GraphQL(
`${process.env.NEXT_PUBLIC_DATA_MANAGEMENT_LAYER_URL}/graphql`,
ANALYTICS_INDICATORS,
{
indcFilter: { slug: indicator },
}
),
{
refetchOnMount: false,
refetchOnWindowFocus: false,
refetchOnReconnect: false,
}
);
refetchOnMount: false,
refetchOnWindowFocus: false,
refetchOnReconnect: false,
});

return (
<>
Expand Down
19 changes: 10 additions & 9 deletions app/[locale]/[state]/analytics/components/chart-view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,22 +99,20 @@ export const ChartView = ({
},
];

const indicatorsQuery = useQuery(
[`indicatorsByCategory_${currentSelectedState.code}`],
() =>
const indicatorsQuery = useQuery({
queryKey: [`indicatorsByCategory_${currentSelectedState.code}`],
queryFn: () =>
GraphQL(
`${process.env.NEXT_PUBLIC_DATA_MANAGEMENT_LAYER_URL}/graphql`,
ANALYTICS_INDICATORS_BY_CATEGORY,
{
stateCode: currentSelectedState?.code,
}
),
{
refetchOnMount: false,
refetchOnWindowFocus: false,
refetchOnReconnect: false,
}
);
refetchOnMount: false,
refetchOnWindowFocus: false,
refetchOnReconnect: false,
});

useEffect(() => {
setLoading(true);
Expand Down Expand Up @@ -168,6 +166,9 @@ export const ChartView = ({
// next: {
// tags: ['chart-data'],
// }
// -----------

// cache: 'no-store', // Prevent caching for dynamic data
}
)
.then((response) => response.json())
Expand Down
16 changes: 7 additions & 9 deletions app/[locale]/[state]/analytics/components/factor-list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,22 +62,20 @@ export function FactorList({ currentState }: any) {

const [downloadReportLoading, setDownloadReportLoading] = useState(false);

const indicatorsQuery = useQuery(
[`indicatorsByCategory_${currentState.code}`],
() =>
const indicatorsQuery = useQuery({
queryKey: [`indicatorsByCategory_${currentState.code}`],
queryFn: () =>
GraphQL(
`${process.env.NEXT_PUBLIC_DATA_MANAGEMENT_LAYER_URL}/graphql`,
ANALYTICS_INDICATORS_BY_CATEGORY,
{
stateCode: currentState?.code,
}
),
{
refetchOnMount: false,
refetchOnWindowFocus: false,
refetchOnReconnect: false,
}
);
refetchOnMount: false,
refetchOnWindowFocus: false,
refetchOnReconnect: false,
});

const indicatorNodes = indicatorsQuery?.data?.indicatorsByCategory;

Expand Down
Loading