Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
3160412
Checkout merge fixes
BelSequent Dec 9, 2025
4308855
wip
BelSequent Dec 10, 2025
c440511
wip
BelSequent Dec 10, 2025
ce0992a
Fixes
BelSequent Dec 11, 2025
df27f03
Fix duplications
BelSequent Dec 11, 2025
fbf764b
Fix
BelSequent Dec 12, 2025
f98ea64
Merge branch 'main' into feat/meta-6753-fix-merge/main
BelSequent Dec 12, 2025
f40b1f9
wip
BelSequent Dec 15, 2025
bcd40a8
Fix indexes usage
BelSequent Dec 15, 2025
67f17ff
Fix timestamp filter
BelSequent Dec 15, 2025
110fd01
Fix
BelSequent Dec 15, 2025
6b29063
Fix step-cli build
BelSequent Dec 15, 2025
c21094d
Merge branch 'main' into feat/meta-6753-fix-merge/main
BelSequent Dec 15, 2025
f21a59a
Release notes and UI filter timezone fix.
BelSequent Dec 17, 2025
87ed350
Format
BelSequent Dec 17, 2025
938c18f
wip
BelSequent Dec 17, 2025
0102bec
Merge branch 'main' into feat/meta-6753-fix-merge/main
BelSequent Dec 18, 2025
d809107
Update release-next.md
BelSequent Dec 18, 2025
2185fb9
Merge branch 'main' into feat/meta-6753-fix-merge/main
BelSequent Dec 19, 2025
b20800f
Rev
BelSequent Dec 19, 2025
88ec4ee
Format
BelSequent Dec 19, 2025
0f2481d
Merge remote-tracking branch 'origin/main' into feat/meta-6753-fix-me…
BelSequent Jan 16, 2026
0d30b13
Fix filter by username in tenant realm
BelSequent Jan 16, 2026
108123d
Fixes COLUMN labels
BelSequent Jan 16, 2026
809bb7f
Merge branch 'main' into feat/meta-6753-fix-merge/main
BelSequent Jan 21, 2026
a293c47
Fix unwrap risk
BelSequent Jan 21, 2026
53cff44
Filter fixes, timestamps with range
BelSequent Jan 21, 2026
371d7c1
Merge remote-tracking branch 'origin/main' into feat/meta-6753-fix-me…
BelSequent Feb 5, 2026
24f1c5b
Fix
BelSequent Feb 5, 2026
1b4c59a
Format
BelSequent Feb 5, 2026
ce2b822
Merge branch 'main' into feat/meta-6753-fix-merge/main
BelSequent Feb 9, 2026
bc02457
Merge branch 'main' into feat/meta-6753-fix-merge/main
xalsina-sequent Feb 10, 2026
c7fd5af
Merge branch 'main' into feat/meta-6753-fix-merge/main
BelSequent Feb 18, 2026
603f54d
Merge branch 'main' into feat/meta-6753-fix-merge/main
xalsina-sequent Mar 9, 2026
1feeea2
Merge remote-tracking branch 'origin/main' into feat/meta-6753-fix-me…
BelSequent Apr 17, 2026
ddc8923
Fix conflicts
BelSequent Apr 17, 2026
60992e0
wip
BelSequent Apr 17, 2026
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
6 changes: 4 additions & 2 deletions hasura/metadata/actions.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -725,8 +725,10 @@ input PgAuditOrderBy {
input ElectoralLogFilter {
id: String
user_id: String
created: String
statement_timestamp: String
created_min: String
created_max: String
statement_timestamp_min: String
statement_timestamp_max: String
statement_kind: String
username: String
}
Expand Down
1 change: 1 addition & 0 deletions packages/Cargo.lock

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

28 changes: 26 additions & 2 deletions packages/admin-portal/graphql.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -2336,7 +2336,19 @@
"fields": null,
"inputFields": [
{
"name": "created",
"name": "created_max",
"description": null,
"type": {
"kind": "SCALAR",
"name": "String",
"ofType": null
},
"defaultValue": null,
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "created_min",
"description": null,
"type": {
"kind": "SCALAR",
Expand Down Expand Up @@ -2372,7 +2384,19 @@
"deprecationReason": null
},
{
"name": "statement_timestamp",
"name": "statement_timestamp_max",
"description": null,
"type": {
"kind": "SCALAR",
"name": "String",
"ofType": null
},
"defaultValue": null,
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "statement_timestamp_min",
"description": null,
"type": {
"kind": "SCALAR",
Expand Down
33 changes: 25 additions & 8 deletions packages/admin-portal/src/components/ElectoralLogList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -181,16 +181,30 @@ export const ElectoralLogList: React.FC<ElectoralLogListProps> = ({
label={String(t("logsScreen.column.username"))}
/>,
<DateTimeInput
key={"created"}
source={"created"}
label={String(t("logsScreen.column.created"))}
key={"created_min"}
source={"created_min"}
label={String(t("logsScreen.column.created_min"))}
inputProps={{step: 1}}
parse={(value) => (value ? new Date(value).toISOString() : value)}
/>,
<DateTimeInput
key={"statement_timestamp"}
source={"statement_timestamp"}
label={String(t("logsScreen.column.statement_timestamp"))}
key={"created_max"}
source={"created_max"}
label={String(t("logsScreen.column.created_max"))}
inputProps={{step: 1}}
parse={(value) => (value ? new Date(value).toISOString() : value)}
/>,
<DateTimeInput
key={"statement_timestamp_min"}
source={"statement_timestamp_min"}
label={String(t("logsScreen.column.statement_timestamp_min"))}
inputProps={{step: 1}}
parse={(value) => (value ? new Date(value).toISOString() : value)}
/>,
<DateTimeInput
key={"statement_timestamp_max"}
source={"statement_timestamp_max"}
label={String(t("logsScreen.column.statement_timestamp_max"))}
inputProps={{step: 1}}
parse={(value) => (value ? new Date(value).toISOString() : value)}
/>,
Expand Down Expand Up @@ -264,10 +278,13 @@ export const ElectoralLogList: React.FC<ElectoralLogListProps> = ({
new Date(record.statement_timestamp * 1000).toLocaleString()
}
/>
<TextField source="statement_kind" />
<TextField
source="statement_kind"
label={String(t("logsScreen.column.statement_kind"))}
/>
<FunctionField
source="event_type"
label={String(t("logsScreen.column.statement_kind"))}
label={String(t("logsScreen.column.event_type"))}
render={(record: any) => getHeadField(record, "event_type")}
/>
<FunctionField
Expand Down
6 changes: 4 additions & 2 deletions packages/admin-portal/src/gql/graphql.ts
Original file line number Diff line number Diff line change
Expand Up @@ -282,10 +282,12 @@ export type ElectionStatsOutput = {
};

export type ElectoralLogFilter = {
created?: InputMaybe<Scalars['String']['input']>;
created_max?: InputMaybe<Scalars['String']['input']>;
created_min?: InputMaybe<Scalars['String']['input']>;
id?: InputMaybe<Scalars['String']['input']>;
statement_kind?: InputMaybe<Scalars['String']['input']>;
statement_timestamp?: InputMaybe<Scalars['String']['input']>;
statement_timestamp_max?: InputMaybe<Scalars['String']['input']>;
statement_timestamp_min?: InputMaybe<Scalars['String']['input']>;
user_id?: InputMaybe<Scalars['String']['input']>;
username?: InputMaybe<Scalars['String']['input']>;
};
Expand Down
9 changes: 8 additions & 1 deletion packages/admin-portal/src/queries/ListElectoralLog.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,14 @@
// SPDX-License-Identifier: AGPL-3.0-only
import {gql} from "@apollo/client"

const validOrderBy = ["id", "created", "statement_timestamp", "statement_kind", "user_id"]
const validOrderBy = [
"id",
"created",
"statement_timestamp",
"statement_kind",
"user_id",
"username",
]

export const getElectoralLogVariables = (input: any) => {
return {
Expand Down
17 changes: 12 additions & 5 deletions packages/admin-portal/src/queries/customBuildQuery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,10 @@ export const customBuildQuery =
"election_event_id",
"user_id",
"username",
"created",
"statement_timestamp",
"created_min",
"created_max",
"statement_timestamp_min",
"statement_timestamp_max",
"statement_kind",
]
Object.keys(params.filter).forEach((f) => {
Expand All @@ -83,11 +85,16 @@ export const customBuildQuery =
name: resourceName,
},
}
const builtVariables = buildVariables(introspectionResults)(
resource,
raFetchType,
params,
null
)
const finalVariables = getElectoralLogVariables(builtVariables)
return {
query: getElectoralLog(params),
variables: getElectoralLogVariables(
buildVariables(introspectionResults)(resource, raFetchType, params, null)
),
variables: finalVariables,
parseResponse: (res: any) => {
const response = res.data.listElectoralLog
let output = {
Expand Down
4 changes: 4 additions & 0 deletions packages/admin-portal/src/translations/cat.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,11 @@ const catalanTranslation: TranslationType = {
id: "ID",
statement_kind: "Tipus de declaració",
created: "Creat",
created_min: "Creat Mín",
created_max: "Creat Màx",
statement_timestamp: "Marca de temps de declaració",
statement_timestamp_min: "Marca de temps de declaració Mín",
statement_timestamp_max: "Marca de temps de declaració Màx",
message: "Missatge",
user_id: "ID d'usuari",
username: "Nom d'Usuari",
Expand Down
4 changes: 4 additions & 0 deletions packages/admin-portal/src/translations/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,11 @@ const englishTranslation = {
id: "Id",
statement_kind: "Statement kind",
created: "Created",
created_min: "Created Min",
created_max: "Created Max",
statement_timestamp: "Statement Timestamp",
statement_timestamp_min: "Statement Timestamp Min",
statement_timestamp_max: "Statement Timestamp Max",
message: "Message",
user_id: "User Id",
username: "Username",
Expand Down
4 changes: 4 additions & 0 deletions packages/admin-portal/src/translations/es.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,11 @@ const spanishTranslation: TranslationType = {
id: "ID",
statement_kind: "Tipo de declaración",
created: "Creado",
created_min: "Creado Mín",
created_max: "Creado Máx",
statement_timestamp: "Marca de tiempo de declaración",
statement_timestamp_min: "Marca de tiempo de declaración Mín",
statement_timestamp_max: "Marca de tiempo de declaración Máx",
message: "Mensaje",
user_id: "ID de usuario",
username: "Nombre de Usuario",
Expand Down
4 changes: 4 additions & 0 deletions packages/admin-portal/src/translations/eu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@ const basqueTranslation: TranslationType = {
id: "IDa",
statement_kind: "Adierazpen mota",
created: "Sortua",
created_min: "Sortua Min",
created_max: "Sortua Max",
statement_timestamp: "Adierazpen denbora-marka",
statement_timestamp_min: "Adierazpen denbora-marka Min",
statement_timestamp_max: "Adierazpen denbora-marka Max",
message: "Mezua",
user_id: "Erabiltzaile IDa",
username: "Erabiltzaile izena",
Expand Down
4 changes: 4 additions & 0 deletions packages/admin-portal/src/translations/fr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@ const frenchTranslation: TranslationType = {
id: "ID",
statement_kind: "Type de déclaration",
created: "Créé",
created_min: "Créé Min",
created_max: "Créé Max",
statement_timestamp: "Horodatage de déclaration",
statement_timestamp_min: "Horodatage de déclaration Min",
statement_timestamp_max: "Horodatage de déclaration Max",
message: "Message",
user_id: "ID utilisateur",
username: "Nom d'Utilisateur",
Expand Down
4 changes: 4 additions & 0 deletions packages/admin-portal/src/translations/gl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@ const galegoTranslation: TranslationType = {
id: "ID",
statement_kind: "Tipo de declaración",
created: "Creado",
created_min: "Creado Mín",
created_max: "Creado Máx",
statement_timestamp: "Marca de tiempo de declaración",
statement_timestamp_min: "Marca de tiempo de declaración Mín",
statement_timestamp_max: "Marca de tiempo de declaración Máx",
message: "Mensaje",
user_id: "ID de usuario",
username: "Nombre de Usuario",
Expand Down
4 changes: 4 additions & 0 deletions packages/admin-portal/src/translations/nl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,11 @@ const dutchTranslation: TranslationType = {
id: "Id",
statement_kind: "Soort verklaring",
created: "Aangemaakt",
created_min: "Aangemaakt Min",
created_max: "Aangemaakt Max",
statement_timestamp: "Tijdstempel verklaring",
statement_timestamp_min: "Tijdstempel verklaring Min",
statement_timestamp_max: "Tijdstempel verklaring Max",
message: "Bericht",
user_id: "Gebruikers-ID",
username: "Gebruikersnaam",
Expand Down
4 changes: 4 additions & 0 deletions packages/admin-portal/src/translations/tl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@ const tagalogTranslation: TranslationType = {
id: "ID",
statement_kind: "Uri ng Pahayag",
created: "Nilikha",
created_min: "Nilikha Min",
created_max: "Nilikha Max",
statement_timestamp: "Tatak ng Panahon ng Pahayag",
statement_timestamp_min: "Tatak ng Panahon ng Pahayag Min",
statement_timestamp_max: "Tatak ng Panahon ng Pahayag Max",
message: "Mensahe",
user_id: "ID ng User",
username: "Username",
Expand Down
28 changes: 26 additions & 2 deletions packages/ballot-verifier/graphql.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -2336,7 +2336,19 @@
"fields": null,
"inputFields": [
{
"name": "created",
"name": "created_max",
"description": null,
"type": {
"kind": "SCALAR",
"name": "String",
"ofType": null
},
"defaultValue": null,
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "created_min",
"description": null,
"type": {
"kind": "SCALAR",
Expand Down Expand Up @@ -2372,7 +2384,19 @@
"deprecationReason": null
},
{
"name": "statement_timestamp",
"name": "statement_timestamp_max",
"description": null,
"type": {
"kind": "SCALAR",
"name": "String",
"ofType": null
},
"defaultValue": null,
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "statement_timestamp_min",
"description": null,
"type": {
"kind": "SCALAR",
Expand Down
6 changes: 4 additions & 2 deletions packages/ballot-verifier/src/gql/graphql.ts
Original file line number Diff line number Diff line change
Expand Up @@ -283,10 +283,12 @@ export type ElectionStatsOutput = {
}

export type ElectoralLogFilter = {
created?: InputMaybe<Scalars["String"]["input"]>
created_max?: InputMaybe<Scalars["String"]["input"]>
created_min?: InputMaybe<Scalars["String"]["input"]>
id?: InputMaybe<Scalars["String"]["input"]>
statement_kind?: InputMaybe<Scalars["String"]["input"]>
statement_timestamp?: InputMaybe<Scalars["String"]["input"]>
statement_timestamp_max?: InputMaybe<Scalars["String"]["input"]>
statement_timestamp_min?: InputMaybe<Scalars["String"]["input"]>
user_id?: InputMaybe<Scalars["String"]["input"]>
username?: InputMaybe<Scalars["String"]["input"]>
}
Expand Down
1 change: 1 addition & 0 deletions packages/electoral-log/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ tracing-log = "0.2"
tracing-attributes = "0.1"
tracing-subscriber = "0.3"
tracing-tree = "0.4"
chrono = "0.4.41"

[dev-dependencies]
serial_test = "3.2"
Loading
Loading