diff --git a/svelte-kit-scss/src/lib/components/IssueHeader/IssueHeader.svelte b/svelte-kit-scss/src/lib/components/IssueHeader/IssueHeader.svelte deleted file mode 100644 index b6cb90695..000000000 --- a/svelte-kit-scss/src/lib/components/IssueHeader/IssueHeader.svelte +++ /dev/null @@ -1,158 +0,0 @@ - - -
-
- - -
-
- - - -
-
- - diff --git a/svelte-kit-scss/src/lib/components/IssueSearch/IssueSearchControls/IssueSearchControls.svelte b/svelte-kit-scss/src/lib/components/IssueSearch/IssueSearchControls/IssueSearchControls.svelte index 00a56bbc2..4d2f01ffb 100644 --- a/svelte-kit-scss/src/lib/components/IssueSearch/IssueSearchControls/IssueSearchControls.svelte +++ b/svelte-kit-scss/src/lib/components/IssueSearch/IssueSearchControls/IssueSearchControls.svelte @@ -1,31 +1,62 @@
- x.label} - checkedPredicate={(x) => x.active} - on:select={async ({ detail }) => await handleFilterSelect(detail)} - > - - +
+ +
+
+ x.label} + checkedPredicate={(x) => x.active} + on:select={async ({ detail }) => await handleFilterSelect(detail, true)} + direction="left" + > + + + x.label} + checkedPredicate={(x) => x.active} + on:select={async ({ detail }) => await handleFilterSelect(detail)} + direction="left" + > + + +
diff --git a/svelte-kit-scss/src/lib/components/IssueSearch/IssueSearchControls/IssueStateFilter.svelte b/svelte-kit-scss/src/lib/components/IssueSearch/IssueSearchControls/IssueStateFilter.svelte new file mode 100644 index 000000000..129de963a --- /dev/null +++ b/svelte-kit-scss/src/lib/components/IssueSearch/IssueSearchControls/IssueStateFilter.svelte @@ -0,0 +1,39 @@ + + +
+ {openFilter.label} + {closedFilter.label} +
+ + diff --git a/svelte-kit-scss/src/lib/components/IssuesList/IssuesList.svelte b/svelte-kit-scss/src/lib/components/IssuesList/IssuesList.svelte deleted file mode 100644 index da9054af5..000000000 --- a/svelte-kit-scss/src/lib/components/IssuesList/IssuesList.svelte +++ /dev/null @@ -1,32 +0,0 @@ - - -
-
- {#if Array.isArray(issues)} - {#each issues as issue} - - {/each} - {:else} -
- No results matched your search. -
- {/if} -
-
- - diff --git a/svelte-kit-scss/src/lib/components/PRHeader/PRHeader.svelte b/svelte-kit-scss/src/lib/components/PRHeader/PRHeader.svelte deleted file mode 100644 index 1c4e583ea..000000000 --- a/svelte-kit-scss/src/lib/components/PRHeader/PRHeader.svelte +++ /dev/null @@ -1,142 +0,0 @@ - - -
-
- - -
-
- - -
-
- - diff --git a/svelte-kit-scss/src/lib/components/PRIssueCard/PRIssueCard.svelte b/svelte-kit-scss/src/lib/components/PRIssueCard/PRIssueCard.svelte deleted file mode 100644 index 4105623e6..000000000 --- a/svelte-kit-scss/src/lib/components/PRIssueCard/PRIssueCard.svelte +++ /dev/null @@ -1,161 +0,0 @@ - - -{#if issue} -
-
-
- {#if isOpen()} - - - - {:else} - - - - {/if} -
-
- {issue.title} - {#each issue.labels as label} - - - {label.name} - - - {/each} -
-
- #{issue.number} - {#if isOpen() && issue?.createdAt} - - opened - {relativeTimeFmt(issue.createdAt)} - - {/if} - by - {issue.login} - {#if !isOpen() && issue?.closedAt} - - was closed - {relativeTimeFmt(issue.closedAt)} - - {/if} -
-
-
-
- -
- {issue.commentCount} -
-
-
-
-{/if} - - diff --git a/svelte-kit-scss/src/lib/components/PRsList/PRsList.svelte b/svelte-kit-scss/src/lib/components/PRsList/PRsList.svelte deleted file mode 100644 index b286ee05d..000000000 --- a/svelte-kit-scss/src/lib/components/PRsList/PRsList.svelte +++ /dev/null @@ -1,32 +0,0 @@ - - -
-
- {#if Array.isArray(prs)} - {#each prs as pr} - - {/each} - {:else} -
- No results matched your search. -
- {/if} -
-
- - diff --git a/svelte-kit-scss/src/lib/components/Repo/RepoHeader/RepoNavigation/RepoNavigation.svelte b/svelte-kit-scss/src/lib/components/Repo/RepoHeader/RepoNavigation/RepoNavigation.svelte index e4f4292b3..0867724a3 100644 --- a/svelte-kit-scss/src/lib/components/Repo/RepoHeader/RepoNavigation/RepoNavigation.svelte +++ b/svelte-kit-scss/src/lib/components/Repo/RepoHeader/RepoNavigation/RepoNavigation.svelte @@ -3,8 +3,12 @@ import type { RepoState } from '$lib/interfaces'; import { Code16, GitPullRequest16, IssueOpened16 } from 'svelte-octicons'; import { page } from '$app/stores'; + import { IssueSearchPageTypeFiltersMap } from '$lib/constants/matchers'; let path: string; + const issueSearchPageTypeIssue = Object.keys(IssueSearchPageTypeFiltersMap)[0]; + const issueSearchPageTypeRequest = Object.keys(IssueSearchPageTypeFiltersMap)[1]; + function getPath(currentPath: string) { path = currentPath; } @@ -20,11 +24,11 @@ } function openIssues() { - openTabLink('issues'); + openTabLink(issueSearchPageTypeIssue); } function openPRs() { - openTabLink('pull-requests'); + openTabLink(issueSearchPageTypeRequest); } function openTabLink(link: string) { @@ -39,7 +43,8 @@ on:click={openCode} on:keypress={openCode} class="tab tab--inactive" - class:tab--active={!path.includes('issues') && !path.includes('pull-requests')} + class:tab--active={!path.includes(issueSearchPageTypeIssue) && + !path.includes(issueSearchPageTypeRequest)} > @@ -50,7 +55,7 @@ on:click={openIssues} on:keypress={openIssues} class="tab tab--inactive" - class:tab--active={path.includes('issues')} + class:tab--active={path.includes(issueSearchPageTypeIssue)} > @@ -64,7 +69,7 @@ on:click={openPRs} on:keypress={openPRs} class="tab tab--inactive" - class:tab--active={path.includes('pull-requests')} + class:tab--active={path.includes(issueSearchPageTypeRequest)} > diff --git a/svelte-kit-scss/src/lib/components/shared/Dropdown/DropdownMenu.svelte b/svelte-kit-scss/src/lib/components/shared/Dropdown/DropdownMenu.svelte index 9aa90d9e1..d85c05574 100644 --- a/svelte-kit-scss/src/lib/components/shared/Dropdown/DropdownMenu.svelte +++ b/svelte-kit-scss/src/lib/components/shared/Dropdown/DropdownMenu.svelte @@ -3,6 +3,8 @@ import { X16 } from 'svelte-octicons'; import { scale } from 'svelte/transition'; export let description: string | undefined; + type Direction = 'left' | 'right'; + export let direction: Direction = 'right'; let isOpen = false; const close = (): void => { isOpen = false; @@ -12,6 +14,8 @@ }; $: descriptionDisplay = description || String(); + + const reverseDirection = (direction: Direction) => (direction === 'left' ? 'right' : 'left');
@@ -19,7 +23,11 @@
{#if isOpen} -
+
{descriptionDisplay}
@@ -41,8 +49,9 @@ font-size: 12px; line-height: 1; position: absolute; + z-index: 1; top: 100%; - left: 0; + // left: 0; inline margin-top: 8px; border: $border; background: variables.$white; diff --git a/svelte-kit-scss/src/lib/components/shared/Dropdown/DropdownMenuSelect/DropdownMenuSelect.svelte b/svelte-kit-scss/src/lib/components/shared/Dropdown/DropdownMenuSelect/DropdownMenuSelect.svelte index d6926fcbd..59128e31e 100644 --- a/svelte-kit-scss/src/lib/components/shared/Dropdown/DropdownMenuSelect/DropdownMenuSelect.svelte +++ b/svelte-kit-scss/src/lib/components/shared/Dropdown/DropdownMenuSelect/DropdownMenuSelect.svelte @@ -15,9 +15,11 @@ const handleOptionClick = (option: TOption): void => { dispatch('select', option); }; + type Direction = 'left' | 'right'; + export let direction: Direction = 'right'; - +
{#each options as option} diff --git a/svelte-kit-scss/src/lib/components/shared/buttons/ButtonText.svelte b/svelte-kit-scss/src/lib/components/shared/buttons/ButtonText.svelte index 9419765b6..5a9e27614 100644 --- a/svelte-kit-scss/src/lib/components/shared/buttons/ButtonText.svelte +++ b/svelte-kit-scss/src/lib/components/shared/buttons/ButtonText.svelte @@ -21,6 +21,8 @@ opacity: 0.7; padding: 0; background: transparent; + font-weight: inherit; + cursor: pointer; &:hover { opacity: unset; } diff --git a/svelte-kit-scss/src/lib/constants/issues-search-query-filters.ts b/svelte-kit-scss/src/lib/constants/issues-search-query-filters.ts index b80defb2d..d99e3d4fa 100644 --- a/svelte-kit-scss/src/lib/constants/issues-search-query-filters.ts +++ b/svelte-kit-scss/src/lib/constants/issues-search-query-filters.ts @@ -14,8 +14,8 @@ export enum IssueSearchQueryState { } export enum IssueSearchQueryType { - 'Issue' = 'is:issue', - 'Pull request' = 'is:pr', + Issue = 'is:issue', + PullRequest = 'is:pr', } export const PREDEFINED_SEARCH_QUERY_PARAMETER_GROUPS = [ diff --git a/svelte-kit-scss/src/lib/helpers/index.ts b/svelte-kit-scss/src/lib/helpers/index.ts index cd77c89ca..24cf00c95 100644 --- a/svelte-kit-scss/src/lib/helpers/index.ts +++ b/svelte-kit-scss/src/lib/helpers/index.ts @@ -8,3 +8,4 @@ export * from './issues'; export * from './debounce'; export * from './repository-contents'; export * from './branches'; +export * from './issue-milestone'; diff --git a/svelte-kit-scss/src/lib/helpers/issue-milestone.ts b/svelte-kit-scss/src/lib/helpers/issue-milestone.ts new file mode 100644 index 000000000..33c7c171a --- /dev/null +++ b/svelte-kit-scss/src/lib/helpers/issue-milestone.ts @@ -0,0 +1,17 @@ +import { + IssueMilestoneState, + type GithubIssueMilestone, + type IssueMilestone, +} from '$lib/interfaces'; + +export const remapIssueMilestone = (milestone: GithubIssueMilestone): IssueMilestone => { + if (!Object.values(IssueMilestoneState).map(String).includes(milestone.state)) { + throw new Error(`Invalid Milestone State: ${milestone.state}`); + } + return { + id: milestone.id, + number: milestone.number, + title: milestone.title, + state: String(milestone.state), + }; +}; diff --git a/svelte-kit-scss/src/lib/helpers/issues-search-query-builder.ts b/svelte-kit-scss/src/lib/helpers/issues-search-query-builder.ts index aa239b2c3..26aa8517d 100644 --- a/svelte-kit-scss/src/lib/helpers/issues-search-query-builder.ts +++ b/svelte-kit-scss/src/lib/helpers/issues-search-query-builder.ts @@ -13,13 +13,8 @@ export const SEARCH_QUERY_PARAMETER_QUALIFIER = { type SearchQueryParameterQualifier = typeof SEARCH_QUERY_PARAMETER_QUALIFIER[keyof typeof SEARCH_QUERY_PARAMETER_QUALIFIER]; -export const buildFilterParameter = (qualifier: SearchQueryParameterQualifier, value: string) => { - let paramValue = value; - if (qualifier === SEARCH_QUERY_PARAMETER_QUALIFIER.MILESTONE) { - paramValue = JSON.stringify(value); - } - return [qualifier, paramValue].join(QUALIFIER_SEPARATOR); -}; +export const buildFilterParameter = (qualifier: SearchQueryParameterQualifier, value: string) => + [qualifier, value].join(QUALIFIER_SEPARATOR); export const splitFilterParameters = (query: string): string[] => { return query.split(PARAMETER_SEPARATOR).reduce((arr, x) => { @@ -33,6 +28,17 @@ export const splitFilterParameters = (query: string): string[] => { }, [] as string[]); }; +export const ensureRepoParameter = (query: string, repoName: string): string => { + const repoParam = splitFilterParameters(query).find((x) => + x.startsWith(SEARCH_QUERY_PARAMETER_QUALIFIER.REPO) + ); + return repoParam + ? query + : [query, buildFilterParameter(SEARCH_QUERY_PARAMETER_QUALIFIER.REPO, repoName)].join( + PARAMETER_SEPARATOR + ); +}; + export const estimateSearchQueryForParameter = (baseQuery: string, parameter: string) => { // validate parameter const [qualifier, value] = parameter.split(QUALIFIER_SEPARATOR); diff --git a/svelte-kit-scss/src/lib/interfaces/data-contract/github/index.ts b/svelte-kit-scss/src/lib/interfaces/data-contract/github/index.ts index 5386fca09..786815361 100644 --- a/svelte-kit-scss/src/lib/interfaces/data-contract/github/index.ts +++ b/svelte-kit-scss/src/lib/interfaces/data-contract/github/index.ts @@ -1 +1,2 @@ export * from './issues'; +export * from './milestones'; diff --git a/svelte-kit-scss/src/lib/interfaces/data-contract/github/milestones.ts b/svelte-kit-scss/src/lib/interfaces/data-contract/github/milestones.ts new file mode 100644 index 000000000..5bce4cc24 --- /dev/null +++ b/svelte-kit-scss/src/lib/interfaces/data-contract/github/milestones.ts @@ -0,0 +1,28 @@ +export enum GithubIssueMilestoneState { + Open = 'open', + Closed = 'closed', +} + +export enum GithubIssueMilestoneStateFilter { + Open = 'open', + Closed = 'closed', + All = 'all', +} + +/** + * Contains the only relevant properties. + * [`Github API: Issues > Milestones`](https://docs.github.com/en/rest/issues/milestones) + */ +export interface GithubIssueMilestone { + id: number; + title: string; + number: number; + state: GithubIssueMilestoneState; + description: string; + open_issues: number; + closed_issues: number; + created_at: string; + updated_at: string; + closed_at: string; + due_on: string; +} diff --git a/svelte-kit-scss/src/lib/interfaces/index.ts b/svelte-kit-scss/src/lib/interfaces/index.ts index de24a169f..9ebf3ab95 100644 --- a/svelte-kit-scss/src/lib/interfaces/index.ts +++ b/svelte-kit-scss/src/lib/interfaces/index.ts @@ -6,3 +6,4 @@ export * from './repository-contents'; export * from './branches'; export * from './data-contract'; export * from './issues'; +export * from './issue-milestone'; diff --git a/svelte-kit-scss/src/lib/interfaces/issue-milestone.ts b/svelte-kit-scss/src/lib/interfaces/issue-milestone.ts new file mode 100644 index 000000000..95ffce990 --- /dev/null +++ b/svelte-kit-scss/src/lib/interfaces/issue-milestone.ts @@ -0,0 +1,11 @@ +export enum IssueMilestoneState { + Open = 'open', + Closed = 'closed', +} + +export interface IssueMilestone { + id: number; + number: number; + title: string; + state: IssueMilestoneState; +} diff --git a/svelte-kit-scss/src/lib/services/index.ts b/svelte-kit-scss/src/lib/services/index.ts index 016d837ab..c62ec30a4 100644 --- a/svelte-kit-scss/src/lib/services/index.ts +++ b/svelte-kit-scss/src/lib/services/index.ts @@ -1,3 +1,4 @@ export * from './auth-service'; export * from './configure-services'; export * from './issues-search-service'; +export * from './issue-milestone-service'; diff --git a/svelte-kit-scss/src/lib/services/issue-milestone-service.ts b/svelte-kit-scss/src/lib/services/issue-milestone-service.ts new file mode 100644 index 000000000..51971ab75 --- /dev/null +++ b/svelte-kit-scss/src/lib/services/issue-milestone-service.ts @@ -0,0 +1,46 @@ +import { ENV } from '$lib/constants/env'; +import { remapIssueMilestone } from '$lib/helpers'; +import { + GithubIssueMilestoneStateFilter, + type GithubIssueMilestone, + type IssueMilestone, +} from '$lib/interfaces'; +import { error } from '@sveltejs/kit'; + +const SEARCH_PARAMS = { + STATE: 'state', +}; + +export class IssueMilestoneService { + constructor( + private fetch: (input: URL | RequestInfo, init?: RequestInit | undefined) => Promise + ) {} + + async getOpenMilestones(owner: string, repo: string): Promise { + const milestones = await this.requestMilestones(owner, repo, { + state: GithubIssueMilestoneStateFilter.Open, + }); + return milestones.map(remapIssueMilestone); + } + + private async requestMilestones( + owner: string, + repo: string, + parameters?: { + state?: GithubIssueMilestoneStateFilter; + } + ): Promise { + const getItemsUrl = new URL(`/repos/${owner}/${repo}/milestones`, ENV.GITHUB_URL); + if (parameters?.state) { + getItemsUrl.searchParams.append(SEARCH_PARAMS.STATE, parameters.state); + } + + const response = await this.fetch(getItemsUrl.toString()); + if (!response.ok) { + const body = await response.json(); + throw error(response.status, body?.message || response.statusText); + } + const responseBodyJson = (await response.json()) as Promise; + return responseBodyJson; + } +} diff --git a/svelte-kit-scss/src/routes/(authenticated)/[username]/[repo]/[issueSearchType=issue_search_type]/+page.server.ts b/svelte-kit-scss/src/routes/(authenticated)/[username]/[repo]/[issueSearchType=issue_search_type]/+page.server.ts index d477c0de7..53530723b 100644 --- a/svelte-kit-scss/src/routes/(authenticated)/[username]/[repo]/[issueSearchType=issue_search_type]/+page.server.ts +++ b/svelte-kit-scss/src/routes/(authenticated)/[username]/[repo]/[issueSearchType=issue_search_type]/+page.server.ts @@ -1,32 +1,89 @@ -import type { PageServerLoad } from './$types'; +import type { PageServerLoad, PageServerLoadEvent } from './$types'; import { IssueSearchQueryState, IssuesSearchQuerySort, } from '$lib/constants/issues-search-query-filters'; -import { IssuesSearchService } from '$lib/services'; +import { IssueMilestoneService, IssuesSearchService } from '$lib/services'; import { IssueSearchPageTypeFiltersMap, type IssueSearchTypePage } from '$lib/constants/matchers'; import { buildFilterParameter, + ensureRepoParameter, estimateSearchQueryForParameter, SEARCH_QUERY_PARAMETER_QUALIFIER, splitFilterParameters, } from '$lib/helpers/issues-search-query-builder'; import type { NavigationFilterOption } from '$lib/components/IssueSearch/IssueSearchControls/models'; +import { redirect } from '@sveltejs/kit'; const DEFAULT_PER_PAGE = 25; const PAGE_SEARCH_PARAM_QUERY = 'q'; const PAGE_SEARCH_PARAM_PAGE = 'page'; -export const load: PageServerLoad = async ({ fetch, params, url: { searchParams, href } }) => { +const buildNavigationFilterOptions = ( + currentUrlHref: string, + queryBase: string, + labelParameterDictionary: Record, + decorateLabelFn?: (label: string, parameter: TParameter) => string, + optional?: boolean +): NavigationFilterOption[] => { + return Object.entries(labelParameterDictionary).map(([label, queryParameter]) => { + const url = new URL(currentUrlHref); + const query = estimateSearchQueryForParameter(queryBase, queryParameter); + const active = splitFilterParameters(queryBase).includes(queryParameter); + if (optional && active) { + const deactivateQuery = splitFilterParameters(queryBase) + .filter((x) => x !== queryParameter) + .join(' '); + url.searchParams.set(PAGE_SEARCH_PARAM_QUERY, deactivateQuery); + } else { + url.searchParams.set(PAGE_SEARCH_PARAM_QUERY, query); + } + return { + label: decorateLabelFn ? decorateLabelFn(label, queryParameter) : label, + href: url.toString(), + active, + } as NavigationFilterOption; + }); +}; + +const redirectIfRequired = ({ + params, + url: { searchParams, pathname, search }, +}: PageServerLoadEvent): void => { + const query = searchParams.get(PAGE_SEARCH_PARAM_QUERY); + if (!query) { + return; + } + const issueSearchPageType = params.issueSearchType as keyof typeof IssueSearchPageTypeFiltersMap; + + const requiredParameter = IssueSearchPageTypeFiltersMap[issueSearchPageType]; + const queryParameters = splitFilterParameters(query); + if (query && !queryParameters.includes(requiredParameter)) { + const pageType = Object.entries(IssueSearchPageTypeFiltersMap) + .find(([, param]) => queryParameters.includes(param)) + ?.at(0); + const targetPathname = [...pathname.split('/').slice(0, -1), pageType].join('/'); + throw redirect(302, `${targetPathname}${search}`); + } +}; + +export const load: PageServerLoad = async (event: PageServerLoadEvent) => { + redirectIfRequired(event); + const { + fetch, + params, + url: { searchParams, href }, + } = event; + const service = new IssuesSearchService(fetch, DEFAULT_PER_PAGE); + const milestoneService = new IssueMilestoneService(fetch); const { username, repo, issueSearchType } = params; const defaultSearchQuery = [ IssueSearchPageTypeFiltersMap[issueSearchType as IssueSearchTypePage], IssueSearchQueryState.Open, IssuesSearchQuerySort.Newest, - buildFilterParameter(SEARCH_QUERY_PARAMETER_QUALIFIER.REPO, `${username}/${repo}`), ].join(' '); const currentSearchQuery = searchParams.get(PAGE_SEARCH_PARAM_QUERY); @@ -35,39 +92,70 @@ export const load: PageServerLoad = async ({ fetch, params, url: { searchParams, const searchQuery = currentSearchQuery || defaultSearchQuery; - const issuesPromise = service.getIssues(searchQuery, { page: currentPage }); + const pageDefaultRepo = `${username}/${repo}`; + const requestSearchQuery = ensureRepoParameter(searchQuery, pageDefaultRepo); + + const issuesPromise = service.getIssues(requestSearchQuery, { page: currentPage }); - const searchQueryOpen = estimateSearchQueryForParameter(searchQuery, IssueSearchQueryState.Open); + const searchQueryOpen = estimateSearchQueryForParameter( + requestSearchQuery, + IssueSearchQueryState.Open + ); const openIssuesCountPromise = service.getIssuesCount(searchQueryOpen); const searchQueryClosed = estimateSearchQueryForParameter( - searchQuery, + requestSearchQuery, IssueSearchQueryState.Closed ); const closedIssuesCountPromise = service.getIssuesCount(searchQueryClosed); - const [issues, openIssuesCount, closedIssuesCount] = await Promise.all([ + const openMilestonesPromise = milestoneService.getOpenMilestones(username, repo); + + const [issues, openIssuesCount, closedIssuesCount, openMilestones] = await Promise.all([ issuesPromise, openIssuesCountPromise, closedIssuesCountPromise, + openMilestonesPromise, ]); - const sortFilters = Object.entries(IssuesSearchQuerySort).map(([label, queryParameter]) => { - const url = new URL(href); - const query = estimateSearchQueryForParameter(searchQuery, queryParameter); - url.searchParams.set(PAGE_SEARCH_PARAM_QUERY, query); - - return { - label, - href: url.toString(), - active: splitFilterParameters(searchQuery).includes(queryParameter), - } as NavigationFilterOption; - }); + const sortFilters = buildNavigationFilterOptions(href, searchQuery, IssuesSearchQuerySort); + const stateFilters = buildNavigationFilterOptions( + href, + searchQuery, + IssueSearchQueryState, + (label, parameter) => { + const parts = []; + switch (parameter) { + case IssueSearchQueryState.Open: + parts.push(openIssuesCount); + break; + case IssueSearchQueryState.Closed: + parts.push(closedIssuesCount); + break; + } + parts.push(label); + return parts.join(' '); + } + ); + const labelParameterDictionaryMilestones = openMilestones.reduce((dict, x) => { + dict[x.title] = buildFilterParameter( + SEARCH_QUERY_PARAMETER_QUALIFIER.MILESTONE, + `"${x.title}"` + ); + return dict; + }, {} as Record); + const milestoneFilters = buildNavigationFilterOptions( + href, + searchQuery, + labelParameterDictionaryMilestones, + (label) => label, + true + ); return { issues, - openIssuesCount, - closedIssuesCount, sortFilters, + stateFilters, + milestoneFilters, }; }; diff --git a/svelte-kit-scss/src/routes/(authenticated)/[username]/[repo]/[issueSearchType=issue_search_type]/+page.svelte b/svelte-kit-scss/src/routes/(authenticated)/[username]/[repo]/[issueSearchType=issue_search_type]/+page.svelte index 815cb7b4a..2207c3250 100644 --- a/svelte-kit-scss/src/routes/(authenticated)/[username]/[repo]/[issueSearchType=issue_search_type]/+page.svelte +++ b/svelte-kit-scss/src/routes/(authenticated)/[username]/[repo]/[issueSearchType=issue_search_type]/+page.svelte @@ -7,15 +7,11 @@ export let data: PageServerData; - $: ({ issues, openIssuesCount, closedIssuesCount, sortFilters } = data); + $: ({ issues, sortFilters, stateFilters, milestoneFilters } = data); - + - -