Skip to content

Commit eb30508

Browse files
manisha-niManisha Sivakumar
manisha-ni
and
Manisha Sivakumar
authored
fix(workorders,testplans): Fix field names (#306)
Signed-off-by: Manisha Sivakumar <[email protected]> Co-authored-by: Manisha Sivakumar <[email protected]>
1 parent 7e22cbc commit eb30508

File tree

4 files changed

+129
-9
lines changed

4 files changed

+129
-9
lines changed

‎src/datasources/test-plans/TestPlansDataSource.test.ts‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -841,6 +841,82 @@ describe('runQuery', () => {
841841
expect(result.fields[0].type).toEqual(FieldType.string);
842842
expect(result.fields[1].type).toEqual(FieldType.string);
843843
});
844+
845+
test('should set field names as expected', async () => {
846+
const mockQuery = {
847+
refId: 'A',
848+
outputType: OutputType.Properties,
849+
properties: [
850+
Properties.ASSIGNED_TO,
851+
Properties.CREATED_AT,
852+
Properties.CREATED_BY,
853+
Properties.DESCRIPTION,
854+
Properties.ID,
855+
Properties.NAME,
856+
Properties.PROPERTIES,
857+
Properties.STATE,
858+
Properties.UPDATED_AT,
859+
Properties.UPDATED_BY,
860+
Properties.WORKSPACE,
861+
Properties.WORK_ORDER,
862+
Properties.WORK_ORDER_ID,
863+
Properties.PRODUCT_NAME,
864+
Properties.PRODUCT_ID,
865+
Properties.PART_NUMBER,
866+
Properties.PLANNED_START_DATE_TIME,
867+
Properties.ESTIMATED_END_DATE_TIME,
868+
Properties.ESTIMATED_DURATION_IN_SECONDS,
869+
Properties.SYSTEM_NAME,
870+
Properties.SYSTEM_ID,
871+
Properties.TEMPLATE,
872+
Properties.TEMPLATE_ID,
873+
Properties.TEST_PROGRAM,
874+
Properties.SUBSTATE,
875+
Properties.FIXTURE_NAMES,
876+
Properties.DUT_ID,
877+
Properties.DUT_NAME,
878+
Properties.DUT_SERIAL_NUMBER,
879+
],
880+
};
881+
882+
const testPlansResponse = {
883+
testPlans: [],
884+
};
885+
886+
jest.spyOn(datastore, 'queryTestPlansInBatches').mockResolvedValue(testPlansResponse);
887+
888+
const result = await datastore.runQuery(mockQuery, {} as DataQueryRequest);
889+
890+
expect(result.fields[0].name).toEqual('Assigned to');
891+
expect(result.fields[1].name).toEqual('Created');
892+
expect(result.fields[2].name).toEqual('Created by');
893+
expect(result.fields[3].name).toEqual('Description');
894+
expect(result.fields[4].name).toEqual('ID');
895+
expect(result.fields[5].name).toEqual('Name');
896+
expect(result.fields[6].name).toEqual('Properties');
897+
expect(result.fields[7].name).toEqual('State');
898+
expect(result.fields[8].name).toEqual('Updated');
899+
expect(result.fields[9].name).toEqual('Updated by');
900+
expect(result.fields[10].name).toEqual('Workspace');
901+
expect(result.fields[11].name).toEqual('Work order');
902+
expect(result.fields[12].name).toEqual('Work order ID');
903+
expect(result.fields[13].name).toEqual('Product name');
904+
expect(result.fields[14].name).toEqual('Product ID');
905+
expect(result.fields[15].name).toEqual('Part number');
906+
expect(result.fields[16].name).toEqual('Planned start date/time');
907+
expect(result.fields[17].name).toEqual('Estimated end date/time');
908+
expect(result.fields[18].name).toEqual('Estimated duration');
909+
expect(result.fields[19].name).toEqual('System name');
910+
expect(result.fields[20].name).toEqual('System ID');
911+
expect(result.fields[21].name).toEqual('Test plan template');
912+
expect(result.fields[22].name).toEqual('Template ID');
913+
expect(result.fields[23].name).toEqual('Test program name');
914+
expect(result.fields[24].name).toEqual('Substate');
915+
expect(result.fields[25].name).toEqual('Fixture names');
916+
expect(result.fields[26].name).toEqual('DUT ID');
917+
expect(result.fields[27].name).toEqual('DUT name');
918+
expect(result.fields[28].name).toEqual('DUT serial number');
919+
});
844920
});
845921

