Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 16 additions & 20 deletions src/components/features/query/query-filters.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { MultiSelect } from "@/components/ui/multi-select";
import { Menu, Filter, ArrowUpDown, Group } from "lucide-react";
import { GroupBy } from "./popovers/group-by";
import { FilterRows } from "./popovers/filter-rows";
import { SortBy } from "./popovers/sort-by";
import { useQuery } from "@/providers/query-provider";
import { ArrowUpDown, Filter, Group, Menu } from "lucide-react";
import { useMemo } from "react";
import { FilterRows } from "./popovers/filter-rows";
import { GroupBy } from "./popovers/group-by";
import { SortBy } from "./popovers/sort-by";

interface QueryFiltersProps {
availableColumns: string[];
Expand Down Expand Up @@ -37,34 +37,31 @@ export function QueryFilters({ availableColumns }: QueryFiltersProps) {
value: column,
}));


const columns = applicants[0] ? Object.keys(applicants[0]) : [];

const columnTypes = useMemo(() => {
return Object.fromEntries(
columns.map(col => [col, typeof applicants[0]?.[col]])
);
return Object.fromEntries(columns.map((col) => [col, typeof applicants[0]?.[col]]));
}, [columns, applicants]);


/**
* Definitions to determine which columns are groupable and aggreagtable.
* For example, SUM/AVG can only be applied to numeric columns.
*/
const countColumns = columns;

const { sumAvgColumns, minMaxColumns, groupableColumns } = useMemo(() => {
const sumAvg = columns.filter(col => columnTypes[col] === "number");
const minMax = columns.filter(col =>
columnTypes[col] === "number" ||
columnTypes[col] === "string" ||
applicants[0]?.[col] instanceof Date
const sumAvg = columns.filter((col) => columnTypes[col] === "number");
const minMax = columns.filter(
(col) =>
columnTypes[col] === "number" ||
columnTypes[col] === "string" ||
applicants[0]?.[col] instanceof Date,
);
const groupable = columns.filter(col => {
const groupable = columns.filter((col) => {
const val = applicants[0]?.[col];
return typeof val === "string" || typeof val === "boolean";
return typeof val === "string" || typeof val === "boolean" || typeof val === "number";
});

return { sumAvgColumns: sumAvg, minMaxColumns: minMax, groupableColumns: groupable };
}, [columns, columnTypes, applicants]);

Expand Down Expand Up @@ -120,7 +117,6 @@ export function QueryFilters({ availableColumns }: QueryFiltersProps) {
onRemoveFilter={onFilterRemove}
onFilterOperatorChange={onFilterOperatorChange}
/>

</div>

<div className="flex flex-col gap-2">
Expand Down
27 changes: 27 additions & 0 deletions src/components/features/settings/hackathon-settings-form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,15 @@ export function HackathonSettingsForm({ hackathonId }: HackathonSettingsFormProp
disabled={!isEditing}
/>
</div>
<div className="flex items-center justify-between">
<Label htmlFor="rsvpOpen">RSVP Open</Label>
<Switch
id="rsvpOpen"
checked={getBooleanValue("rsvpOpen")}
onCheckedChange={(checked) => handleFieldChange("rsvpOpen", checked)}
disabled={!isEditing}
/>
</div>
<div className="space-y-2">
<Label htmlFor="applicationDeadline">Application Deadline</Label>
<Input
Expand Down Expand Up @@ -459,6 +468,24 @@ export function HackathonSettingsForm({ hackathonId }: HackathonSettingsFormProp
placeholder="Enter Notion link for pre-hackathon workshops"
/>
</div>
<div className="space-y-2">
<Label htmlFor="hackerPackageIFrame">Hacker Package IFrame</Label>
<div className="text-muted-foreground text-sm">
<p>1. Publish the hacker package</p>
<p>2. Click site settings → Publish tab → Embed this page</p>
<p>3. Disable "Show page header"</p>
<p>4. Copy code</p>
</div>
<Input
id="hackerPackageIFrame"
value={getValue("notionLinks", "hackerPackageIFrame")}
onChange={(e) =>
handleFieldChange("notionLinks", e.target.value, "hackerPackageIFrame")
}
disabled={!isEditing}
placeholder="Enter Notion embed code for hacker package"
/>
</div>
</div>
</div>

Expand Down
3 changes: 3 additions & 0 deletions src/lib/firebase/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ export interface Applicant {
breakfast?: Timestamp[];
lunch?: Timestamp[];
dinner?: Timestamp[];
snack?: Timestamp[];
};
day2?: {
breakfast?: Timestamp[];
Expand Down Expand Up @@ -541,6 +542,7 @@ export interface WaiversAndForms {
}

export interface NotionLinks {
hackerPackageIFrame: string;
preHackathonWorkshops: string;
}

Expand Down Expand Up @@ -589,6 +591,7 @@ export interface HackathonConfig {
offWaitlistNotify: HackathonConfigMap;
portalLive: HackathonBooleanMap;
rsvpBy: HackathonConfigMap;
rsvpOpen: HackathonBooleanMap;
sendAcceptancesBy: HackathonConfigMap;
submissionsOpen: HackathonBooleanMap;
waiversAndForms: WaiversAndFormsMap;
Expand Down
Loading