Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
9 changes: 9 additions & 0 deletions galasa-ui/messages/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@
"group": "Gruppe",
"submissionId": "Übermittlungs-ID",
"requestor": "Anforderer",
"user": "Benutzer",
"submitted": "Eingereicht",
"started": "Gestartet",
"finished": "Beendet",
Expand Down Expand Up @@ -325,6 +326,7 @@
"submittedAt": "Eingereicht am",
"runName": "Name des Testlaufs",
"requestor": "Anforderer",
"user": "Benutzer",
"group": "Gruppe",
"bundle": "Bundle",
"package": "Paket",
Expand Down Expand Up @@ -358,6 +360,7 @@
"submittedAt": "Eingereicht am",
"runName": "Ausführungsname",
"requestor": "Anforderer",
"user": "Benutzer",
"submissionId": "Einreichungs-ID",
"group": "Gruppe",
"bundle": "Paket",
Expand Down Expand Up @@ -445,6 +448,11 @@
"requestor": {
"label": "Anforderer",
"placeholder": "beliebig",
"description": "Geben Sie den Namen des Anforderers ein, dessen Token zum Anfordern der Testläufe verwendet wurde, die Sie finden möchten."
},
"user": {
"label": "Benutzer",
"placeholder": "beliebig",
"description": "Geben Sie den Namen des Benutzers ein, der die Testläufe angefordert hat, die Sie finden möchten."
},
"group": {
Expand Down Expand Up @@ -517,6 +525,7 @@
"submittedAt": "Eingereicht am",
"runName": "Name des Testlaufs",
"requestor": "Anforderer",
"user": "Benutzer",
"group": "Gruppe",
"bundle": "Bundle",
"package": "Paket",
Expand Down
9 changes: 9 additions & 0 deletions galasa-ui/messages/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@
"group": "Group",
"submissionId": "Submission ID",
"requestor": "Requestor",
"user": "User",
"submitted": "Submitted",
"started": "Started",
"finished": "Finished",
Expand Down Expand Up @@ -304,6 +305,7 @@
"submittedAt": "Submitted at",
"runName": "Test Run Name",
"requestor": "Requestor",
"user": "User",
"group": "Group",
"bundle": "Bundle",
"package": "Package",
Expand Down Expand Up @@ -337,6 +339,7 @@
"submittedAt": "Submitted At",
"runName": "Run Name",
"requestor": "Requestor",
"user": "User",
"submissionId": "Submission ID",
"group": "Group",
"bundle": "Bundle",
Expand Down Expand Up @@ -423,6 +426,11 @@
"requestor": {
"label": "Requestor",
"placeholder": "any",
"description": "Enter the name of the requestor whose token was used to request the test runs you want to find."
},
"user": {
"label": "User",
"placeholder": "any",
"description": "Enter the name of the user who requested the test runs you want to find."
},
"group": {
Expand Down Expand Up @@ -495,6 +503,7 @@
"submittedAt": "Submitted at",
"runName": "Test Run Name",
"requestor": "Requestor",
"user": "User",
"group": "Group",
"bundle": "Bundle",
"package": "Package",
Expand Down
1 change: 1 addition & 0 deletions galasa-ui/src/app/internal-api/test-runs/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ export async function GET(request: NextRequest) {
toDate,
runName: searchParams.get(TEST_RUNS_QUERY_PARAMS.RUN_NAME) || undefined,
requestor: searchParams.get(TEST_RUNS_QUERY_PARAMS.REQUESTOR) || undefined,
user: searchParams.get(TEST_RUNS_QUERY_PARAMS.USER) || undefined,
group: searchParams.get(TEST_RUNS_QUERY_PARAMS.GROUP) || undefined,
submissionId: searchParams.get(TEST_RUNS_QUERY_PARAMS.SUBMISSION_ID) || undefined,
bundle: searchParams.get(TEST_RUNS_QUERY_PARAMS.BUNDLE) || undefined,
Expand Down
5 changes: 4 additions & 1 deletion galasa-ui/src/components/test-runs/TestRunsTabs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ export default function TestRunsTabs({
submittedAt: structure.queued || 'N/A',
runName: structure.runName || 'N/A',
requestor: structure.requestor || 'N/A',
user: structure.user || 'N/A',
group: structure.group || 'N/A',
bundle: structure.bundle || 'N/A',
package: structure.testName?.substring(0, structure.testName.lastIndexOf('.')) || 'N/A',
Expand Down Expand Up @@ -121,6 +122,7 @@ export default function TestRunsTabs({
TEST_RUNS_QUERY_PARAMS.DURATION,
TEST_RUNS_QUERY_PARAMS.RUN_NAME,
TEST_RUNS_QUERY_PARAMS.REQUESTOR,
TEST_RUNS_QUERY_PARAMS.USER,
TEST_RUNS_QUERY_PARAMS.GROUP,
TEST_RUNS_QUERY_PARAMS.SUBMISSION_ID,
TEST_RUNS_QUERY_PARAMS.BUNDLE,
Expand All @@ -141,7 +143,8 @@ export default function TestRunsTabs({
key === TEST_RUNS_QUERY_PARAMS.TAGS ||
key === TEST_RUNS_QUERY_PARAMS.RESULT ||
key === TEST_RUNS_QUERY_PARAMS.STATUS ||
key === TEST_RUNS_QUERY_PARAMS.REQUESTOR
key === TEST_RUNS_QUERY_PARAMS.REQUESTOR ||
key === TEST_RUNS_QUERY_PARAMS.USER
) {
value = value?.split(',').sort().join(',');
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,12 @@ export default function SearchCriteriaContent({
placeHolder: 'any',
description: translations('fields.requestor.description'),
},
{
id: TEST_RUNS_QUERY_PARAMS.USER,
label: translations('fields.user.label'),
placeHolder: 'any',
description: translations('fields.user.description'),
},
{
id: TEST_RUNS_QUERY_PARAMS.GROUP,
label: translations('fields.group.label'),
Expand Down Expand Up @@ -298,6 +304,9 @@ export default function SearchCriteriaContent({
case TEST_RUNS_QUERY_PARAMS.REQUESTOR:
customComponent = <CustomSearchComponent {...searchProps} allRequestors={allRequestors} />;
break;
case TEST_RUNS_QUERY_PARAMS.USER:
customComponent = <CustomSearchComponent {...searchProps} allRequestors={allRequestors} />;
break;
case TEST_RUNS_QUERY_PARAMS.RESULT:
case TEST_RUNS_QUERY_PARAMS.STATUS:
customComponent = <CustomCheckBoxList {...checkboxProps} />;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ const OverviewTab = ({ metadata }: { metadata: RunMetadata }) => {
<InlineText title={`${translations('group')}:`} value={metadata?.group} />
<InlineText title={`${translations('submissionId')}:`} value={metadata?.submissionId} />
<InlineText title={`${translations('requestor')}:`} value={metadata?.requestor} />
<InlineText title={`${translations('user')}:`} value={metadata?.user} />

<div className={styles.infoContainer}>
<InlineText title={`${translations('submitted')}:`} value={metadata?.submitted} />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ const TestRunDetails = ({
runDetails.testStructure?.testName.lastIndexOf('.')
) || 'N/A',
requestor: runDetails.testStructure?.requestor!,
user: runDetails.testStructure?.user!,
rawSubmittedAt: runDetails.testStructure?.queued,
submitted: runDetails.testStructure?.queued
? formatDate(new Date(runDetails.testStructure?.queued!))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -829,6 +829,7 @@ describe('TestRunsTabs Component', () => {
testName: 'N/A',
runName: 'N/A',
testShortName: 'N/A',
user: 'N/A',
};

beforeEach(() => {
Expand Down
5 changes: 5 additions & 0 deletions galasa-ui/src/utils/constants/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ const COLUMNS_IDS = {
SUBMITTED_AT: 'submittedAt',
TEST_RUN_NAME: 'runName',
REQUESTOR: 'requestor',
USER: 'user',
SUBMISSION_ID: 'submissionId',
GROUP: 'group',
BUNDLE: 'bundle',
Expand All @@ -60,6 +61,7 @@ const RESULTS_TABLE_COLUMNS: ColumnDefinition[] = [
{ id: 'submittedAt', columnName: 'Submitted at' },
{ id: 'runName', columnName: 'Test Run name' },
{ id: 'requestor', columnName: 'Requestor' },
{ id: 'user', columnName: 'User' },
{ id: 'submissionId', columnName: 'Submission ID' },
{ id: 'group', columnName: 'Group' },
{ id: 'bundle', columnName: 'Bundle' },
Expand All @@ -77,6 +79,7 @@ const TEST_RUNS_QUERY_PARAMS = {
DURATION: 'duration',
RUN_NAME: 'runName',
REQUESTOR: 'requestor',
USER: 'user',
GROUP: 'group',
BUNDLE: 'bundle',
PACKAGE: 'package',
Expand Down Expand Up @@ -105,6 +108,7 @@ const TABS_IDS = ['timeframe', 'table-design', 'search-criteria', 'results', 'gr
const SEARCH_CRITERIA_KEYS = [
TEST_RUNS_QUERY_PARAMS.RUN_NAME,
TEST_RUNS_QUERY_PARAMS.REQUESTOR,
TEST_RUNS_QUERY_PARAMS.USER,
TEST_RUNS_QUERY_PARAMS.GROUP,
TEST_RUNS_QUERY_PARAMS.SUBMISSION_ID,
TEST_RUNS_QUERY_PARAMS.BUNDLE,
Expand All @@ -118,6 +122,7 @@ const DEFAULT_VISIBLE_COLUMNS: string[] = [
COLUMNS_IDS.SUBMITTED_AT,
COLUMNS_IDS.TEST_RUN_NAME,
COLUMNS_IDS.REQUESTOR,
COLUMNS_IDS.USER,
COLUMNS_IDS.TEST_SHORT_NAME,
COLUMNS_IDS.STATUS,
COLUMNS_IDS.RESULT,
Expand Down
2 changes: 2 additions & 0 deletions galasa-ui/src/utils/encoding/urlStateMappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ const keyMap: Record<string, string> = {
[TEST_RUNS_QUERY_PARAMS.TO]: 'to',
[TEST_RUNS_QUERY_PARAMS.RUN_NAME]: 'rn',
[TEST_RUNS_QUERY_PARAMS.REQUESTOR]: 'r',
[TEST_RUNS_QUERY_PARAMS.USER]: 'u',
[TEST_RUNS_QUERY_PARAMS.SUBMISSION_ID]: 'sid',
[TEST_RUNS_QUERY_PARAMS.GROUP]: 'g',
[TEST_RUNS_QUERY_PARAMS.BUNDLE]: 'b',
Expand All @@ -37,6 +38,7 @@ export const valueMap: Record<string, string> = {
submittedAt: 'sA',
runName: 'rn',
requestor: 'rq',
user: 'us',
testName: 'tn',
status: 'st',
result: 'rs',
Expand Down
2 changes: 2 additions & 0 deletions galasa-ui/src/utils/interfaces/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ export interface runStructure {
submittedAt: string;
runName: string;
requestor: string;
user: string;
group: string;
bundle: string;
package: string;
Expand All @@ -64,6 +65,7 @@ export interface DataPoint {
submittedAt: string;
runName: string;
requestor: string;
user: string;
group: string;
bundle: string;
package: string;
Expand Down
1 change: 1 addition & 0 deletions galasa-ui/src/utils/interfaces/testRuns.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export interface RunMetadata {
package: string;
group: string;
requestor: string;
user: string;
rawSubmittedAt?: string;
submitted: string;
startedAt: string;
Expand Down