Skip to content
This repository has been archived by the owner on Jan 9, 2023. It is now read-only.

HospitalRun electron #1058

Merged
merged 65 commits into from
Apr 21, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
3c30086
Setup ember-electron for HospitalRun
jkleinsc Feb 27, 2017
bd05eab
Adding standAlone flag in config service
tangollama Mar 15, 2017
0579dbc
conditionally create the local usersDB
tangollama Mar 15, 2017
0b9fc6a
if we're in standAlone mode, read the local PouchDB
tangollama Mar 15, 2017
9b1cf05
Merge branch 'master' into hospitalrun-electron
tangollama Mar 15, 2017
cd0c574
conflict
tangollama Mar 15, 2017
addea31
Merge branch 'master' into hospitalrun-electron
jkleinsc Mar 17, 2017
d6afb52
Fix missing octicons
jkleinsc Mar 17, 2017
f4133d0
Added pouchdb-users for electron
jkleinsc Mar 17, 2017
0a3b1f6
Step 1 in entity setup
tangollama Mar 17, 2017
9cdf477
Update user adapter for use with pouchdb-users
jkleinsc Mar 17, 2017
73771ed
Got login working with Electron
jkleinsc Mar 18, 2017
9937f90
increment work on initial user creation for empty set
tangollama Mar 19, 2017
bc6ec61
added the mac OS X icon
tangollama Mar 21, 2017
26718e2
configure the electron build better
tangollama Mar 21, 2017
9b088b4
ignore the electron-builds directory
tangollama Mar 21, 2017
8145669
Merge branch 'master' into hospitalrun-electron
jkleinsc Mar 24, 2017
65a749d
Got search working
jkleinsc Mar 24, 2017
9fab9a4
The label for # was confusing
tangollama Mar 23, 2017
4828fee
overwrite the last electron build
tangollama Mar 27, 2017
b308dbd
resize the window and look to the website for an update file.
tangollama Mar 27, 2017
3e090c5
Ignore login tests when testing Electron
jkleinsc Mar 31, 2017
6918824
Fix user listing screen for Electron
jkleinsc Mar 31, 2017
0b1b97e
Merge branch 'master' into hospitalrun-electron
jkleinsc Apr 5, 2017
3e0b0cb
Fix for system admin role test that was failing.
jkleinsc Apr 5, 2017
b2387b2
Change the dashboard to include a special welcome for electron app
tangollama Apr 6, 2017
7378b73
simplifying the controller
tangollama Apr 7, 2017
d31c164
simplifying the route
tangollama Apr 7, 2017
ca94cab
simplify the controller
tangollama Apr 7, 2017
fc596d7
markUserSetupComplete on save
tangollama Apr 7, 2017
b84929c
move the logic for needsUserSetup into the config load process
tangollama Apr 7, 2017
13d9b40
Getting the config user setup logic working
tangollama Apr 7, 2017
fae8ea2
getting autoupdated stubbed out
tangollama Apr 7, 2017
4b70455
Merge remote-tracking branch 'origin/hospitalrun-electron' into hospi…
tangollama Apr 7, 2017
e45b558
electron build auto-updater
tangollama Apr 8, 2017
251ba96
updated listing rules
tangollama Apr 8, 2017
6d57fe0
listing corrections in the auto update code
tangollama Apr 8, 2017
f7f0298
Merge branch 'master' into hospitalrun-electron
tangollama Apr 8, 2017
c4e70bd
using grunt to build the installers
tangollama Apr 10, 2017
27c82d2
write grunt output to installers directory
tangollama Apr 10, 2017
31618b1
by default, build only the mac installer
tangollama Apr 10, 2017
c0ad9f0
adding platform intelligence into the update request
tangollama Apr 10, 2017
260abf9
I should NOT have changed this
tangollama Apr 10, 2017
264960d
check for ember test
tangollama Apr 10, 2017
d360251
pairing down the file
tangollama Apr 10, 2017
eaee6a8
Merge branch 'master' into hospitalrun-electron
tangollama Apr 11, 2017
7ec760b
rolling back eslint changes
tangollama Apr 11, 2017
af581a2
upgrade to ember-electron 2
tangollama Apr 11, 2017
d4f6ae0
upgrading to ember electron 2.
tangollama Apr 12, 2017
97f3c22
comment out path until I sort out more windows installer details
tangollama Apr 13, 2017
013aeed
Merge branch 'master' into hospitalrun-electron
tangollama Apr 13, 2017
1f56db5
fixing the upgrade path for ember-electron in devDependencies
tangollama Apr 13, 2017
928d435
remove extra commas from electron test
tangollama Apr 18, 2017
cce6206
Merge branch 'master' into hospitalrun-electron
tangollama Apr 19, 2017
03541e1
Fix error when running tests with PhantomJS
jkleinsc Apr 19, 2017
3fdf8f9
Snyk updates
jkleinsc Apr 19, 2017
6f8ff87
Make sure login displays error message on incorrect credentials
jkleinsc Apr 19, 2017
1ed3a7d
Close app when all windows are closed even on Mac
jkleinsc Apr 19, 2017
8ef311f
Get ember electron:test passing
jkleinsc Apr 19, 2017
4e6dc7f
Merge branch 'master' into hospitalrun-electron
jkleinsc Apr 19, 2017
d811d68
Add Travis testing for Electron.
jkleinsc Apr 19, 2017
932875b
Resolve deprecations.
jkleinsc Apr 19, 2017
5d51610
Fix travis file
jkleinsc Apr 19, 2017
86c0b38
updated yarn file
tangollama Apr 20, 2017
889a5a5
Fixed error testing in PhantomJS
jkleinsc Apr 20, 2017
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
38 changes: 33 additions & 5 deletions .snyk
Original file line number Diff line number Diff line change
@@ -1,13 +1,41 @@
version: v1.5.2
# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
version: v1.7.0
failThreshold: high
ignore: {}
# ignores vulnerabilities until expiry date; change duration by modifying expiry date
ignore:
'npm:concat-stream:20160901':
- ember-electron > electron-forge > electron-packager > extract-zip > concat-stream:
reason: None given
expires: '2017-05-19T14:53:23.081Z'
# patches apply the minimum changes required to fix a vulnerability
patch:
'npm:minimatch:20160620':
- ember-inflector > ember-cli-babel > broccoli-babel-transpiler > babel-core > minimatch:
patched: '2016-07-06T20:50:31.952Z'
ember-rapid-forms > ember-cli-babel > broccoli-babel-transpiler > babel-core > minimatch:
patched: '2016-09-29T20:23:59.408Z'
ember-electron > ember-cli-babel > broccoli-babel-transpiler > babel-core > minimatch:
patched: '2017-04-19T14:48:55.772Z'
- ember-inflector > ember-cli-babel > broccoli-babel-transpiler > babel-core > regenerator > commoner > glob > minimatch:
patched: '2016-07-06T20:50:31.952Z'
ember-rapid-forms > ember-validations > ember-cli-babel > broccoli-babel-transpiler > babel-core > minimatch:
ember-electron > ember-inspector > ember-new-computed > ember-cli-babel > broccoli-babel-transpiler > babel-core > minimatch:
patched: '2017-04-19T14:48:55.772Z'
- ember-rapid-forms > ember-cli-babel > broccoli-babel-transpiler > babel-core > minimatch:
patched: '2016-09-29T20:23:59.408Z'
ember-electron > electron-forge > zip-folder > archiver > glob > minimatch:
patched: '2017-04-19T14:48:55.772Z'
- ember-rapid-forms > ember-validations > ember-cli-babel > broccoli-babel-transpiler > babel-core > minimatch:
patched: '2016-09-29T20:23:59.408Z'
'npm:qs:20170213':
- ember-electron > npmi > npm > node-gyp > request > qs:
patched: '2017-04-19T14:48:55.772Z'
- ember-electron > npmi > npm > request > qs:
patched: '2017-04-19T14:48:55.772Z'
- ember-electron > npmi > npm > npm-registry-client > request > qs:
patched: '2017-04-19T14:48:55.772Z'
'npm:semver:20150403':
- ember-electron > electron-forge > electron-windows-store > flatten-packages > semver:
patched: '2017-04-19T14:48:55.772Z'
'npm:ws:20160920':
- ember-electron > testem > socket.io > engine.io > ws:
patched: '2017-04-19T14:48:55.772Z'
- ember-electron > testem > socket.io > socket.io-client > engine.io-client > ws:
patched: '2017-04-19T14:48:55.772Z'
20 changes: 13 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,28 +13,34 @@ sudo: required
addons:
apt:
sources:
- google-chrome
- ubuntu-toolchain-r-test
packages:
- google-chrome-stable
- g++-4.8

