Skip to content

Commit

Permalink
bump version
Browse files Browse the repository at this point in the history
when creating a the default collection for the first time
was not returning the expected type: Expected array, actual object.
Now returns array. fixed #80
Using travis to bulid wail utils fixes #75
normalization of URIs for WAIL-WARCreate fixes #76
  • Loading branch information
N0taN3rd committed May 16, 2017
1 parent 9321680 commit a37ae6b
Show file tree
Hide file tree
Showing 12 changed files with 41 additions and 21 deletions.
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "WAIL",
"license": "LGPL-3.0",
"version": "1.1.0beta2",
"version": "1.1.0beta2.5",
"contributors": [
{
"name": "John Berlin",
Expand Down Expand Up @@ -90,7 +90,7 @@
"klaw": "^1.3.1",
"lodash": "^4.17.4",
"material-design-icons-iconfont": "^3.0.3",
"material-ui": "^0.18.0",
"material-ui": "^0.18.1",
"mime-types": "^2.1.15",
"mkdirp": "^0.5.1",
"moment": "^2.18.1",
Expand All @@ -108,7 +108,7 @@
"pretty-bytes": "^4.0.2",
"pretty-ms": "^2.1.0",
"pretty-seconds": "^0.2.1",
"prop-types": "^15.5.9",
"prop-types": "^15.5.10",
"ps-tree": "^1.1.0",
"react": "15.5.4",
"react-addons-shallow-compare": "^15.5.2",
Expand All @@ -124,7 +124,7 @@
"react-swipeable-views": "^0.12.1",
"react-tap-event-plugin": "^2.0.1",
"react-textfit": "^0.1.9",
"recompose": "^0.23.1",
"recompose": "^0.23.4",
"redux": "^3.6.0",
"redux-batched-actions": "^0.2.0",
"redux-electron-ipc": "^1.1.9",
Expand Down Expand Up @@ -209,13 +209,13 @@
"copy-webpack-plugin": "^4.0.1",
"core-js": "^2.4.1",
"cron-parser": "^2.4.0",
"cross-env": "^4.0.0",
"cross-env": "^5.0.0",
"cross-zip": "^2.1.5",
"css-loader": "^0.28.1",
"debug": "^2.6.4",
"depcheck": "^0.6.7",
"devtron": "^1.4.0",
"electron-chromedriver": "^1.6.0",
"electron-chromedriver": "^1.7.1",
"electron-debug": "^1.1.0",
"electron-devtools-installer": "^2.2.0",
"electron-installer-dmg": "^0.2.1",
Expand All @@ -240,7 +240,7 @@
"request-debug": "^0.2.0",
"run-sequence": "^1.2.2",
"snazzy": "^7.0.0",
"spectron": "^3.6.2",
"spectron": "^3.7.0",
"standard": "^10.0.2",
"standard-format": "^2.2.4",
"strip-loader": "^0.1.2",
Expand Down
2 changes: 1 addition & 1 deletion wail-core/managers/archiveManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ export default class ArchiveManager extends EventEmitter {
throw error
}
newCol.seeds = []
return newCol
return [newCol]
}

async createCollection (ncol) {
Expand Down
3 changes: 2 additions & 1 deletion wail-ui/actions/collections.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import {ipcRenderer as ipc, remote} from 'electron'
import {CollectionEvents} from '../constants/wail-constants'
import * as notify from './notification-actions'

const {
GOT_ALL_COLLECTIONS,
Expand All @@ -20,7 +21,7 @@ export function gotAllCollections (event, ac) {
if (wasError) {
console.error(wasError)
window.logger.error({ err: ac.err, msg: 'got all collections error' })
// notify.notifyError('Error loading all collections this is fatal')
notify.notifyError(`Error loading all collections this is fatal ${ac.err}`)
return {
type: GOT_ALL_COLLECTIONS,
cols: []
Expand Down
Binary file added wail-ui/icons/whale_256.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import PropTypes from 'prop-types'
import React, { Component } from 'react'
import React from 'react'
import { connect } from 'react-redux'
import { bindActionCreators } from 'redux'
import { shouldUpdate } from 'recompose'
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes } from 'react'
import React from 'react'
import PropTypes from 'prop-types'

const getStyles = (last, context) => {
const styles = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes } from 'react'
import React from 'react'
import PropTypes from 'prop-types'
import StepLabel from 'material-ui/Stepper/StepLabel'

const CheckStepLabel = ({ownProps, check, label, lid}) => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes } from 'react'
import React from 'react'
import PropTypes from 'prop-types'
import StepLabel from 'material-ui/Stepper/StepLabel'
import WarningIcon from 'material-ui/svg-icons/alert/warning'
import { red500 } from 'material-ui/styles/colors'
Expand Down
5 changes: 3 additions & 2 deletions wail-ui/loadingScreens/shared/header/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {PropTypes} from 'react'
import React from 'react'
import PropTypes from 'prop-types'
import AppBar from 'material-ui/AppBar'
import Avatar from 'material-ui/Avatar'
import onlyUpdateForKeys from 'recompose/onlyUpdateForKeys'
Expand All @@ -7,7 +8,7 @@ const enhance = onlyUpdateForKeys(['title'])

const Header = ({title}) => (
<AppBar
iconElementLeft={<Avatar className='img-circle' backgroundColor={'transparent'} src={'icons/whale_64.png'} />}
iconElementLeft={<Avatar className='img-circle' backgroundColor={'transparent'} src={'icons/whale_256.png'} />}
title={title}
/>
)
Expand Down
27 changes: 21 additions & 6 deletions wail-ui/reducers/collectionReducer.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import Immutable from 'immutable'
import S from 'string'
import { CollectionEvents } from '../constants/wail-constants'
import moment from 'moment'
import isPlainObject from 'lodash/isPlainObject'
import * as notify from '../actions/notification-actions'
const {
GOT_ALL_COLLECTIONS,
CREATED_COLLECTION,
Expand All @@ -17,16 +19,29 @@ const collectionReducer = (state = Immutable.Map(), action) => {
window.logger.debug('collection store got all collections')
let {cols} = action
let collections = {}
cols.forEach(col => {
col.lastUpdated = moment(col.lastUpdated)
col.created = moment(col.created)
col.seeds = col.seeds.map(s => {
if (Array.isArray(cols)) {
cols.forEach(col => {
col.lastUpdated = moment(col.lastUpdated)
col.created = moment(col.created)
col.seeds = col.seeds.map(s => {
s.added = moment(s.added)
s.lastUpdated = moment(s.lastUpdated)
return s
})
collections[col.colName] = col
})
} else if (isPlainObject(cols)) {
cols.lastUpdated = moment(cols.lastUpdated)
cols.created = moment(cols.created)
cols.seeds = cols.seeds.map(s => {
s.added = moment(s.added)
s.lastUpdated = moment(s.lastUpdated)
return s
})
collections[col.colName] = col
})
collections[cols.colName] = cols
} else {
notify.notifyError(`WAIL-UI received collections it was not expecting, received ${typeof cols}. Please file a bug report through the help menu of WAIL.`)
}
return state.merge(collections)
case CREATED_COLLECTION:
window.logger.debug('collection store got a new collection')
Expand Down

0 comments on commit a37ae6b

Please sign in to comment.