quantified.uncertainty/metaforecast
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: always search on client side

Browse Source
This commit is contained in:
Vyacheslav Matyukhin 2022-03-25 01:51:20 +03:00
parent c92d131ae3
commit 98c7c31a0f
No known key found for this signature in database
GPG Key ID: 3D2A774C5489F96C
3 changed files with 35 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/pages/capture.tsx
View File

@ -1,16 +1,22 @@
import { GetServerSideProps } from 'next';
import { GetServerSideProps, NextPage } from 'next';
import React from 'react';
import { getFrontpage } from '../backend/frontpage';
import CommonDisplay, { QueryParameters } from '../web/display/commonDisplay';
import { displayForecastsWrapperForCapture } from '../web/display/displayForecastsWrappers';
import { platformsWithLabels } from '../web/platforms';
import searchAccordingToQueryData from '../web/worker/searchAccordingToQueryData';
import Layout from './layout';
/* get Props */
export const getServerSideProps: GetServerSideProps = async (context) => {
interface Props {
initialQueryParameters: QueryParameters;
defaultResults: any;
}
export const getServerSideProps: GetServerSideProps<Props> = async (
context
) => {
let urlQuery = context.query;
let initialQueryParameters: QueryParameters = {
@ -31,33 +37,19 @@ export const getServerSideProps: GetServerSideProps = async (context) => {
},
}));
let initialResults =
initialQueryParameters.query != ""
? await searchAccordingToQueryData(initialQueryParameters)
: frontPageForecasts;
let props = {
initialQueryParameters: initialQueryParameters,
initialResults: initialResults,
defaultResults: frontPageForecasts,
urlQuery: urlQuery,
};
return {
props: props,
props: {
initialQueryParameters: initialQueryParameters,
defaultResults: frontPageForecasts,
},
};
};
/* Body */
export default function Home({
initialResults,
defaultResults,
initialQueryParameters,
}) {
const Home: NextPage<Props> = ({ defaultResults, initialQueryParameters }) => {
return (
<Layout page={"capture"}>
<CommonDisplay
initialResults={initialResults}
defaultResults={defaultResults}
initialQueryParameters={initialQueryParameters}
hasSearchbar={true}
@ -69,4 +61,6 @@ export default function Home({
/>
</Layout>
);
}
};
export default Home;

38
src/pages/index.tsx
View File

@ -1,19 +1,25 @@
import { GetServerSideProps } from 'next';
import { GetServerSideProps, NextPage } from 'next';
import React from 'react';
import { getFrontpage } from '../backend/frontpage';
import CommonDisplay from '../web/display/commonDisplay';
import CommonDisplay, { QueryParameters } from '../web/display/commonDisplay';
import { displayForecastsWrapperForSearch } from '../web/display/displayForecastsWrappers';
import { platformsWithLabels } from '../web/platforms';
import searchAccordingToQueryData from '../web/worker/searchAccordingToQueryData';
import Layout from './layout';
/* get Props */
export const getServerSideProps: GetServerSideProps = async (context) => {
interface Props {
initialQueryParameters: QueryParameters;
defaultResults: any;
}
export const getServerSideProps: GetServerSideProps<Props> = async (
context
) => {
let urlQuery = context.query;
let initialQueryParameters = {
let initialQueryParameters: QueryParameters = {
query: "",
numDisplay: 21,
starsThreshold: 2,
@ -31,33 +37,19 @@ export const getServerSideProps: GetServerSideProps = async (context) => {
},
}));
let initialResults =
!!initialQueryParameters &&
initialQueryParameters.query != "" &&
initialQueryParameters.query != undefined
? await searchAccordingToQueryData(initialQueryParameters)
: frontPageForecasts;
return {
props: {
initialQueryParameters: initialQueryParameters,
initialResults: initialResults,
defaultResults: frontPageForecasts, // different from initialResults!
urlQuery: urlQuery,
defaultResults: frontPageForecasts,
},
};
};
/* Body */
export default function Home({
initialResults,
defaultResults,
initialQueryParameters,
}) {
const Home: NextPage<Props> = ({ defaultResults, initialQueryParameters }) => {
return (
<Layout page={"search"}>
<CommonDisplay
initialResults={initialResults}
defaultResults={defaultResults}
initialQueryParameters={initialQueryParameters}
hasSearchbar={true}
@ -69,4 +61,6 @@ export default function Home({
/>
</Layout>
);
}
};
export default Home;

6
src/web/display/commonDisplay.tsx
View File

@ -19,7 +19,6 @@ export interface QueryParameters extends QueryParametersWithoutNum {
}
interface Props {
initialResults: any;
defaultResults: any;
initialQueryParameters: QueryParameters;
hasSearchbar: boolean;
@ -55,7 +54,6 @@ let transformObjectIntoUrlSlug = (obj: QueryParameters) => {
/* Body */
const CommonDisplay: React.FC<Props> = ({
initialResults,
defaultResults,
initialQueryParameters,
hasSearchbar,
@ -74,7 +72,7 @@ const CommonDisplay: React.FC<Props> = ({
initialQueryParameters.numDisplay || 21
);
const [results, setResults] = useState(initialResults);
const [results, setResults] = useState([]);
const [advancedOptions, showAdvancedOptions] = useState(false);
const [whichResultToDisplayAndCapture, setWhichResultToDisplayAndCapture] =
useState(0);
@ -114,7 +112,7 @@ const CommonDisplay: React.FC<Props> = ({
!queryData || queryData.query == "" || queryData.query == undefined;
let results = queryIsEmpty
? filterManually(queryData, defaultResults || initialResults)
? filterManually(queryData, defaultResults)
: await searchAccordingToQueryData(queryData);
setResults(results);