cache:
directories:
- $HOME/.npm
- $HOME/.cache # includes bowers cache

before_install:
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
- npm config set spin false
- npm install -g bower phantomjs-prebuilt
- bower --version
- phantomjs --version
- google-chrome --version


install:
- npm install
- bower install
- export DISPLAY=':99.0'
- Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &

script:
- travis_retry npm test
- npm run $COMMAND

env:
matrix:
- COMMAND=test
- CXX=g++-4.8 COMMAND=electron-test



37 changes: 35 additions & 2 deletions app/adapters/application.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
import CheckForErrors from 'hospitalrun/mixins/check-for-errors';
import Ember from 'ember';
import uuid from 'npm:uuid';
import withTestWaiter from 'ember-concurrency-test-waiter/with-test-waiter';
import { Adapter } from 'ember-pouch';
import { task } from 'ember-concurrency';

const {
computed: {
reads
},
get,
run: {
bind
}
} = Ember;

export default Adapter.extend({
export default Adapter.extend(CheckForErrors, {
config: Ember.inject.service(),
database: Ember.inject.service(),
db: Ember.computed.reads('database.mainDB'),
db: reads('database.mainDB'),
standAlone: reads('config.standAlone'),

_specialQueries: [
'containsValue',
Expand All @@ -23,6 +29,10 @@ export default Adapter.extend({
_esDefaultSize: 25,

_executeContainsSearch(store, type, query) {
let standAlone = get(this, 'standAlone');
if (standAlone) {
return this._executePouchDBFind(store, type, query);
}
return new Ember.RSVP.Promise((resolve, reject) => {
let typeName = this.getRecordTypeName(type);
let searchUrl = `/search/hrdb/${typeName}/_search`;
Expand Down Expand Up @@ -81,6 +91,29 @@ export default Adapter.extend({
});
},

_executePouchDBFind(store, type, query) {
this._init(store, type);
let db = this.get('db');
let recordTypeName = this.getRecordTypeName(type);
let queryParams = {
selector: {
$or: []
}
};
if (query.containsValue && query.containsValue.value) {
let regexp = new RegExp(query.containsValue.value, 'i');
query.containsValue.keys.forEach((key) => {
let subQuery = {};
subQuery[`data.${key.name}`] = { $regex: regexp };
queryParams.selector.$or.push(subQuery);
});
}

return db.find(queryParams).then((pouchRes) => {
return db.rel.parseRelDocs(recordTypeName, pouchRes.docs);
});
},

_handleQueryResponse(response, store, type) {
let database = this.get('database');
return new Ember.RSVP.Promise((resolve, reject) => {
Expand Down
Loading