fix(my-joy-beta): more String.prototype.includes polyfills

This commit is contained in:
Sérgio Ramos 2018-01-24 11:28:42 +00:00
parent 0706548ed5
commit 7d02fb8777
2 changed files with 5 additions and 3 deletions

View File

@ -3,6 +3,7 @@ import { compose, graphql } from 'react-apollo';
import ReduxForm from 'declarative-redux-form';
import { connect } from 'react-redux';
import { set } from 'react-redux-values';
import includes from 'lodash.includes';
import get from 'lodash.get';
import { InstanceTypeIcon, StatusLoader } from 'joyent-ui-toolkit';
@ -94,7 +95,7 @@ export default compose(
props: ({ ownProps: { vms = false }, data: { loading, images = [] } }) => ({
loading,
images: images.reduce((accumulator, image) => {
const isVm = !image.type.includes('DATASET');
const isVm = !includes(image.type, 'DATASET');
if (isVm && !vms) {
return accumulator;

View File

@ -3,9 +3,10 @@ import { set } from 'react-redux-values';
import { compose, graphql } from 'react-apollo';
import ReduxForm from 'declarative-redux-form';
import { connect } from 'react-redux';
import get from 'lodash.get';
import { Margin } from 'styled-components-spacing';
import forceArray from 'force-array';
import includes from 'lodash.includes';
import get from 'lodash.get';
import { NetworkIcon, Button, H3, StatusLoader } from 'joyent-ui-toolkit';
@ -114,7 +115,7 @@ export default compose(
connect(
({ values, form }, { networks }) => {
const selected = get(form, `${FORM_NAME}.values`, {});
const empty = id => !Object.keys(selected).includes(id);
const empty = id => !includes(Object.keys(selected), id);
const _networks = networks
.map(({ id, name, ...network }) => ({