846922
describe('loadWorkspaces', () => {

‎src/datasources/test-plans/types.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { DataQuery } from '@grafana/schema'
1+
import { DataQuery } from '@grafana/schema';
22

33
export interface TestPlansQuery extends DataQuery {
44
properties?: Properties[];
@@ -97,7 +97,7 @@ export const PropertiesProjectionMap: Record<Properties, {
9797
field: 'assignedTo',
9898
},
9999
[Properties.CREATED_AT]: {
100-
label: 'Created at',
100+
label: 'Created',
101101
projection: [Projections.CREATED_AT],
102102
field: 'createdAt',
103103
},
@@ -132,7 +132,7 @@ export const PropertiesProjectionMap: Record<Properties, {
132132
field: 'state',
133133
},
134134
[Properties.UPDATED_AT]: {
135-
label: 'Updated at',
135+
label: 'Updated',
136136
projection: [Projections.UPDATED_AT],
137137
field: 'updatedAt',
138138
},

‎src/datasources/work-orders/WorkOrdersDataSource.test.ts‎

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ describe('WorkOrdersDataSource', () => {
114114
const response = await datastore.runQuery(mockQuery, {} as DataQueryRequest);
115115

116116
expect(response.fields).toHaveLength(1);
117-
expect(response.fields).toEqual([{"name": "Work order name", "type": "string", "values": []}]);
117+
expect(response.fields).toEqual([{"name": "Name", "type": "string", "values": []}]);
118118
expect(response.refId).toEqual('A');
119119
expect(response.name).toEqual('A');
120120
expect(datastore.queryWorkordersData).toHaveBeenCalledWith('filter', ["NAME"], undefined, undefined, undefined);
@@ -355,6 +355,50 @@ describe('WorkOrdersDataSource', () => {
355355
expect(result.fields[0].type).toEqual(FieldType.string);
356356
expect(result.fields[1].type).toEqual(FieldType.string);
357357
});
358+
359+
it('should set field names as expected', async () => {
360+
const mockQuery = {
361+
refId: 'A',
362+
outputType: OutputType.Properties,
363+
properties: [
364+
WorkOrderPropertiesOptions.ID,
365+
WorkOrderPropertiesOptions.NAME,
366+
WorkOrderPropertiesOptions.TYPE,
367+
WorkOrderPropertiesOptions.STATE,
368+
WorkOrderPropertiesOptions.REQUESTED_BY,
369+
WorkOrderPropertiesOptions.ASSIGNED_TO,
370+
WorkOrderPropertiesOptions.CREATED_AT,
371+
WorkOrderPropertiesOptions.UPDATED_AT,
372+
WorkOrderPropertiesOptions.CREATED_BY,
373+
WorkOrderPropertiesOptions.UPDATED_BY,
374+
WorkOrderPropertiesOptions.DESCRIPTION,
375+
WorkOrderPropertiesOptions.EARLIEST_START_DATE,
376+
WorkOrderPropertiesOptions.DUE_DATE,
377+
WorkOrderPropertiesOptions.WORKSPACE,
378+
WorkOrderPropertiesOptions.PROPERTIES
379+
],
380+
};
381+
382+
jest.spyOn(datastore, 'queryWorkordersData').mockResolvedValue([] as WorkOrder[]);
383+
384+
const result = await datastore.runQuery(mockQuery, {} as DataQueryRequest);
385+
386+
expect(result.fields[0].name).toEqual('ID');
387+
expect(result.fields[1].name).toEqual('Name');
388+
expect(result.fields[2].name).toEqual('Type');
389+
expect(result.fields[3].name).toEqual('State');
390+
expect(result.fields[4].name).toEqual('Requested by');
391+
expect(result.fields[5].name).toEqual('Assigned to');
392+
expect(result.fields[6].name).toEqual('Created');
393+
expect(result.fields[7].name).toEqual('Updated');
394+
expect(result.fields[8].name).toEqual('Created by');
395+
expect(result.fields[9].name).toEqual('Updated by');
396+
expect(result.fields[10].name).toEqual('Description');
397+
expect(result.fields[11].name).toEqual('Earliest start date');
398+
expect(result.fields[12].name).toEqual('Due date');
399+
expect(result.fields[13].name).toEqual('Workspace');
400+
expect(result.fields[14].name).toEqual('Properties');
401+
});
358402
});
359403

360404
describe('loadWorkspaces', () => {

‎src/datasources/work-orders/types.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,17 @@ export const WorkOrderProperties: Record<WorkOrderPropertiesOptions, {
4545
field: keyof WorkOrder;
4646
}> = {
4747
[WorkOrderPropertiesOptions.ID]: {
48-
label: 'Work order ID',
48+
label: 'ID',
4949
value: WorkOrderPropertiesOptions.ID,
5050
field: 'id',
5151
},
5252
[WorkOrderPropertiesOptions.NAME]: {
53-
label: 'Work order name',
53+
label: 'Name',
5454
value: WorkOrderPropertiesOptions.NAME,
5555
field: 'name',
5656
},
5757
[WorkOrderPropertiesOptions.TYPE]: {
58-
label: 'Work order type',
58+
label: 'Type',
5959
value: WorkOrderPropertiesOptions.TYPE,
6060
field: 'type',
6161
},
@@ -75,12 +75,12 @@ export const WorkOrderProperties: Record<WorkOrderPropertiesOptions, {
7575
field: 'assignedTo',
7676
},
7777
[WorkOrderPropertiesOptions.CREATED_AT]: {
78-
label: 'Created at',
78+
label: 'Created',
7979
value: WorkOrderPropertiesOptions.CREATED_AT,
8080
field: 'createdAt',
8181
},
8282
[WorkOrderPropertiesOptions.UPDATED_AT]: {
83-
label: 'Updated at',
83+
label: 'Updated',
8484
value: WorkOrderPropertiesOptions.UPDATED_AT,
8585
field: 'updatedAt',
8686
},

0 commit comments

Comments
 (0)