Skip to content

CG-4433 Search param still displayed as undefined #32

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

Merged
merged 2 commits into from
Jun 30, 2023
Merged

CG-4433 Search param still displayed as undefined #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81d5f27
CG-4433 Search param still displayed as undefined
doanthanhnguyen95 Jun 23, 2023
46a5dcc
CG-4433
doanthanhnguyen95 Jun 28, 2023
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
8 changes: 8 additions & 0 deletions samples/musicfestival-frontend-react/src/App.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 6 additions & 8 deletions samples/musicfestival-frontend-react/src/components/SearchButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,19 @@ import { ArtistAutocompleteQuery, useArtistAutocompleteQuery } from "../generate
import { generateGQLSearchQueryVars } from "../helpers/queryCacheHelper";
import { isEditOrPreviewMode } from "../helpers/urlHelper";

const singleKeyUrl = process.env.REACT_APP_CONTENT_GRAPH_GATEWAY_URL as string

type CustomString = string | number | readonly string[] | undefined

function SearchButton(): JSX.Element {
const singleKeyUrl = process.env.REACT_APP_CONTENT_GRAPH_GATEWAY_URL as string
const [searchParams] = useSearchParams()
const [token, setToken] = useState("")
const [isShown, setIsShown] = useState(false)
const [searchValue, setSearchValue] = useState<CustomString>(searchParams.get("q")?.toString())
const [orderBy, setOrderBy] = useState("ASC")
let variables: any = generateGQLSearchQueryVars(token, window.location.pathname, searchValue as string | null, orderBy);
const modeEdit = isEditOrPreviewMode()
let stringArr: (string | null)[] = []

const [searchValue, setSearchValue] = useState<CustomString>(searchParams.get("q")?.toString() ?? "")
const [orderBy] = useState("ASC")
let autocompleteData : ArtistAutocompleteQuery | undefined = undefined

let modeEdit = isEditOrPreviewMode()
let variables = generateGQLSearchQueryVars(token, window.location.pathname, searchValue as string | null, orderBy);
const { data : artistAutocompleteData } = useArtistAutocompleteQuery({ endpoint: singleKeyUrl }, variables, { staleTime: 2000, enabled: !modeEdit || !!token })
autocompleteData = artistAutocompleteData

Expand Down
102 changes: 45 additions & 57 deletions samples/musicfestival-frontend-react/src/pages/SearchPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,51 +8,42 @@ import { generateGQLSearchQueryVars } from "../helpers/queryCacheHelper";
import { getImageUrl, isEditOrPreviewMode } from "../helpers/urlHelper";
import ReactPaginate from 'react-paginate';

const singleKeyUrl = process.env.REACT_APP_CONTENT_GRAPH_GATEWAY_URL as string

function SearchPage() {
const singleKeyUrl = process.env.REACT_APP_CONTENT_GRAPH_GATEWAY_URL as string
const ARTIST = "Artist"
const OTHERCONTENT = "OtherContent"
const options: string[] = ["ASC", "DESC"]
const itemsPerPageOptions: number[] = [10, 15]
const filterByOption: {value: string; key: string}[] = [
{value: "Artists", key: ARTIST},
{value: "Other Content", key: OTHERCONTENT}
]

const [token, setToken] = useState("")
const [itemOffset, setItemOffset] = useState(0)
const [otherItemOffset, setOtherItemOffset] = useState(0)
const [itemsPerPage, setItemsPerPage] = useState(10)
const [otherItemsPerPage, setOtherItemsPerPage] = useState(10)
const [filterBy, setFilterBy] = useState("Artist")
const [filterBy, setFilterBy] = useState(ARTIST)
const [orderBy, setOrderBy] = useState("ASC")
const [searchParams] = useSearchParams()
const endOffset = itemOffset + itemsPerPage;
const endOffsetOther = otherItemOffset + otherItemsPerPage;
const modeEdit = isEditOrPreviewMode()
let data: ArtistSearchQuery | undefined = undefined

let artistData: ArtistSearchQuery | undefined = undefined
let otherData: OtherContentSearchQuery | undefined = undefined
let autocompleteData : ArtistAutocompleteQuery | undefined = undefined
let queryString: string | null
let resultNumber : number
let otherResultNumber : number
let variables: any
let options: {value: string; key: string}[] = [
{value: "ASC", key: "ASC"},
{value: "DESC", key: "DESC"}
]
let itemsPerPageOptions: {value: number; key: string}[] = [
{value: 10, key: "10"},
{value: 15, key: "15"}
]
let filterByOption: {value: string; key: string}[] = [
{value: "Artists", key: "Artist"},
{value: "Other Content", key: "OtherContent"}
]

queryString = searchParams.get("q")
if(queryString === undefined || queryString == 'undefined'){
queryString = ""
}

variables = generateGQLSearchQueryVars(token, window.location.pathname, queryString, orderBy);

let modeEdit = isEditOrPreviewMode()
let queryString = searchParams.get("q") ?? ""
let variables = generateGQLSearchQueryVars(token, window.location.pathname, queryString, orderBy);
let endOffset = itemOffset + itemsPerPage
let endOffsetOther = otherItemOffset + otherItemsPerPage

const { data : searchQueryData } = useArtistSearchQuery({ endpoint: singleKeyUrl }, variables, { staleTime: 2000, enabled: !modeEdit || !!token });
data = searchQueryData
resultNumber = data?.ArtistDetailsPage?.items?.length ?? 0
const currentItems = data?.ArtistDetailsPage?.items?.slice(itemOffset, endOffset);
artistData = searchQueryData
resultNumber = artistData?.ArtistDetailsPage?.items?.length ?? 0
const currentItems = artistData?.ArtistDetailsPage?.items?.slice(itemOffset, endOffset);
const pageCount = Math.ceil(resultNumber / itemsPerPage);

const { data : otherContentSearchQueryData } = useOtherContentSearchQuery({ endpoint: singleKeyUrl }, variables, { staleTime: 2000, enabled: !modeEdit || !!token });
Expand Down Expand Up @@ -123,49 +114,46 @@ function SearchPage() {
<div className="search-panel">
<div className="left-panel">
<b>Filter by: </b>
<div className="facets" style={filterBy == "Artist" ? {display: "inherit"}: {display: "none"}}>
<div className="facets" style={filterBy == ARTIST ? {display: "inherit"}: {display: "none"}}>
<b>Artist Name: </b>
{
data?.ArtistDetailsPage?.facets?.ArtistName?.map((artist) => {
artistData?.ArtistDetailsPage?.facets?.ArtistName?.map((artist, idx) => {
return (
<div>
<div key={idx} className="facet-item">
<a key={artist?.name} onClick={(event) => handleFacetClick(event)}>
<span>{artist?.name}</span>
&nbsp;
<b>({artist?.count})</b>
<span>{artist?.name}</span>
</a>
<b>{artist?.count}</b>
</div>
)
})
}
</div>
<div className="facets" style={filterBy == "Artist" ? {display: "inherit"}: {display: "none"}}>
<div className="facets" style={filterBy == ARTIST ? {display: "inherit"}: {display: "none"}}>
<b>Stage Name: </b>
{
data?.ArtistDetailsPage?.facets?.StageName?.map((artist) => {
artistData?.ArtistDetailsPage?.facets?.StageName?.map((artist, idx) => {
return (
<div>
<div key={idx} className="facet-item">
<a key={artist?.name} onClick={(event) => handleFacetClick(event)}>
<span>{artist?.name}</span>
&nbsp;
<b>({artist?.count})</b>
<span>{artist?.name}</span>
</a>
<b>{artist?.count}</b>
</div>
)
})
}
</div>
<div className="facets" style={filterBy == "OtherContent" ? {display: "inherit"}: {display: "none"}}>
<div className="facets" style={filterBy == OTHERCONTENT ? {display: "inherit"}: {display: "none"}}>
<b>Content: </b>
{
otherData?.Content?.facets?.Name?.map((content) => {
otherData?.Content?.facets?.Name?.map((content, idx) => {
return (
<div>
<div key={idx} className="facet-item">
<a key={content?.name} onClick={(event) => handleFacetClick(event)}>
<span>{content?.name}</span>
&nbsp;
<b>({content?.count})</b>
</a>
<b>{content?.count}</b>
</div>
)
})
Expand All @@ -174,22 +162,22 @@ function SearchPage() {
</div>
<div className="right-panel">
<div className="search-description">
<h6>Your search for <span className="search-term">{queryString}</span> resulted in <span className="search-term">{filterBy == "Artist" ? resultNumber : otherResultNumber}</span> hits</h6>
<h6>Your search for <span className="search-term">{queryString}</span> resulted in <span className="search-term">{filterBy == ARTIST ? resultNumber : otherResultNumber}</span> hits</h6>
</div>
<div className="search-sorting">
<span>Sort: </span>
<select onChange={e => handleChange(e)} className="Button">
{
options.map((option) => {
options.map((value, idx) => {
return (
<option key={option.key} value={option.key}>{option.value}</option>
<option key={idx} value={value}>{value}</option>
)
})
}
</select>
</div>
<div className="result-block">
<div style={filterBy == "Artist" ? {display: "initial"}: {display: "none"}}>
<div style={filterBy == ARTIST ? {display: "initial"}: {display: "none"}}>
<div className="search-results">
{
currentItems?.map((content, idx) => {
Expand Down Expand Up @@ -249,9 +237,9 @@ function SearchPage() {
<span>Items per page: </span>
<select className="Button" onChange={handleItemsChange}>
{
itemsPerPageOptions.map((option) => {
itemsPerPageOptions.map((option, idx) => {
return (
<option key={option.key} value={option.key}>{option.value}</option>
<option key={idx} value={option}>{option}</option>
)
})
}
Expand All @@ -273,7 +261,7 @@ function SearchPage() {
</table>
</div>
</div>
<div style={filterBy == "OtherContent" ? {display: "initial"}: {display: "none"}}>
<div style={filterBy == OTHERCONTENT ? {display: "initial"}: {display: "none"}}>
<div className="search-results">
{
currentOtherItems?.map((content, idx) => {
Expand Down Expand Up @@ -304,9 +292,9 @@ function SearchPage() {
<span>Items per page: </span>
<select className="Button" onChange={handleOtherItemsChange}>
{
itemsPerPageOptions.map((option) => {
itemsPerPageOptions.map((option, idx) => {
return (
<option key={option.key} value={option.key}>{option.value}</option>
<option key={idx} value={option}>{option}</option>
)
})
}
Expand Down