From d29e8fda7ed2967806210b0512cf012edaf49ef1 Mon Sep 17 00:00:00 2001
From: Tom Robinson <tlrobinson@gmail.com>
Date: Wed, 4 Jan 2017 16:54:08 -0800
Subject: [PATCH] yarn upgrade flow-bin
---
frontend/src/metabase/lib/permissions.js | 5 ++---
package.json | 2 +-
yarn.lock | 15 ++++-----------
3 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/frontend/src/metabase/lib/permissions.js b/frontend/src/metabase/lib/permissions.js
index b1b862c1916..8c1fd837bf3 100644
--- a/frontend/src/metabase/lib/permissions.js
+++ b/frontend/src/metabase/lib/permissions.js
@@ -40,7 +40,7 @@ export function updatePermission(
groupId: GroupId,
path: Array<string|number>,
value: string,
- entityIds: ?Array<string|number>
+ entityIds: ?(Array<string>|Array<number>)
): GroupsPermissions {
const fullPath = [groupId].concat(path);
let current = getIn(permissions, fullPath);
@@ -102,7 +102,7 @@ export function updateFieldsPermission(permissions: GroupsPermissions, groupId:
export function updateTablesPermission(permissions: GroupsPermissions, groupId: GroupId, { databaseId, schemaName }: SchemaEntityId, value: string, metadata: Metadata): GroupsPermissions {
const database = metadata && metadata.database(databaseId);
- const tableIds = database && database.tables().map(t => t.id);
+ const tableIds: ?number[] = database && database.tables().map(t => t.id);
permissions = updateSchemasPermission(permissions, groupId, { databaseId }, "controlled", metadata);
permissions = updatePermission(permissions, groupId, [databaseId, "schemas", schemaName], value, tableIds);
@@ -112,7 +112,6 @@ export function updateTablesPermission(permissions: GroupsPermissions, groupId:
export function updateSchemasPermission(permissions: GroupsPermissions, groupId: GroupId, { databaseId }: DatabaseEntityId, value: string, metadata: Metadata): GroupsPermissions {
let database = metadata.database(databaseId);
- // $FlowFixMe: not sure why Array<string> is incompatible with Array<string|number>
let schemaNames = database && database.schemaNames();
let currentSchemas = getSchemasPermission(permissions, groupId, { databaseId });
diff --git a/package.json b/package.json
index c4648234902..e1d61dfbb33 100644
--- a/package.json
+++ b/package.json
@@ -89,7 +89,7 @@
"exports-loader": "^0.6.3",
"extract-text-webpack-plugin": "^1.0.1",
"file-loader": "^0.8.5",
- "flow-bin": "^0.32.0",
+ "flow-bin": "^0.37.4",
"fs-promise": "^0.5.0",
"glob": "^5.0.15",
"html-webpack-plugin": "^2.14.0",
diff --git a/yarn.lock b/yarn.lock
index 7848fa31651..f06065add2c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1009,20 +1009,13 @@ babel-plugin-transform-global-system-wrapper@0.0.1:
dependencies:
babel-template "^6.9.0"
-babel-plugin-transform-object-rest-spread@6.16.0:
+babel-plugin-transform-object-rest-spread@6.16.0, babel-plugin-transform-object-rest-spread@^6.16.0:
version "6.16.0"
resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.16.0.tgz#db441d56fffc1999052fdebe2e2f25ebd28e36a9"
dependencies:
babel-plugin-syntax-object-rest-spread "^6.8.0"
babel-runtime "^6.0.0"
-babel-plugin-transform-object-rest-spread@^6.16.0:
- version "6.20.2"
- resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.20.2.tgz#e816c55bba77b14c16365d87e2ae48c8fd18fc2e"
- dependencies:
- babel-plugin-syntax-object-rest-spread "^6.8.0"
- babel-runtime "^6.20.0"
-
babel-plugin-transform-react-constant-elements@6.9.1:
version "6.9.1"
resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-constant-elements/-/babel-plugin-transform-react-constant-elements-6.9.1.tgz#125b86d96cb322e2139b607fd749ad5fbb17f005"
@@ -3007,9 +3000,9 @@ flatten@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
-flow-bin@^0.32.0:
- version "0.32.0"
- resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.32.0.tgz#a1d69d153a07b0a9cd4a633d13bf746d4ace5730"
+flow-bin@^0.37.4:
+ version "0.37.4"
+ resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.37.4.tgz#3d8da2ef746e80e730d166e09040f4198969b76b"
flux-standard-action@^0.6.0, flux-standard-action@^0.6.1:
version "0.6.1"
--
GitLab