From 4a6a0fbe920812043df46d953d080e85f7422a22 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Fri, 13 Apr 2018 14:26:33 +0000 Subject: [PATCH 1/5] chore(package): update sass-loader to version 7.0.1 Closes #122 --- frontend/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/package.json b/frontend/package.json index fbcfe0607b..ea7a39880b 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -83,7 +83,7 @@ "react-test-renderer": "^16.2.0", "redux-devtools": "^3.3.1", "redux-mock-store": "^1.5.1", - "sass-loader": "^6.0.6", + "sass-loader": "^7.0.1", "style-loader": "^0.20.0", "toolbox-loader": "0.0.3", "webpack": "^3.1.0", From 0b79bf96ff9e4cd710ec1557ed89728d7b71ffd4 Mon Sep 17 00:00:00 2001 From: greenkeeperio-bot Date: Fri, 13 Apr 2018 14:31:53 +0000 Subject: [PATCH 2/5] chore(package): update lockfile https://npm.im/greenkeeper-lockfile --- frontend/yarn.lock | 51 ++++++++++++++++++++-------------------------- 1 file changed, 22 insertions(+), 29 deletions(-) diff --git a/frontend/yarn.lock b/frontend/yarn.lock index a10631b81f..d2a1f4c76b 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -327,7 +327,7 @@ async@^1.4.0, async@^1.5.2: version "1.5.2" resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" -async@^2.1.2, async@^2.1.4, async@^2.1.5, async@^2.4.1: +async@^2.1.2, async@^2.1.4, async@^2.4.1: version "2.6.0" resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4" dependencies: @@ -1562,14 +1562,14 @@ cliui@^4.0.0: strip-ansi "^4.0.0" wrap-ansi "^2.0.0" -clone-deep@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-0.3.0.tgz#348c61ae9cdbe0edfe053d91ff4cc521d790ede8" +clone-deep@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-2.0.2.tgz#00db3a1e173656730d1188c3d6aced6d7ea97713" dependencies: for-own "^1.0.0" - is-plain-object "^2.0.1" - kind-of "^3.2.2" - shallow-clone "^0.1.2" + is-plain-object "^2.0.4" + kind-of "^6.0.0" + shallow-clone "^1.0.0" clone@^1.0.2: version "1.0.3" @@ -3549,7 +3549,7 @@ is-boolean-object@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.0.tgz#98f8b28030684219a95f375cfbd88ce3405dff93" -is-buffer@^1.0.2, is-buffer@^1.1.5: +is-buffer@^1.1.5: version "1.1.6" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" @@ -4257,13 +4257,7 @@ killable@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.0.tgz#da8b84bd47de5395878f95d64d02f2449fe05e6b" -kind-of@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-2.0.1.tgz#018ec7a4ce7e3a86cb9141be519d24c8faa981b5" - dependencies: - is-buffer "^1.0.2" - -kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0, kind-of@^3.2.2: +kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" dependencies: @@ -4283,10 +4277,6 @@ kind-of@^6.0.0, kind-of@^6.0.2: version "6.0.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051" -lazy-cache@^0.2.3: - version "0.2.7" - resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-0.2.7.tgz#7feddf2dcb6edb77d11ef1d117ab5ffdf0ab1b65" - lazy-cache@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e" @@ -4708,6 +4698,10 @@ negotiator@0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9" +neo-async@^2.5.0: + version "2.5.1" + resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.1.tgz#acb909e327b1e87ec9ef15f41b8a269512ad41ee" + node-fetch@^1.0.1: version "1.7.3" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef" @@ -6229,14 +6223,14 @@ sass-graph@^2.2.4: scss-tokenizer "^0.2.3" yargs "^7.0.0" -sass-loader@^6.0.6: - version "6.0.6" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-6.0.6.tgz#e9d5e6c1f155faa32a4b26d7a9b7107c225e40f9" +sass-loader@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.0.1.tgz#fd937259ccba3a9cfe0d5f8a98746d48adfcc261" dependencies: - async "^2.1.5" - clone-deep "^0.3.0" + clone-deep "^2.0.1" loader-utils "^1.0.1" lodash.tail "^4.1.1" + neo-async "^2.5.0" pify "^3.0.0" sax@^1.2.4, sax@~1.2.1: @@ -6378,13 +6372,12 @@ sha.js@^2.4.0, sha.js@^2.4.8: inherits "^2.0.1" safe-buffer "^5.0.1" -shallow-clone@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-0.1.2.tgz#5909e874ba77106d73ac414cfec1ffca87d97060" +shallow-clone@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-1.0.0.tgz#4480cd06e882ef68b2ad88a3ea54832e2c48b571" dependencies: is-extendable "^0.1.1" - kind-of "^2.0.1" - lazy-cache "^0.2.3" + kind-of "^5.0.0" mixin-object "^2.0.1" shebang-command@^1.2.0: From 38d6494683b36e8b777149b0f2acdeca01de7a5c Mon Sep 17 00:00:00 2001 From: Corinne Krych Date: Tue, 17 Apr 2018 11:23:15 +0200 Subject: [PATCH 3/5] fix(feature): toggle correctly display for list and update feature --- .../feature-list-item-component-test.jsx.snap | 2 +- .../feature/feature-list-item-component.jsx | 2 +- .../form-update-feature-component-test.jsx.snap | 1 + .../form/form-update-feature-component.jsx | 15 ++++++++++++--- .../form/form-update-feature-container.jsx | 5 ++++- frontend/src/component/feature/view-component.jsx | 6 +++--- 6 files changed, 22 insertions(+), 9 deletions(-) diff --git a/frontend/src/component/feature/__tests__/__snapshots__/feature-list-item-component-test.jsx.snap b/frontend/src/component/feature/__tests__/__snapshots__/feature-list-item-component-test.jsx.snap index fe9c8e6a76..96acaef791 100644 --- a/frontend/src/component/feature/__tests__/__snapshots__/feature-list-item-component-test.jsx.snap +++ b/frontend/src/component/feature/__tests__/__snapshots__/feature-list-item-component-test.jsx.snap @@ -22,7 +22,7 @@ exports[`renders correctly with one feature 1`] = ` > diff --git a/frontend/src/component/feature/feature-list-item-component.jsx b/frontend/src/component/feature/feature-list-item-component.jsx index 47221a1428..4db409569e 100644 --- a/frontend/src/component/feature/feature-list-item-component.jsx +++ b/frontend/src/component/feature/feature-list-item-component.jsx @@ -42,7 +42,7 @@ const Feature = ({ toggleFeature(name)} diff --git a/frontend/src/component/feature/form/__tests__/__snapshots__/form-update-feature-component-test.jsx.snap b/frontend/src/component/feature/form/__tests__/__snapshots__/form-update-feature-component-test.jsx.snap index 8125a56293..5a87d36f34 100644 --- a/frontend/src/component/feature/form/__tests__/__snapshots__/form-update-feature-component-test.jsx.snap +++ b/frontend/src/component/feature/form/__tests__/__snapshots__/form-update-feature-component-test.jsx.snap @@ -27,6 +27,7 @@ ShallowWrapper { "name": "feature", "nameError": Object {}, }, + undefined, ], ], } diff --git a/frontend/src/component/feature/form/form-update-feature-component.jsx b/frontend/src/component/feature/form/form-update-feature-component.jsx index b624f340ef..8311259bad 100644 --- a/frontend/src/component/feature/form/form-update-feature-component.jsx +++ b/frontend/src/component/feature/form/form-update-feature-component.jsx @@ -14,15 +14,23 @@ class UpdateFeatureComponent extends Component { } render() { - const { input, addStrategy, removeStrategy, updateStrategy, moveStrategy, onSubmit, onCancel } = this.props; - + const { + input, + features, + addStrategy, + removeStrategy, + updateStrategy, + moveStrategy, + onSubmit, + onCancel, + } = this.props; const { name, // eslint-disable-line } = input; const configuredStrategies = input.strategies || []; return ( -
+
{ - methods.onSubmit = input => e => { + methods.onSubmit = (input, features) => e => { e.preventDefault(); if (Array.isArray(input.strategies)) { @@ -35,6 +35,9 @@ const prepare = (methods, dispatch) => { }); } delete input.description; + // take the status of the feature toggles from the central store in case `toggleFeature` function was called + const feat = features.find(f => f.name === input.name); + input.enabled = feat.enabled; // TODO: should add error handling requestUpdateFeatureToggle(input)(dispatch) diff --git a/frontend/src/component/feature/view-component.jsx b/frontend/src/component/feature/view-component.jsx index 2d287456fd..e76954bf29 100644 --- a/frontend/src/component/feature/view-component.jsx +++ b/frontend/src/component/feature/view-component.jsx @@ -46,13 +46,13 @@ export default class ViewFeatureToggleComponent extends React.Component { } getTabContent(activeTab) { - const { featureToggle, featureToggleName } = this.props; + const { features, featureToggle, featureToggleName } = this.props; if (TABS[activeTab] === TABS.history) { return ; } else if (TABS[activeTab] === TABS.strategies) { if (this.isFeatureView) { - return ; + return ; } return ; } else { @@ -165,7 +165,7 @@ export default class ViewFeatureToggleComponent extends React.Component { > toggleFeature(featureToggle.name)} From 955885a03d5d1e2678aa7fdba16a3de7712c3b7e Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Wed, 18 Apr 2018 22:53:01 +0000 Subject: [PATCH 4/5] chore(package): update style-loader to version 0.21.0 --- frontend/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/package.json b/frontend/package.json index fbcfe0607b..6c88ca260a 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -84,7 +84,7 @@ "redux-devtools": "^3.3.1", "redux-mock-store": "^1.5.1", "sass-loader": "^6.0.6", - "style-loader": "^0.20.0", + "style-loader": "^0.21.0", "toolbox-loader": "0.0.3", "webpack": "^3.1.0", "webpack-dev-server": "^2.6.1" From 926ccb7f78888d2434d4a80611c4c0e0b3055f86 Mon Sep 17 00:00:00 2001 From: greenkeeperio-bot Date: Wed, 18 Apr 2018 22:58:30 +0000 Subject: [PATCH 5/5] chore(package): update lockfile https://npm.im/greenkeeper-lockfile --- frontend/yarn.lock | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/frontend/yarn.lock b/frontend/yarn.lock index a10631b81f..3a09e9e1a6 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -115,6 +115,10 @@ ajv-keywords@^2.0.0, ajv-keywords@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762" +ajv-keywords@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.1.0.tgz#ac2b27939c543e95d2c06e7f7f5c27be4aa543be" + ajv@^4.9.1: version "4.11.8" resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536" @@ -131,6 +135,15 @@ ajv@^5.0.0, ajv@^5.1.0, ajv@^5.1.5, ajv@^5.2.3, ajv@^5.3.0: fast-json-stable-stringify "^2.0.0" json-schema-traverse "^0.3.0" +ajv@^6.1.0: + version "6.4.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.4.0.tgz#d3aff78e9277549771daf0164cff48482b754fc6" + dependencies: + fast-deep-equal "^1.0.0" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.3.0" + uri-js "^3.0.2" + align-text@^0.1.1, align-text@^0.1.3: version "0.1.4" resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117" @@ -6249,12 +6262,12 @@ schema-utils@^0.3.0: dependencies: ajv "^5.0.0" -schema-utils@^0.4.3: - version "0.4.3" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.3.tgz#e2a594d3395834d5e15da22b48be13517859458e" +schema-utils@^0.4.5: + version "0.4.5" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.5.tgz#21836f0608aac17b78f9e3e24daff14a5ca13a3e" dependencies: - ajv "^5.0.0" - ajv-keywords "^2.1.0" + ajv "^6.1.0" + ajv-keywords "^3.1.0" scroll-behavior@^0.9.5: version "0.9.9" @@ -6715,12 +6728,12 @@ strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" -style-loader@^0.20.0: - version "0.20.1" - resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.20.1.tgz#33ac2bf4d5c65a8906bc586ad253334c246998d0" +style-loader@^0.21.0: + version "0.21.0" + resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.21.0.tgz#68c52e5eb2afc9ca92b6274be277ee59aea3a852" dependencies: loader-utils "^1.1.0" - schema-utils "^0.4.3" + schema-utils "^0.4.5" supports-color@^2.0.0: version "2.0.0" @@ -7026,6 +7039,12 @@ upath@1.0.0: lodash "3.x" underscore.string "2.3.x" +uri-js@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-3.0.2.tgz#f90b858507f81dea4dcfbb3c4c3dbfa2b557faaa" + dependencies: + punycode "^2.1.0" + urix@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"