Skip to content

Commit f521cc2

Browse files
committed
Minor fixes in the models + travis config
Signed-off-by: Simon Delisle <simon.delisle@ericsson.com>
1 parent 2e1b099 commit f521cc2

File tree

8 files changed

+45
-24
lines changed

8 files changed

+45
-24
lines changed

.travis.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
dist: xenial
2+
sudo: required
3+
language: node_js
4+
node_js: '10'
5+
git:
6+
depth: 1
7+
cache:
8+
yarn: true
9+
directories:
10+
- node_modules
11+
branches:
12+
only:
13+
- master
14+
install:
15+
- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.13.0
16+
- export PATH=$HOME/.yarn/bin:$PATH ;
17+
script:
18+
- yarn && yarn build
19+
before_deploy:
20+
- printf "//registry.npmjs.org/:_authToken=${NPM_AUTH_TOKEN}\n" >> ~/.npmrc
21+
deploy:
22+
provider: script
23+
script: yarn run publish:next
24+
skip_cleanup: true
25+
on:
26+
branch: master

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
"node-fetch": "^2.2.1"
3838
},
3939
"scripts": {
40-
"build": "tsc"
40+
"build": "tsc",
41+
"publish:next": "yarn publish --tag next"
4142
}
4243
}

src/index.ts

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
/********************************************************************************
2-
* Copyright (C) 2018 Ericsson and others.
3-
*
4-
* This program and the accompanying materials are made available under the
5-
* terms of the Eclipse Public License v. 2.0 which is available at
6-
* http://www.eclipse.org/legal/epl-2.0.
7-
*
8-
* This Source Code may also be made available under the following Secondary
9-
* Licenses when the conditions for such availability set forth in the Eclipse
10-
* Public License v. 2.0 are satisfied: GNU General Public License, version 2
11-
* with the GNU Classpath Exception which is available at
12-
* https://www.gnu.org/software/classpath/license.html.
13-
*
14-
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15-
********************************************************************************/
16-
171
export * from './models/query/query';
182
export * from './models/query/query-helper';
193
export * from './models/response/responses';

src/models/entry.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,12 @@ export interface Entry {
1515
/**
1616
* Array of string that represant the content of each column
1717
*/
18-
name: string[];
18+
labels: string[];
19+
20+
/**
21+
* Style key used to search for a The style map can be obtained by using the style endpoint.
22+
*/
23+
styleKey?: string;
1924
}
2025

2126
/**

src/models/output-descriptor.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export interface OutputDescriptor {
2121
* Type of data returned by this output.
2222
* Serve as a hint to determine what kind of view should be use for this output (ex. XY, Time Graph, Table, etc..)
2323
*/
24-
responseType: string;
24+
type: string;
2525

2626
/**
2727
* Map of query parameters that the provider accept

src/models/timegraph.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ import { Entry } from './entry';
44
* Entry in a time graph
55
*/
66
export interface TimeGraphEntry extends Entry {
7+
/**
8+
* Type of the entry
9+
*/
10+
type: string;
11+
712
/**
813
* Start time of the entry
914
*/
@@ -54,7 +59,7 @@ export interface TimeGraphState {
5459
/**
5560
* End time of the state
5661
*/
57-
endTime: number;
62+
duration: number;
5863

5964
/**
6065
* Label to apply to the state

src/models/xy.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export interface XYModel {
1515
/**
1616
* Array of XY series
1717
*/
18-
series: { [key: string]: XYSeries }; // Map<string, XYSeries>;
18+
series: { [key: string]: XYSeries };
1919
}
2020

2121
/**
@@ -25,12 +25,12 @@ export interface XYSeries {
2525
/**
2626
* Name of the series
2727
*/
28-
seriesName: string;
28+
name: string;
2929

3030
/**
3131
* Ìd of the series
3232
*/
33-
seriesId: string;
33+
id: string;
3434

3535
/**
3636
* Description of the X axis

src/protocol/tsp-client.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ export class TspClient {
142142
public async fetchXYTree<M extends Entry, H extends EntryHeader>(expUUID: string,
143143
outputID: string, parameters: Query): Promise<TspClientResponse<GenericResponse<EntryModel<M, H>>>> {
144144
const url = this.baseUrl + '/experiments/' + expUUID + '/outputs/XY/' + outputID + '/tree';
145-
return await RestClient.post<GenericResponse<EntryModel<M, H>>>(url, parameters)
145+
return await RestClient.post<GenericResponse<EntryModel<M, H>>>(url, parameters);
146146
}
147147

148148
/**

0 commit comments

Comments
 (0)