Skip to content

Commit 125110f

Browse files
committed
Fix merge conflict
1 parent bc17cff commit 125110f

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

  • src/routes/(console)/organization-[organization]

src/routes/(console)/organization-[organization]/+page.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@ export const load: PageLoad = async ({ params, url, route, depends, parent }) =>
2424
const archivedPage =
2525
Number.isFinite(archivedPageRaw) && archivedPageRaw > 0 ? archivedPageRaw : 1;
2626
const archivedOffset = pageToOffset(archivedPage, limit);
27-
27+
2828
const searchQueries = search
29-
? [Query.or([Query.search('search', search), Query.contains('labels', search)])];
29+
? [Query.or([Query.search('search', search), Query.contains('labels', search)])]
30+
: [];
3031
const commonQueries = [Query.equal('teamId', params.organization)];
3132
const activeQueries = isCloud
3233
? [Query.or([Query.equal('status', 'active'), Query.isNull('status')])]

0 commit comments

Comments
 (0)