Skip to content

Commit 73bc661

Browse files
authored
12.0.1 (#991)
* feat: support openfin-layouts * feat: disable tabbing on all windows * feat: disable toggle compact / full view when windows are snapped together * feat: add undock button on window toolbar when snapped * fix: use QUANDL API key as environment variable in development mode * chore: update build tools
1 parent 8b768a6 commit 73bc661

37 files changed

+33671
-125
lines changed

.babelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"presets": ["es2015", "react"],
2+
"presets": ["@babel/preset-env", "@babel/preset-react"],
33
"env": {
44
"test": {
55
"plugins": ["rewire"]

.eslintrc

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
"browser": true,
66
"es6": true
77
},
8-
"parserOptions": {
9-
"ecmaVersion": 6,
10-
"sourceType": "module",
11-
"ecmaFeatures": {
12-
"jsx": true
13-
}
8+
"parserOptions": {
9+
"ecmaVersion": 2017,
10+
"sourceType": "module",
11+
"ecmaFeatures": {
12+
"jsx": true
13+
}
1414
},
1515
"rules": {
1616
"react/jsx-uses-react": 2,
@@ -31,7 +31,10 @@
3131
"import/no-extraneous-dependencies": ["error", {
3232
"devDependencies": ["test/**", "openfin-config/**", "openfin-launcher/**", "webpack/**", "**/*.dev*"],
3333
"optionalDependencies": false
34-
}]
34+
}],
35+
"no-unused-vars": ["error", { "argsIgnorePattern": "^_" }],
36+
"no-nested-ternary": "off",
37+
"no-use-before-define": "off"
3538
},
3639
"plugins": [
3740
"react",

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,6 @@ jspm_packages
4545

4646
# Public built files
4747
public
48+
49+
#Openfin cache
50+
OpenFin/

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: node_js
22

33
node_js:
4-
- '6.9'
4+
- '10.14.0'
55

66
sudo: false
77

CONTRIBUTING.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,23 @@ This project uses the [GitFlow]([https://www.atlassian.com/git/tutorials/compari
6565

6666
Please follow the [AngularJS commit message convention](https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md#-git-commit-guidelines) for the commit message format.
6767
This simplifies the generation of the change log for a release.
68+
69+
70+
## Creating a release
71+
72+
Create locally a new branch based off `dev`, named `release-x.x.x`.
73+
On this branch update the version in `package.json` to match the release number
74+
and commit the change with the version as the commit message.
75+
Push the branch to the upstream repository (provided you have write permission)
76+
and open PR for this branch into `dev` and `master` branches.
77+
Once the build has passed you can merge both PRs.
78+
Travis should do the deployment(s) automatically.
79+
The release candidate can be found at
80+
[http://scottlogic.github.io/StockFlux/11.2.0-rc/install.html](http://scottlogic.github.io/StockFlux/x.x.x-rc/install.html)
81+
Now checkout to the `master` branch locally, tag the release
82+
`git tag -a x.x.x -m "x.x.x"` and push the tag to the upstream repository
83+
`git push origin x.x.x`
84+
On github go to [releases](https://github.com/ScottLogic/StockFlux/releases),
85+
check that the tag appears at the top of the timeline.
86+
Click on `Draft a new release`, fill the form and confirm by clicking on
87+
`Publish release`

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ The application is built using React and ES2015, transpiled via Babel. The chart
2323

2424
The displayed data is real and provided by [Quandl](https://www.quandl.com). The application uses separate Quandl API keys for development and release to mitigate chances of crossing Quandl's [rate limits](https://www.quandl.com/docs/api?json#rate-limits).
2525

26+
When working locally, make sure you set the environment variable `QUANDL_API_KEY` representing the Quandl API key before you start the development server or run a build.
27+
The key is located in the StockFlux confluence page under the Internal Systems space.
28+
2629
### Initial Setup
2730

2831
[npm](https://www.npmjs.com/), the package manager for [Node.js](https://nodejs.org/), is used to manage the project's dependencies. [Grunt](http://gruntjs.com/), a JavaScript task runner, is used to test and build the project.

openfin-config/app.dev.json

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,25 @@
33
"startup_app": {
44
"name": "StockFlux Development",
55
"uuid": "StockFluxDev",
6-
"maxWidth": 600,
7-
"maxHeight": 200,
8-
"defaultWidth": 400,
9-
"defaultHeight": 200,
6+
"maxWidth": 100,
7+
"maxHeight": 100,
8+
"defaultWidth": 100,
9+
"defaultHeight": 100,
1010
"frame": false,
1111
"showTaskbarIcon": false,
1212
"url": "http://localhost:5000/parent.html",
1313
"autoShow" : true,
1414
"applicationIcon": "http://localhost:5000/favicon.ico"
1515
},
16+
"services": [
17+
{
18+
"name": "layouts",
19+
"manifestUrl": "https://cdn.openfin.co/services/openfin/layouts/0.9.3/app.json?$$disableTabbingOperations=true"
20+
}
21+
],
1622
"runtime": {
1723
"arguments": "--enable-aggressive-domstorage-flushing",
18-
"version": "8.56.24.41"
24+
"version": "9.61.36.36"
1925
},
2026
"shortcut": {
2127
"company": "ScottLogic",

openfin-config/app.prod.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,15 @@
1313
"autoShow" : false,
1414
"applicationIcon": "http://localhost:5001/favicon.ico"
1515
},
16+
"services": [
17+
{
18+
"name": "layouts",
19+
"manifestUrl": "https://cdn.openfin.co/services/openfin/layouts/0.9.3/app.json?$$disableTabbingOperations=true"
20+
}
21+
],
1622
"runtime": {
1723
"arguments": "--enable-aggressive-domstorage-flushing",
18-
"version": "8.56.24.41"
24+
"version": "9.61.36.36"
1925
},
2026
"shortcut": {
2127
"company": "ScottLogic",

0 commit comments

Comments
 (0)