diff --git a/.dockerignore b/.dockerignore
index 17cd3d69e4d288748253e54a11147dffc3249969..e76ea27e44bcbcf4d5b1930b744fa745f7f5e73f 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -3,4 +3,8 @@ docs/*
OSX/*
target/*
+**node_modules
**metabase.jar
+
+.dockerignore
+Dockerfile
diff --git a/.eslintrc b/.eslintrc
index fa465b469f66bf7d3acc53a9e49ca9e48ce871e7..07a483fb6b804386c7b0985572d6e33765e2544c 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -2,35 +2,12 @@
"rules": {
"strict": [2, "never"],
"no-undef": 2,
+ "no-var": 1,
"no-unused-vars": [1, {"vars": "all", "args": "none"}],
+ "no-empty": [1, { "allowEmptyCatch": true }],
+ "curly": [1, "all"],
"import/no-commonjs": 1,
- "quotes": 0,
- "camelcase": 0,
- "eqeqeq": 0,
- "key-spacing": 0,
- "no-underscore-dangle": 0,
- "curly": 0,
- "no-use-before-define": 0,
- "comma-dangle": 0,
- "space-infix-ops": 0,
- "no-shadow": 0,
- "no-empty": 0,
- "no-extra-bind": 0,
- "eol-last": 0,
- "consistent-return": 0,
- "yoda": 0,
- "no-multi-spaces": 0,
- "no-mixed-spaces-and-tabs": 0,
- "no-alert": 0,
"no-console": 0,
- "dot-notation": 0,
- "space-unary-ops": 0,
- "semi": 0,
- "global-strict": 0,
- "new-cap": 0,
- "no-fallthrough": 0,
- "no-useless-escape": 0,
- "no-case-declarations": 0,
"react/no-is-mounted": 2,
"react/prefer-es6-class": 2,
"react/display-name": 1,
@@ -40,7 +17,7 @@
"react/no-find-dom-node": 0,
"flowtype/define-flow-type": 1,
"flowtype/use-flow-type": 1,
- "no-var": 1
+ "no-color-literals": 1
},
"globals": {
"pending": false
diff --git a/Dockerfile b/Dockerfile
index 12313c85fdbeddd68244c2c9e76f292268cc11c0..ef867480cfbb1c321733d839458eb3fa9324e269 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,43 +1,79 @@
-# NOTE: this Dockerfile builds Metabase from source. We recommend deploying the pre-built
-# images hosted on Docker Hub https://hub.docker.com/r/metabase/metabase/ which use the
-# Dockerfile located at ./bin/docker/Dockerfile
+###################
+# STAGE 1: builder
+###################
-FROM java:openjdk-8-jre-alpine
+FROM java:openjdk-8-jre-alpine as builder
-ENV JAVA_HOME=/usr/lib/jvm/default-jvm
-ENV PATH /usr/local/bin:$PATH
-ENV LEIN_ROOT 1
+WORKDIR /app/source
ENV FC_LANG en-US
ENV LC_CTYPE en_US.UTF-8
-# install core build tools
-RUN apk add --update nodejs git wget bash python make g++ java-cacerts ttf-dejavu fontconfig && \
- npm install -g yarn && \
- ln -sf "${JAVA_HOME}/bin/"* "/usr/bin/"
+# bash: various shell scripts
+# wget: installing lein
+# git: ./bin/version
+# nodejs: frontend building
+# make: backend building
+RUN apk add --update bash nodejs git wget make
-# fix broken cacerts
-RUN rm -f /usr/lib/jvm/default-jvm/jre/lib/security/cacerts && \
- ln -s /etc/ssl/certs/java/cacerts /usr/lib/jvm/default-jvm/jre/lib/security/cacerts
+# yarn: frontend dependencies
+RUN npm install -g yarn
-# install lein
+# lein: backend dependencies and building
ADD https://raw.github.com/technomancy/leiningen/stable/bin/lein /usr/local/bin/lein
RUN chmod 744 /usr/local/bin/lein
+RUN lein upgrade
+
+# install dependencies before adding the rest of the source to maximize caching
+
+# backend dependencies
+ADD project.clj .
+RUN lein deps
+
+# frontend dependencies
+ADD yarn.lock package.json ./
+RUN yarn
-# add the application source to the image
-ADD . /app/source
+# add the rest of the source
+ADD . .
# build the app
-WORKDIR /app/source
RUN bin/build
-# remove unnecessary packages & tidy up
-RUN apk del nodejs git wget python make g++
-RUN rm -rf /root/.lein /root/.m2 /root/.node-gyp /root/.npm /root/.yarn /root/.yarn-cache /tmp/* /var/cache/apk/* /app/source/node_modules
+# install updated cacerts to /etc/ssl/certs/java/cacerts
+RUN apk add --update java-cacerts
+
+# import AWS RDS cert into /etc/ssl/certs/java/cacerts
+ADD https://s3.amazonaws.com/rds-downloads/rds-combined-ca-bundle.pem .
+RUN keytool -noprompt -import -trustcacerts -alias aws-rds \
+ -file rds-combined-ca-bundle.pem \
+ -keystore /etc/ssl/certs/java/cacerts \
+ -keypass changeit -storepass changeit
+
+# ###################
+# # STAGE 2: runner
+# ###################
+
+FROM java:openjdk-8-jre-alpine as runner
+
+WORKDIR /app
+
+ENV FC_LANG en-US
+ENV LC_CTYPE en_US.UTF-8
+
+# dependencies
+RUN apk add --update bash ttf-dejavu fontconfig
+
+# add fixed cacerts
+COPY --from=builder /etc/ssl/certs/java/cacerts /usr/lib/jvm/default-jvm/jre/lib/security/cacerts
+
+# add Metabase script and uberjar
+RUN mkdir -p bin target/uberjar
+COPY --from=builder /app/source/target/uberjar/metabase.jar /app/target/uberjar/
+COPY --from=builder /app/source/bin/start /app/bin/
# expose our default runtime port
EXPOSE 3000
-# build and then run it
-WORKDIR /app/source
-ENTRYPOINT ["./bin/start"]
+# run it
+ENTRYPOINT ["/app/bin/start"]
diff --git a/bin/colopocalypse b/bin/colopocalypse
new file mode 100755
index 0000000000000000000000000000000000000000..a9517c8c99f8a8b6902c1f5f3ecb19029143c840
--- /dev/null
+++ b/bin/colopocalypse
@@ -0,0 +1,398 @@
+#!./node_modules/.bin/babel-node
+
+const glob = require("glob");
+const fs = require("fs");
+const path = require("path");
+const Color = require("color");
+const colorDiff = require("color-diff");
+const _ = require("underscore");
+const j = require("jscodeshift");
+
+const { replaceStrings } = require("./lib/codemod");
+
+const POSTCSS_CONFIG = require("../postcss.config.js");
+const cssVariables =
+ POSTCSS_CONFIG.plugins["postcss-cssnext"].features.customProperties.variables;
+// console.log(cssVariables);
+
+// these are a bit liberal regexes but that's probably ok
+const COLOR_REGEX = /(?:#[a-fA-F0-9]{3}(?:[a-fA-F0-9]{3})?\b|(?:rgb|hsl)a?\(\s*\d+\s*(?:,\s*\d+(?:\.\d+)?%?\s*){2,3}\))/g;
+const COLOR_REGEX_WITH_LINE = /(?:#[a-fA-F0-9]{3}(?:[a-fA-F0-9]{3})?\b|(?:rgb|hsl)a?\(\s*\d+\s*(?:,\s*\d+(?:\.\d+)?%?\s*){2,3}\)).*/g;
+
+const CSS_SIMPLE_VAR_REGEX = /^var\(([^)]+)\)$/;
+const CSS_COLOR_VAR_REGEX = /^color\(var\(([^)]+)\) shade\(([^)]+)\)\)$/;
+const CSS_VAR_REGEX = /var\([^)]+\)|color\(var\([^)]+\) shade\([^)]+\)\)/g;
+
+const FILE_GLOB = "frontend/src/**/*.{css,js,jsx}";
+const FILE_GLOB_IGNORE = [
+ "**/metabase/lib/colors.js",
+ "**/metabase/css/core/colors.css",
+ "**/metabase/auth/components/AuthScene.jsx",
+ "**/metabase/icon_paths.js",
+ // // recast messes up these file and they don't have any colors so just ignore them:
+ // "**/metabase/query_builder/components/FieldList.jsx",
+ // "**/metabase/query_builder/components/filters/FilterPopover.jsx",
+ // "**/metabase/visualizations/components/TableInteractive.jsx",
+];
+
+const COLORS_CSS_PATH = "frontend/src/metabase/css/core/colors.css";
+const COLORS_JS_PATH = "frontend/src/metabase/lib/colors.js";
+
+const varForName = name => `--color-${name}`;
+
+const colors = {
+ // themeable colors
+
+ brand: "#509EE3",
+
+ accent1: "#9CC177",
+ accent2: "#A989C5",
+ accent3: "#EF8C8C",
+ accent4: "#F9D45C",
+
+ accent5: "#F1B556",
+ accent6: "#A6E7F3",
+ accent7: "#7172AD",
+
+ // general purpose
+
+ white: "#FFFFFF",
+ black: "#2E353B",
+
+ // semantic colors
+
+ success: "#84BB4C",
+ error: "#ED6E6E",
+ warning: "#F9CF48",
+
+ "text-dark": "#2E353B", // "black"
+ "text-medium": "#93A1AB",
+ "text-light": "#DCE1E4",
+ "text-white": "#FFFFFF", // "white"
+
+ "bg-black": "#2E353B", // "black"
+ "bg-dark": "#93A1AB",
+ "bg-medium": "#EDF2F5",
+ "bg-light": "#F9FBFC",
+ "bg-white": "#FFFFFF", // "white"
+
+ shadow: "#F4F5F6",
+ border: "#D7DBDE",
+};
+
+function paletteForColors(colors) {
+ return Object.entries(colors).map(([name, colorValue]) => {
+ const color = Color(colorValue);
+ return {
+ name,
+ color,
+ R: color.red(),
+ G: color.green(),
+ B: color.blue(),
+ };
+ });
+}
+
+const PRIMARY_AND_SECONDARY_NAMES = [
+ "brand",
+ "accent1",
+ "accent2",
+ "accent3",
+ "accent4",
+];
+const TEXT_COLOR_NAMES = [
+ "text-dark",
+ "text-medium",
+ "text-light",
+ "text-white",
+];
+const BACKGROUND_COLOR_NAMES = [
+ "bg-black",
+ "bg-dark",
+ "bg-medium",
+ "bg-light",
+ "bg-white",
+];
+const SEMANTIC_NAMES = ["success", "error", "warning"];
+
+const PALETTE_FOREGROUND = paletteForColors(
+ _.pick(
+ colors,
+ ...TEXT_COLOR_NAMES,
+ ...PRIMARY_AND_SECONDARY_NAMES,
+ ...SEMANTIC_NAMES,
+ ),
+);
+const PALETTE_BACKGROUND = paletteForColors(
+ _.pick(
+ colors,
+ ...BACKGROUND_COLOR_NAMES,
+ ...PRIMARY_AND_SECONDARY_NAMES,
+ ...SEMANTIC_NAMES,
+ ),
+);
+const PALETTE_BORDER = paletteForColors(
+ _.pick(colors, "border", ...PRIMARY_AND_SECONDARY_NAMES),
+);
+const PALETTE_SHADOW = paletteForColors(_.pick(colors, "shadow"));
+
+// basically everything except border/shadow
+const PALETTE_OTHER = paletteForColors(
+ _.pick(
+ colors,
+ ...TEXT_COLOR_NAMES,
+ ...BACKGROUND_COLOR_NAMES,
+ ...PRIMARY_AND_SECONDARY_NAMES,
+ ...SEMANTIC_NAMES,
+ ),
+);
+
+function paletteForCSSProperty(property) {
+ if (property) {
+ if (property === "color" || /text|font/i.test(property)) {
+ return PALETTE_FOREGROUND;
+ } else if (/bg|background/i.test(property)) {
+ return PALETTE_BACKGROUND;
+ } else if (/border/i.test(property)) {
+ return PALETTE_BORDER;
+ } else if (/shadow/i.test(property)) {
+ return PALETTE_SHADOW;
+ }
+ }
+ if (property != undefined) {
+ console.log("unknown pallet for property", property);
+ }
+ return PALETTE_OTHER;
+}
+
+function getBestCandidate(color, palette) {
+ const closest = colorDiff.closest(
+ { R: color.red(), G: color.green(), B: color.blue() },
+ palette,
+ );
+ let bestName = closest.name;
+ let bestColor = closest.color;
+ if (color.alpha() < 1) {
+ bestColor = bestColor.alpha(color.alpha());
+ }
+ return [bestName, bestColor];
+}
+
+function toJSValue(newColorName, newColor) {
+ if (newColor.alpha() < 1) {
+ return newColor.string();
+ } else {
+ return newColor.hex();
+ }
+}
+
+function toCSSValue(newColorName, newColor) {
+ if (newColor.alpha() < 1) {
+ return `color(var(${varForName(newColorName)}) alpha(-${Math.round(
+ 100 * (1 - newColor.alpha()),
+ )}%))`;
+ } else {
+ return `var(${varForName(newColorName)})`;
+ }
+}
+
+function lineAtIndex(lines, index) {
+ let charIndex = 0;
+ for (let lineIndex = 0; lineIndex < lines.length; lineIndex++) {
+ charIndex += lines[lineIndex].length + 1;
+ if (charIndex >= index) {
+ return lines[lineIndex];
+ }
+ }
+}
+
+function lineUpToIndex(lines, index) {
+ let charIndex = 0;
+ for (let lineIndex = 0; lineIndex < lines.length; lineIndex++) {
+ const lineStart = charIndex;
+ charIndex += lines[lineIndex].length + 1;
+ if (charIndex >= index) {
+ return lines[lineIndex].slice(0, index - lineStart);
+ }
+ }
+}
+
+function cssPropertyAtIndex(lines, index) {
+ const line = lineAtIndex(lines, index);
+ const prefix = lineUpToIndex(lines, index);
+ if (line) {
+ const match =
+ // matches property names at the beginning of the line
+ line.match(/^\s*([a-zA-Z0-9-]+):/) ||
+ // matches property names leading up to the rule value
+ prefix.match(/(^|[^a-zA-Z0-9-])([a-zA-Z0-9-]+)\s*:\s*"?$/);
+ if (match) {
+ return match[1].trim();
+ } else {
+ console.warn("no property", line);
+ }
+ } else {
+ console.warn("no line at that index! this should not happen");
+ }
+}
+
+function replaceCSSColorValues(content) {
+ const lines = content.split("\n");
+ return content.replace(COLOR_REGEX, (color, index) => {
+ const palette = paletteForCSSProperty(cssPropertyAtIndex(lines, index));
+ const [newColorName, newColor] = getBestCandidate(Color(color), palette);
+ return toCSSValue(newColorName, newColor);
+ });
+}
+
+function replaceJSColorValues(content) {
+ if (COLOR_REGEX.test(content)) {
+ // console.log("processing");
+ return replaceStrings(content, COLOR_REGEX, (value, propertyName) => {
+ const palette = paletteForCSSProperty(propertyName);
+ const [newColorName, newColor] = getBestCandidate(Color(value), palette);
+ // console.log(value, propertyName, "=>", newColorName);
+ // return j.identifier(newColorName.replace(/\W/g, "_"));
+ // return j.stringLiteral(toJSValue(newColorName, newColor));
+ return j.memberExpression(
+ j.identifier("colors"),
+ /\W/.test(newColorName)
+ ? j.literal(newColorName)
+ : j.identifier(newColorName),
+ );
+ });
+ } else {
+ // console.log("skipping");
+ return content;
+ }
+}
+
+function replaceCSSColorVariables(content) {
+ const lines = content.split("\n");
+ return content.replace(CSS_VAR_REGEX, (variable, index) => {
+ const match = variable.match(/^var\(--color-(.*)\)$/);
+ if (match && colors[match[1]]) {
+ // already references a color, don't change it
+ return variable;
+ }
+ const color = resolveCSSVariableColor(variable);
+ if (color) {
+ const palette = paletteForCSSProperty(cssPropertyAtIndex(lines, index));
+ const [newColorName, newColor] = getBestCandidate(Color(color), palette);
+ return toCSSValue(newColorName, newColor);
+ } else {
+ return variable;
+ }
+ });
+}
+
+function resolveCSSVariableColor(value) {
+ try {
+ if (value) {
+ if (COLOR_REGEX.test(value)) {
+ return Color(value);
+ }
+ const colorVarMatch = value.match(CSS_COLOR_VAR_REGEX);
+ if (colorVarMatch) {
+ const color = resolveCSSVariableColor(cssVariables[colorVarMatch[1]]);
+ if (color) {
+ const shade = parseFloat(colorVarMatch[2]) / 100;
+ return Color(color).mix(Color("black"), shade);
+ }
+ }
+ const varMatch = value.match(CSS_SIMPLE_VAR_REGEX);
+ if (varMatch) {
+ const color = resolveCSSVariableColor(cssVariables[varMatch[1]]);
+ if (color) {
+ return color;
+ }
+ }
+ }
+ } catch (e) {
+ console.warn(e);
+ }
+ return null;
+}
+
+function processFiles(files) {
+ for (const file of files) {
+ let content = fs.readFileSync(file, "utf-8");
+ try {
+ if (/\.css/.test(file)) {
+ content = replaceCSSColorVariables(replaceCSSColorValues(content));
+ } else if (/\.jsx?/.test(file)) {
+ let newContent = replaceJSColorValues(content);
+ if (newContent !== content && !/\/colors.js/.test(file)) {
+ newContent = ensureHasColorsImport(newContent);
+ }
+ content = newContent;
+ } else {
+ console.warn("unknown file type", file);
+ }
+ fs.writeFileSync(file, content);
+ } catch (e) {
+ console.log("failed to process", file, e);
+ }
+ }
+
+ // do this last so we don't replace them
+ prependCSSVariablesBlock();
+ prependJSVariablesBlock();
+}
+
+function ensureHasColorsImport(content) {
+ // TODO: implement
+ return content;
+}
+
+function prependCSSVariablesBlock() {
+ const colorsVarsBlock = `
+/* NOTE: DO NOT ADD COLORS WITHOUT EXTREMELY GOOD REASON AND DESIGN REVIEW
+ * NOTE: KEEP SYNCRONIZED WITH COLORS.JS
+ */
+:root {
+${Object.entries(colors)
+ .map(([name, color]) => ` ${varForName(name)}: ${color};`)
+ .join("\n")}
+}\n\n`;
+
+ const content = fs.readFileSync(COLORS_CSS_PATH, "utf-8");
+ if (content.indexOf("NOTE: DO NOT ADD COLORS") < 0) {
+ fs.writeFileSync(COLORS_CSS_PATH, colorsVarsBlock + content);
+ }
+}
+
+function prependJSVariablesBlock() {
+ // TODO: remove window.colors and inject `import colors from "metabase/lib/colors";` in each file where it's required
+ const colorsVarsBlock = `
+// NOTE: DO NOT ADD COLORS WITHOUT EXTREMELY GOOD REASON AND DESIGN REVIEW
+// NOTE: KEEP SYNCRONIZED WITH COLORS.CSS
+const colors = window.colors = ${JSON.stringify(colors, null, 2)};
+export default colors;\n\n`;
+
+ const content = fs.readFileSync(COLORS_JS_PATH, "utf-8");
+ if (content.indexOf("NOTE: DO NOT ADD COLORS") < 0) {
+ const anchor = "export const brand = ";
+ fs.writeFileSync(
+ COLORS_JS_PATH,
+ content.replace(anchor, colorsVarsBlock + anchor),
+ );
+ }
+}
+
+function run() {
+ const fileGlob = process.argv[2] || FILE_GLOB;
+ glob(
+ path.join(__dirname, "..", fileGlob),
+ { ignore: FILE_GLOB_IGNORE },
+ (err, files) => {
+ if (err) {
+ console.error(err);
+ } else {
+ processFiles(files);
+ }
+ },
+ );
+}
+
+run();
diff --git a/bin/lib/codemod.js b/bin/lib/codemod.js
new file mode 100644
index 0000000000000000000000000000000000000000..7ef4bfe676fd7181cf2f41478938fcc0fd5d0d5c
--- /dev/null
+++ b/bin/lib/codemod.js
@@ -0,0 +1,140 @@
+const j = require("jscodeshift");
+
+function getPropertyName(path) {
+ const parent = path.parentPath.value;
+ if (parent.type === "Property") {
+ if (parent.key.type === "Identifier") {
+ return parent.key.name;
+ } else if (parent.key.type === "Literal") {
+ return parent.key.value;
+ }
+ }
+ if (parent.type === "JSXAttribute") {
+ return parent.name.name;
+ }
+}
+
+function splitMatches(string, regex) {
+ const results = [];
+ let current = 0;
+ string.replace(regex, (match, index) => {
+ results.push(string.slice(current, index));
+ results.push(match);
+ current = index + match.length;
+ });
+ results.push(string.slice(current));
+ return results;
+}
+
+function extractMatches(
+ string,
+ regex,
+ replacer = str => j.stringLiteral(str),
+ quasis = [],
+ expressions = [],
+) {
+ const components = splitMatches(string, regex);
+ for (let cIndex = 0; cIndex < components.length; cIndex++) {
+ if (cIndex % 2) {
+ expressions.push(replacer(components[cIndex]));
+ } else {
+ const quasi = j.templateElement(
+ { cooked: components[cIndex], raw: components[cIndex] },
+ false,
+ );
+ quasis.push(quasi);
+ }
+ }
+ return components.length > 1;
+}
+
+function makeTemplate(quasis, expressions) {
+ if (
+ quasis.length === 2 &&
+ quasis[0].value.raw === "" &&
+ quasis[1].value.raw === ""
+ ) {
+ return expressions[0];
+ } else {
+ return j.templateLiteral(quasis, expressions);
+ }
+}
+
+exports.replaceStrings = function replaceStrings(source, regex, replacer) {
+ const root = j(source, { parser: require("flow-parser") });
+ root
+ .find(j.Literal)
+ .filter(
+ path =>
+ // match only string literals
+ typeof path.value.value === "string" &&
+ // don't match strings that are property keys
+ !(
+ path.parentPath.value.type && path.parentPath.value.key == path.value
+ ),
+ )
+ .replaceWith(path => {
+ const stringValue = path.value.value;
+ const propertyName = getPropertyName(path);
+
+ const quasis = [];
+ const expressions = [];
+ if (
+ extractMatches(
+ stringValue,
+ regex,
+ str => replacer(str, propertyName),
+ quasis,
+ expressions,
+ )
+ ) {
+ const value = makeTemplate(quasis, expressions);
+ // wrap non string literals in JSXExpressionContainer
+ if (
+ path.parentPath.value.type === "JSXAttribute" &&
+ (value.type !== "Literal" || typeof value.value !== "string")
+ ) {
+ return j.jsxExpressionContainer(value);
+ } else {
+ return value;
+ }
+ } else {
+ return path.value;
+ }
+ });
+ root
+ .find(j.TemplateLiteral)
+ // .filter(path => typeof path.value.value.raw === "string")
+ .replaceWith(path => {
+ const propertyName = getPropertyName(path);
+
+ let modified = false;
+ const quasis = [];
+ const expressions = [];
+
+ for (let qIndex = 0; qIndex < path.value.quasis.length; qIndex++) {
+ const quasiValue = path.value.quasis[qIndex].value.raw;
+ if (
+ extractMatches(
+ quasiValue,
+ regex,
+ str => replacer(str, propertyName),
+ quasis,
+ expressions,
+ )
+ ) {
+ modified = true;
+ }
+ if (qIndex < path.value.expressions.length) {
+ expressions.push(path.value.expressions[qIndex]);
+ }
+ }
+
+ if (modified) {
+ return makeTemplate(quasis, expressions);
+ } else {
+ return path.value;
+ }
+ });
+ return root.toSource();
+};
diff --git a/docs/administration-guide/databases/bigquery.md b/docs/administration-guide/databases/bigquery.md
index 58f3576f66789cee074c551a0aae9d943e44c046..833636f595229116d1cdf5e9b3540da23b7c78a2 100644
--- a/docs/administration-guide/databases/bigquery.md
+++ b/docs/administration-guide/databases/bigquery.md
@@ -21,9 +21,12 @@ Starting in v0.15.0 Metabase provides a driver for connecting to BigQuery direct
Metabase will now begin inspecting your BigQuery Dataset and finding any tables and fields to build up a sense for the schema. Give it a little bit of time to do its work and then you're all set to start querying.
-## Using Standard SQL
+## Using Legacy SQL
-By default, Metabase tells BigQuery to interpret queries as [Legacy SQL](https://cloud.google.com/bigquery/docs/reference/legacy-sql). If you prefer using
-[Standard SQL](https://cloud.google.com/bigquery/docs/reference/standard-sql/) instead, you can tell Metabase to do so by including a `#standardSQL` directive at the beginning of your query:
+As of version 0.30.0, Metabase tells BigQuery to interpret SQL queries as [Standard SQL](https://cloud.google.com/bigquery/docs/reference/standard-sql/). If you prefer using [Legacy SQL](https://cloud.google.com/bigquery/docs/reference/legacy-sql) instead, you can tell Metabase to do so by including a `#legacySQL` directive at the beginning of your query, for example:
-
+```sql
+#legacySQL
+SELECT *
+FROM [my_dataset.my_table]
+```
diff --git a/docs/troubleshooting-guide/email.md b/docs/troubleshooting-guide/email.md
index 4c798c64162f9b9368247f0799850d863d721245..aeac1772bbefaa83ac47228016f49eca4bceb994 100644
--- a/docs/troubleshooting-guide/email.md
+++ b/docs/troubleshooting-guide/email.md
@@ -19,6 +19,7 @@
4. For user accounts specifically, did you previously create an account under this email and then delete it? This occasionally results in that email address being "claimed".
+5. Make sure that the HOSTNAME is being set correctly. EC2 instances in particular have those set to the local ip, and some email delivery services such as GMail will error out in this situation.
## Specific Problems:
@@ -27,4 +28,4 @@
### Metabase can't send email via Office365
We see users report issues with sending email via Office365. We recommend using a different email delivery service if you can.
-https://github.com/metabase/metabase/issues/4272
\ No newline at end of file
+https://github.com/metabase/metabase/issues/4272
diff --git a/docs/users-guide/15-alerts.md b/docs/users-guide/15-alerts.md
index 28d96a19ef2b67cf15d5ce2cfaace91da949bdcc..03d2f5747c698214ccb2db3b85a4160154fe0fcb 100644
--- a/docs/users-guide/15-alerts.md
+++ b/docs/users-guide/15-alerts.md
@@ -3,7 +3,7 @@
Whether you're keeping track of revenue, users, or negative reviews, there are often times when you want to be alerted about something. Metabase has a few different kinds of alerts you can set up, and you can choose to be notified via email or Slack.
### Getting alerts
-To start using alerts, someone on your team who's an administrator will need to make sure that [email integration](../administrator-guide/02-setting-up-email.md) is set up first.
+To start using alerts, someone on your team who's an administrator will need to make sure that [email integration](../administration-guide/02-setting-up-email.md) is set up first.
### Types of alerts
There are three kinds of things you can get alerted about in Metabase:
@@ -16,7 +16,7 @@ We'll go through these one by one.
### Goal line alerts
This kind of alert is useful when you're doing things like tracking daily active users and you want to know when you reach a certain number of them, or when you're tracking orders per week and you want to know whenever that number ever goes below a certain threshold.
-To start, you'll need a line, area, or bar chart displaying a number over time. (If you need help with that, check out the page on [asking questions](04-asking-questions).)
+To start, you'll need a line, area, or bar chart displaying a number over time. (If you need help with that, check out the page on [asking questions](04-asking-questions.md).)
Now we need to set up a goal line. To do that, open up the visualization settings by clicking the gear icon next to the dropdown where you chose your chart type. Then click on the Display tab, and turn on the "Show goal" setting. Choose a value for your goal and click Done.
diff --git a/frontend/lint/eslint-rules/no-color-literals.js b/frontend/lint/eslint-rules/no-color-literals.js
new file mode 100644
index 0000000000000000000000000000000000000000..32f96d1e393bf67716dc846af09d78badc251bbc
--- /dev/null
+++ b/frontend/lint/eslint-rules/no-color-literals.js
@@ -0,0 +1,39 @@
+/**
+ * @fileoverview Rule to disallow color literals
+ * @author Tom Robinson
+ */
+
+"use strict";
+
+//------------------------------------------------------------------------------
+// Rule Definition
+//------------------------------------------------------------------------------
+
+const COLOR_REGEX = /(?:#[a-fA-F0-9]{3}(?:[a-fA-F0-9]{3})?\b|(?:rgb|hsl)a?\(\s*\d+\s*(?:,\s*\d+(?:\.\d+)?%?\s*){2,3}\))/g;
+const LINT_MESSAGE =
+ "Color literals forbidden. Import colors from 'metabase/lib/colors'.";
+
+module.exports = {
+ meta: {
+ docs: {
+ description: "disallow color literals",
+ category: "Possible Errors",
+ recommended: true,
+ },
+ schema: [], // no options
+ },
+ create: function(context) {
+ return {
+ Literal(node) {
+ if (typeof node.value === "string" && COLOR_REGEX.test(node.value)) {
+ context.report({ node, message: LINT_MESSAGE });
+ }
+ },
+ TemplateLiteral(node) {
+ if (node.quasis.filter(q => COLOR_REGEX.test(q.value.raw)).length > 0) {
+ context.report({ node, message: LINT_MESSAGE });
+ }
+ },
+ };
+ },
+};
diff --git a/frontend/src/metabase-lib/lib/Question.js b/frontend/src/metabase-lib/lib/Question.js
index 18d9a4e6535f27ba8f5fd995596c4b3f6d916789..48cdca51409534e991cf543456437dcc855e1ace 100644
--- a/frontend/src/metabase-lib/lib/Question.js
+++ b/frontend/src/metabase-lib/lib/Question.js
@@ -189,7 +189,9 @@ export default class Question {
*/
atomicQueries(): AtomicQuery[] {
const query = this.query();
- if (query instanceof AtomicQuery) return [query];
+ if (query instanceof AtomicQuery) {
+ return [query];
+ }
return [];
}
diff --git a/frontend/src/metabase-lib/lib/queries/Aggregation.js b/frontend/src/metabase-lib/lib/queries/Aggregation.js
index 43539b8fb7ec53c55b5f4d2e7eb254b1a0621110..f32f90021e46cc77f5e830b29397bfc1b73257b3 100644
--- a/frontend/src/metabase-lib/lib/queries/Aggregation.js
+++ b/frontend/src/metabase-lib/lib/queries/Aggregation.js
@@ -23,7 +23,9 @@ export default class Aggregation {
* Returns `null` if the clause isn't in a standard format
*/
getOption(): ?AggregationOption {
- if (this._query == null) return null;
+ if (this._query == null) {
+ return null;
+ }
const operator = this.getOperator();
return operator
diff --git a/frontend/src/metabase/admin/databases/components/DatabaseSchedulingForm.jsx b/frontend/src/metabase/admin/databases/components/DatabaseSchedulingForm.jsx
index 289fa6ce53330a46a9a552403e99fccc2ddc9477..48e97382828407539dc492e62586472fb2420133 100644
--- a/frontend/src/metabase/admin/databases/components/DatabaseSchedulingForm.jsx
+++ b/frontend/src/metabase/admin/databases/components/DatabaseSchedulingForm.jsx
@@ -3,12 +3,14 @@ import cx from "classnames";
import _ from "underscore";
import { assocIn } from "icepick";
import { t } from "c-3po";
-import FormMessage from "metabase/components/form/FormMessage";
+import FormMessage from "metabase/components/form/FormMessage";
import SchedulePicker from "metabase/components/SchedulePicker";
-import MetabaseAnalytics from "metabase/lib/analytics";
import LoadingAndErrorWrapper from "metabase/components/LoadingAndErrorWrapper";
+import MetabaseAnalytics from "metabase/lib/analytics";
+import colors from "metabase/lib/colors";
+
export const SyncOption = ({ selected, name, children, select }) => (
<div
className={cx("py3 relative", { "cursor-pointer": !selected })}
@@ -20,7 +22,7 @@ export const SyncOption = ({ selected, name, children, select }) => (
width: 18,
height: 18,
borderWidth: 2,
- borderColor: selected ? "#509ee3" : "#ddd",
+ borderColor: selected ? colors["brand"] : colors["text-light"],
borderStyle: "solid",
}}
>
@@ -30,7 +32,7 @@ export const SyncOption = ({ selected, name, children, select }) => (
style={{
width: 8,
height: 8,
- backgroundColor: selected ? "#509ee3" : "#ddd",
+ backgroundColor: selected ? colors["brand"] : colors["text-light"],
}}
/>
)}
diff --git a/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.jsx b/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.jsx
index f8f1cf5b46f43acfbdc0629d2ef0e739c1f16f8e..1623ef4a8bbda012eba15af88a6aa186c95c8d5d 100644
--- a/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.jsx
+++ b/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.jsx
@@ -13,6 +13,8 @@ import ActionButton from "metabase/components/ActionButton.jsx";
import Breadcrumbs from "metabase/components/Breadcrumbs.jsx";
import ModalWithTrigger from "metabase/components/ModalWithTrigger.jsx";
+import colors from "metabase/lib/colors";
+
import {
getEditingDatabase,
getFormState,
@@ -46,7 +48,9 @@ export const Tab = ({ name, setTab, currentTab }) => {
<div
className={cx("cursor-pointer py2", { "text-brand": isCurrentTab })}
// TODO Use css classes instead?
- style={isCurrentTab ? { borderBottom: "3px solid #509EE3" } : {}}
+ style={
+ isCurrentTab ? { borderBottom: `3px solid ${colors["brand"]}` } : {}
+ }
onClick={() => setTab(name)}
>
<h3>{name}</h3>
diff --git a/frontend/src/metabase/admin/datamodel/components/database/MetadataHeader.jsx b/frontend/src/metabase/admin/datamodel/components/database/MetadataHeader.jsx
index a79d1b05dc285f47a86115aa16d28ecd06b85e7a..576498b45fc257cfd4be1ec57173fc1eadf68204 100644
--- a/frontend/src/metabase/admin/datamodel/components/database/MetadataHeader.jsx
+++ b/frontend/src/metabase/admin/datamodel/components/database/MetadataHeader.jsx
@@ -67,7 +67,9 @@ export default class MetadataHeader extends Component {
// TODO - it would be nicer just to disable the gear so the page doesn't jump around once you select a Table.
renderTableSettingsButton() {
const isViewingTable = this.props.location.pathname.match(/table\/\d+\/?$/);
- if (!isViewingTable) return null;
+ if (!isViewingTable) {
+ return null;
+ }
return (
<span className="ml4 mr3">
diff --git a/frontend/src/metabase/admin/datamodel/containers/FieldApp.jsx b/frontend/src/metabase/admin/datamodel/containers/FieldApp.jsx
index ff169c8c2e70aa8fc1ca1beec0f2e5a82118628d..2814efbc573ed0e49ccf3ee7006c5b50548df592 100644
--- a/frontend/src/metabase/admin/datamodel/containers/FieldApp.jsx
+++ b/frontend/src/metabase/admin/datamodel/containers/FieldApp.jsx
@@ -39,6 +39,7 @@ import { DatetimeFieldDimension } from "metabase-lib/lib/Dimension";
import { rescanFieldValues, discardFieldValues } from "../field";
import { has_field_values_options } from "metabase/lib/core";
+import colors from "metabase/lib/colors";
const SelectClasses =
"h3 bordered border-dark shadowed p2 inline-block flex align-center rounded text-bold";
@@ -276,7 +277,7 @@ export const BackButton = ({ databaseId, tableId }) => (
<Link
to={`/admin/datamodel/database/${databaseId}/table/${tableId}`}
className="circle text-white p2 mt3 ml3 flex align-center justify-center absolute top left"
- style={{ backgroundColor: "#8091AB" }}
+ style={{ backgroundColor: colors["bg-dark"] }}
>
<Icon name="backArrow" />
</Link>
@@ -492,11 +493,19 @@ export class FieldRemapping extends Component {
}
getMappingTypeForField = field => {
- if (this.state.isChoosingInitialFkTarget) return MAP_OPTIONS.foreign;
+ if (this.state.isChoosingInitialFkTarget) {
+ return MAP_OPTIONS.foreign;
+ }
- if (_.isEmpty(field.dimensions)) return MAP_OPTIONS.original;
- if (field.dimensions.type === "external") return MAP_OPTIONS.foreign;
- if (field.dimensions.type === "internal") return MAP_OPTIONS.custom;
+ if (_.isEmpty(field.dimensions)) {
+ return MAP_OPTIONS.original;
+ }
+ if (field.dimensions.type === "external") {
+ return MAP_OPTIONS.foreign;
+ }
+ if (field.dimensions.type === "internal") {
+ return MAP_OPTIONS.custom;
+ }
throw new Error(t`Unrecognized mapping type`);
};
diff --git a/frontend/src/metabase/admin/people/components/EditUserForm.jsx b/frontend/src/metabase/admin/people/components/EditUserForm.jsx
index 1374bc276415f762055db10e8a1d4651ba166b76..5d2bddfee2b0ce2fa9c4af4d8142b917c654f44d 100644
--- a/frontend/src/metabase/admin/people/components/EditUserForm.jsx
+++ b/frontend/src/metabase/admin/people/components/EditUserForm.jsx
@@ -47,7 +47,9 @@ export default class EditUserForm extends Component {
let isValid = true;
["firstName", "lastName", "email"].forEach(fieldName => {
- if (MetabaseUtils.isEmpty(this.state[fieldName])) isValid = false;
+ if (MetabaseUtils.isEmpty(this.state[fieldName])) {
+ isValid = false;
+ }
});
if (isValid !== valid) {
diff --git a/frontend/src/metabase/admin/people/components/GroupsListing.jsx b/frontend/src/metabase/admin/people/components/GroupsListing.jsx
index fe190748722a9dff37b2a4dcbc86588fb104b985..d1858b0daf78710b6373788b63931003ddfd6537 100644
--- a/frontend/src/metabase/admin/people/components/GroupsListing.jsx
+++ b/frontend/src/metabase/admin/people/components/GroupsListing.jsx
@@ -280,8 +280,9 @@ export default class GroupsListing extends Component {
},
error => {
console.error("Error creating group:", error);
- if (error.data && typeof error.data === "string")
+ if (error.data && typeof error.data === "string") {
this.alert(error.data);
+ }
},
);
}
@@ -354,8 +355,9 @@ export default class GroupsListing extends Component {
},
error => {
console.error("Error updating group name:", error);
- if (error.data && typeof error.data === "string")
+ if (error.data && typeof error.data === "string") {
this.alert(error.data);
+ }
},
);
}
@@ -373,8 +375,9 @@ export default class GroupsListing extends Component {
},
error => {
console.error("Error deleting group: ", error);
- if (error.data && typeof error.data === "string")
+ if (error.data && typeof error.data === "string") {
this.alert(error.data);
+ }
},
);
}
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsGrid.jsx b/frontend/src/metabase/admin/permissions/components/PermissionsGrid.jsx
index c58400bc904f537ee0a8c46b4eb7b55516b725b4..5e8d9a83d508a69a01f41c33dc6ef11749e32f44 100644
--- a/frontend/src/metabase/admin/permissions/components/PermissionsGrid.jsx
+++ b/frontend/src/metabase/admin/permissions/components/PermissionsGrid.jsx
@@ -18,8 +18,10 @@ import { capitalize, pluralize } from "metabase/lib/formatting";
import cx from "classnames";
import _ from "underscore";
-const LIGHT_BORDER = "rgb(225, 226, 227)";
-const DARK_BORDER = "rgb(161, 163, 169)";
+import colors from "metabase/lib/colors";
+
+const LIGHT_BORDER = colors["text-light"];
+const DARK_BORDER = colors["text-medium"];
const BORDER_RADIUS = 4;
const getBorderStyles = ({
@@ -46,8 +48,8 @@ const HEADER_WIDTH = 240;
const DEFAULT_OPTION = {
icon: "unknown",
- iconColor: "#9BA5B1",
- bgColor: "#DFE8EA",
+ iconColor: colors["text-medium"],
+ bgColor: colors["bg-medium"],
};
const PermissionsHeader = ({ permissions, isFirst, isLast }) => (
@@ -258,7 +260,9 @@ class GroupPermissionCell extends Component {
name={option.icon}
size={28}
style={{
- color: this.state.hovered ? "#fff" : option.iconColor,
+ color: this.state.hovered
+ ? colors["text-white"]
+ : option.iconColor,
}}
/>
{confirmations &&
diff --git a/frontend/src/metabase/admin/permissions/selectors.js b/frontend/src/metabase/admin/permissions/selectors.js
index d9b68b33ceeff9f35fea7edcff0afd4f596e60de..4560f7d163c045be472cd305651716dfec24ddac 100644
--- a/frontend/src/metabase/admin/permissions/selectors.js
+++ b/frontend/src/metabase/admin/permissions/selectors.js
@@ -5,6 +5,8 @@ import { createSelector } from "reselect";
import { push } from "react-router-redux";
import MetabaseAnalytics from "metabase/lib/analytics";
+import colors, { alpha } from "metabase/lib/colors";
+
import { t } from "c-3po";
import {
isDefaultGroup,
@@ -219,20 +221,22 @@ function getRevokingAccessToAllTablesWarningModal(
}
}
+const BG_ALPHA = 0.15;
+
const OPTION_GREEN = {
icon: "check",
- iconColor: "#9CC177",
- bgColor: "#F6F9F2",
+ iconColor: colors["success"],
+ bgColor: alpha(colors["success"], BG_ALPHA),
};
const OPTION_YELLOW = {
icon: "eye",
- iconColor: "#F9D45C",
- bgColor: "#FEFAEE",
+ iconColor: colors["warning"],
+ bgColor: alpha(colors["warning"], BG_ALPHA),
};
const OPTION_RED = {
icon: "close",
- iconColor: "#EEA5A5",
- bgColor: "#FDF3F3",
+ iconColor: colors["error"],
+ bgColor: alpha(colors["error"], BG_ALPHA),
};
const OPTION_ALL = {
diff --git a/frontend/src/metabase/admin/settings/components/SettingsSetupList.jsx b/frontend/src/metabase/admin/settings/components/SettingsSetupList.jsx
index 549e5a6f1c6e58b4440f9afac5cd63bc5b230dcc..e53a0d5a95b0c1b5a4af56d3d03e537efa4da814 100644
--- a/frontend/src/metabase/admin/settings/components/SettingsSetupList.jsx
+++ b/frontend/src/metabase/admin/settings/components/SettingsSetupList.jsx
@@ -4,6 +4,7 @@ import Icon from "metabase/components/Icon.jsx";
import LoadingAndErrorWrapper from "metabase/components/LoadingAndErrorWrapper.jsx";
import { SetupApi } from "metabase/services";
import { t } from "c-3po";
+import colors from "metabase/lib/colors";
const TaskList = ({ tasks }) => (
<ol>
@@ -40,14 +41,14 @@ const CompletionBadge = ({ completed }) => (
style={{
borderWidth: 1,
borderStyle: "solid",
- borderColor: completed ? "#9CC177" : "#DCE9EA",
- backgroundColor: completed ? "#9CC177" : "#fff",
+ borderColor: completed ? colors["success"] : colors["text-light"],
+ backgroundColor: completed ? colors["success"] : colors["text-white"],
width: 32,
height: 32,
borderRadius: 99,
}}
>
- {completed && <Icon name="check" color={"#fff"} />}
+ {completed && <Icon name="check" color={colors["text-white"]} />}
</div>
);
diff --git a/frontend/src/metabase/admin/settings/components/SettingsSingleSignOnForm.jsx b/frontend/src/metabase/admin/settings/components/SettingsSingleSignOnForm.jsx
index 059ab40c9427c46818b776d145e2f447ab20c668..ef04708c76492a1d6d623e969daf9e43a1f9f981 100644
--- a/frontend/src/metabase/admin/settings/components/SettingsSingleSignOnForm.jsx
+++ b/frontend/src/metabase/admin/settings/components/SettingsSingleSignOnForm.jsx
@@ -40,7 +40,9 @@ export default class SettingsSingleSignOnForm extends Component {
}
updateClientID(newValue) {
- if (newValue === this.state.clientIDValue) return;
+ if (newValue === this.state.clientIDValue) {
+ return;
+ }
this.setState({
clientIDValue: newValue && newValue.length ? newValue : null,
@@ -49,7 +51,9 @@ export default class SettingsSingleSignOnForm extends Component {
}
updateDomain(newValue) {
- if (newValue === this.state.domain.value) return;
+ if (newValue === this.state.domain.value) {
+ return;
+ }
this.setState({
domainValue: newValue && newValue.length ? newValue : null,
diff --git a/frontend/src/metabase/admin/settings/components/SettingsSlackForm.jsx b/frontend/src/metabase/admin/settings/components/SettingsSlackForm.jsx
index cf89aeb0236151dba0e5cf6a6235157debde59c5..35aa29f65917a2ed3b499b6fca72c21d09be9bf0 100644
--- a/frontend/src/metabase/admin/settings/components/SettingsSlackForm.jsx
+++ b/frontend/src/metabase/admin/settings/components/SettingsSlackForm.jsx
@@ -59,7 +59,9 @@ export default class SettingsSlackForm extends Component {
// return null if element passes validation, otherwise return an error message
validateElement([validationType, validationMessage], value, element) {
- if (MetabaseUtils.isEmpty(value)) return;
+ if (MetabaseUtils.isEmpty(value)) {
+ return;
+ }
switch (validationType) {
case "email":
@@ -93,7 +95,9 @@ export default class SettingsSlackForm extends Component {
formData[element.key],
element,
);
- if (validationErrors[element.key]) valid = false;
+ if (validationErrors[element.key]) {
+ valid = false;
+ }
}, this);
}
}, this);
diff --git a/frontend/src/metabase/admin/settings/components/SettingsUpdatesForm.jsx b/frontend/src/metabase/admin/settings/components/SettingsUpdatesForm.jsx
index 365be4d82dc2c800b1231f4c1e6e77bcfce9a3e8..a98cada9c614ac13ffdfd67063f0f39b705ab5fb 100644
--- a/frontend/src/metabase/admin/settings/components/SettingsUpdatesForm.jsx
+++ b/frontend/src/metabase/admin/settings/components/SettingsUpdatesForm.jsx
@@ -41,7 +41,9 @@ export default class SettingsUpdatesForm extends Component {
let versionInfo = _.findWhere(this.props.settings, { key: "version-info" }),
currentVersion = MetabaseSettings.get("version").tag;
- if (versionInfo) versionInfo = versionInfo.value;
+ if (versionInfo) {
+ versionInfo = versionInfo.value;
+ }
/*
We expect the versionInfo to take on the JSON structure detailed below.
@@ -93,7 +95,7 @@ export default class SettingsUpdatesForm extends Component {
} else {
return (
<div>
- <div className="p2 bg-green bordered rounded border-green flex flex-row align-center justify-between">
+ <div className="p2 bg-green bordered rounded border-success flex flex-row align-center justify-between">
<span className="text-white text-bold">{jt`Metabase ${this.removeVersionPrefixIfNeeded(
versionInfo.latest.version,
)} is available. You're running ${this.removeVersionPrefixIfNeeded(
diff --git a/frontend/src/metabase/app.js b/frontend/src/metabase/app.js
index 1eaf904db0de92ac05a604416d1f54c35ef203ba..d9ac7a4a3700e15424340393050993bfa67072bb 100644
--- a/frontend/src/metabase/app.js
+++ b/frontend/src/metabase/app.js
@@ -7,6 +7,8 @@ import "number-to-locale-string";
// strings/elements to assist in finding untranslated strings.
import "metabase/lib/i18n-debug";
+import "metabase/lib/colors";
+
// make the i18n function "t" global so we don't have to import it in basically every file
import { t, jt } from "c-3po";
global.t = t;
diff --git a/frontend/src/metabase/auth/components/AuthScene.jsx b/frontend/src/metabase/auth/components/AuthScene.jsx
index 5e392ff8a62e8f60c605d3be0f12fea2155e222c..b08f66febcebfe550f2fca40c981599de6428e7d 100644
--- a/frontend/src/metabase/auth/components/AuthScene.jsx
+++ b/frontend/src/metabase/auth/components/AuthScene.jsx
@@ -1,3 +1,5 @@
+/* eslint-disable no-color-literals */
+
import React, { Component } from "react";
import ReactDOM from "react-dom";
diff --git a/frontend/src/metabase/components/AccordianList.jsx b/frontend/src/metabase/components/AccordianList.jsx
index 45f4b6cf41e036252bce82caa720c4495943bb17..7468e21a94e8d44310e6ac01fa762dd25e1ea582 100644
--- a/frontend/src/metabase/components/AccordianList.jsx
+++ b/frontend/src/metabase/components/AccordianList.jsx
@@ -243,6 +243,9 @@ export default class AccordianList extends Component {
const sectionIsTogglable = sectionIndex =>
alwaysTogglable || sections.length > 1;
+ // if any section is searchable just enable a global search
+ let globalSearch = false;
+
const rows = [];
for (const [sectionIndex, section] of sections.entries()) {
const isLastSection = sectionIndex === sections.length - 1;
@@ -265,7 +268,11 @@ export default class AccordianList extends Component {
section.items &&
section.items.length > 0
) {
- rows.push({ type: "search", section, sectionIndex, isLastSection });
+ if (alwaysExpanded) {
+ globalSearch = true;
+ } else {
+ rows.push({ type: "search", section, sectionIndex, isLastSection });
+ }
}
if (
sectionIsExpanded(sectionIndex) &&
@@ -295,6 +302,15 @@ export default class AccordianList extends Component {
}
}
+ if (globalSearch) {
+ rows.unshift({
+ type: "search",
+ section: {},
+ sectionIndex: 0,
+ isLastSection: false,
+ });
+ }
+
const maxHeight =
this.props.maxHeight > 0 && this.props.maxHeight < Infinity
? this.props.maxHeight
diff --git a/frontend/src/metabase/components/ArchiveCollectionModal.jsx b/frontend/src/metabase/components/ArchiveCollectionModal.jsx
index 21f878408d79f4550027eae0125498aeef897ad4..2d7350fe731c1b34ae562d80fbe6410aeb38a2c4 100644
--- a/frontend/src/metabase/components/ArchiveCollectionModal.jsx
+++ b/frontend/src/metabase/components/ArchiveCollectionModal.jsx
@@ -32,9 +32,9 @@ class ArchiveCollectionModal extends React.Component {
onClose={() => this.props.onClose()}
>
<Box px={3}>
- <Text>
+ <p>
{t`The dashboards, collections, and pulses in this collection will also be archived.`}
- </Text>
+ </p>
<Flex py={3}>
<Button warning ml="auto" onClick={() => this._archive()}>
{t`Archive`}
diff --git a/frontend/src/metabase/components/ArchivedItem.jsx b/frontend/src/metabase/components/ArchivedItem.jsx
index 40c1c4ae50623fd6cdcb92178dfef5f214ad79f1..b4f7b4f527888336accf7b8b6f11138cbd3a848f 100644
--- a/frontend/src/metabase/components/ArchivedItem.jsx
+++ b/frontend/src/metabase/components/ArchivedItem.jsx
@@ -10,11 +10,13 @@ import IconWrapper from "metabase/components/IconWrapper";
import Swapper from "metabase/components/Swapper";
import Tooltip from "metabase/components/Tooltip";
+import colors from "metabase/lib/colors";
+
const ArchivedItem = ({
name,
type,
icon,
- color = "#DEEAF1",
+ color = colors["text-light"],
isAdmin = false,
onUnarchive,
diff --git a/frontend/src/metabase/components/Breadcrumbs.css b/frontend/src/metabase/components/Breadcrumbs.css
index 586d2d9ff1ac01d5cca6325c3562faa4c5869bb9..e71afe906599877fd1a79f749cdfd8a35aa901e3 100644
--- a/frontend/src/metabase/components/Breadcrumbs.css
+++ b/frontend/src/metabase/components/Breadcrumbs.css
@@ -1,10 +1,10 @@
:root {
- --breadcrumbs-color: #bfc1c2;
- --breadcrumb-page-color: #636060;
+ --breadcrumbs-color: var(--color-text-light);
+ --breadcrumb-page-color: var(--color-text-dark);
--breadcrumb-divider-spacing: 0.75em;
/* taken from Sidebar.css, should probably factor them out into variables */
- --sidebar-breadcrumbs-color: #9caebe;
- --sidebar-breadcrumb-page-color: #2d86d4;
+ --sidebar-breadcrumbs-color: var(--color-text-medium);
+ --sidebar-breadcrumb-page-color: var(--color-brand);
}
:local(.breadcrumbs) {
diff --git a/frontend/src/metabase/components/BrowseApp.jsx b/frontend/src/metabase/components/BrowseApp.jsx
index 477c0be53ebd97b6f0444cfe60954fb51c570675..f1678224075987b2cd22f25d46e604badcfb525a 100644
--- a/frontend/src/metabase/components/BrowseApp.jsx
+++ b/frontend/src/metabase/components/BrowseApp.jsx
@@ -1,5 +1,5 @@
import React from "react";
-import { Box } from "grid-styled";
+import { Box, Flex } from "grid-styled";
import { t } from "c-3po";
import BrowserCrumbs from "metabase/components/BrowserCrumbs";
@@ -15,6 +15,7 @@ import { Grid, GridItem } from "metabase/components/Grid";
import Icon from "metabase/components/Icon";
import Link from "metabase/components/Link";
import Subhead from "metabase/components/Subhead";
+import Tooltip from "metabase/components/Tooltip";
export const DatabaseListLoader = props => (
<EntityListLoader entityType="databases" {...props} />
@@ -52,12 +53,14 @@ export class SchemaBrowser extends React.Component {
{({ schemas }) =>
schemas.length > 1 ? (
<Box>
- <BrowserCrumbs
- crumbs={[
- { title: t`Your data`, to: "browse" },
- { title: <DatabaseName dbId={dbId} /> },
- ]}
- />
+ <Box my={2}>
+ <BrowserCrumbs
+ crumbs={[
+ { title: t`Our data`, to: "browse" },
+ { title: <DatabaseName dbId={dbId} /> },
+ ]}
+ />
+ </Box>
<Grid>
{schemas.map(schema => (
<GridItem w={1 / 3}>
@@ -66,13 +69,21 @@ export class SchemaBrowser extends React.Component {
mb={1}
hover={{ color: normal.purple }}
>
- <Card hoverable>
- <EntityItem
- name={schema.name}
- iconName="folder"
- iconColor={normal.purple}
- item={schema}
- />
+ <Card hoverable px={1}>
+ <Flex align="center">
+ <EntityItem
+ name={schema.name}
+ iconName="folder"
+ iconColor={normal.purple}
+ item={schema}
+ />
+ <Box ml="auto">
+ <Icon name="reference" />
+ <Tooltip tooltip={t`X-ray this schema`}>
+ <Icon name="bolt" mx={1} />
+ </Tooltip>
+ </Box>
+ </Flex>
</Card>
</Link>
</GridItem>
@@ -98,16 +109,18 @@ export class TableBrowser extends React.Component {
{({ tables, loading, error }) => {
return (
<Box>
- <BrowserCrumbs
- crumbs={[
- { title: t`Your data`, to: "browse" },
- {
- title: <DatabaseName dbId={dbId} />,
- to: `browse/${dbId}`,
- },
- schemaName != null && { title: schemaName },
- ]}
- />
+ <Box my={2}>
+ <BrowserCrumbs
+ crumbs={[
+ { title: t`Our data`, to: "browse" },
+ {
+ title: <DatabaseName dbId={dbId} />,
+ to: `browse/${dbId}`,
+ },
+ schemaName != null && { title: schemaName },
+ ]}
+ />
+ </Box>
<Grid>
{tables.map(table => {
const link = Question.create({
@@ -117,16 +130,52 @@ export class TableBrowser extends React.Component {
return (
<GridItem w={1 / 3}>
- <Link to={link} mb={1} hover={{ color: normal.purple }}>
- <Card hoverable>
- <EntityItem
- item={table}
- name={table.display_name || table.name}
- iconName="table"
- iconColor={normal.purple}
- />
- </Card>
- </Link>
+ <Card
+ hoverable
+ px={1}
+ className="hover-parent hover--visibility"
+ >
+ <Flex align="center">
+ <Link
+ to={link}
+ ml={1}
+ hover={{ color: normal.purple }}
+ >
+ <EntityItem
+ item={table}
+ name={table.display_name || table.name}
+ iconName="table"
+ iconColor={normal.purple}
+ />
+ </Link>
+ <Box ml="auto" mr={1} className="hover-child">
+ <Flex align="center">
+ <Tooltip tooltip={t`X-ray this table`}>
+ <Link to={`auto/dashboard/table/${table.id}`}>
+ <Icon
+ name="bolt"
+ mx={1}
+ color={normal.yellow}
+ size={20}
+ />
+ </Link>
+ </Tooltip>
+ <Tooltip tooltip={t`Learn about this table`}>
+ <Link
+ to={`reference/databases/${dbId}/tables/${
+ table.id
+ }`}
+ >
+ <Icon
+ name="reference"
+ color={normal.grey1}
+ />
+ </Link>
+ </Tooltip>
+ </Flex>
+ </Box>
+ </Flex>
+ </Card>
</GridItem>
);
})}
@@ -150,7 +199,9 @@ export class DatabaseBrowser extends React.Component {
render() {
return (
<Box>
- <BrowserCrumbs crumbs={[{ title: t`Your data` }]} />
+ <Box my={2}>
+ <BrowserCrumbs crumbs={[{ title: t`Our data` }]} />
+ </Box>
<DatabaseListLoader>
{({ databases, loading, error }) => {
return (
diff --git a/frontend/src/metabase/components/BrowserCrumbs.jsx b/frontend/src/metabase/components/BrowserCrumbs.jsx
index f3b8c18ccd9187151d2a6f9517fa2b78589b6ef8..db1090ee7e5877ffcc5cdeee1f734ddcdb8c7f97 100644
--- a/frontend/src/metabase/components/BrowserCrumbs.jsx
+++ b/frontend/src/metabase/components/BrowserCrumbs.jsx
@@ -1,30 +1,39 @@
import React from "react";
-import { Box, Flex } from "grid-styled";
+import { Flex } from "grid-styled";
import Icon from "metabase/components/Icon";
import Link from "metabase/components/Link";
-import Subhead from "metabase/components/Subhead";
+
+import colors from "metabase/lib/colors";
// TODO: merge with Breadcrumbs
-const BrowseHeader = ({ children }) => (
- <Box my={3}>
- <Subhead>{children}</Subhead>
- </Box>
+const Crumb = ({ children }) => (
+ <h5
+ className="text-uppercase text-brand-hover"
+ style={{ color: colors["text-medium"], fontWeight: 900 }}
+ >
+ {children}
+ </h5>
);
const BrowserCrumbs = ({ crumbs }) => (
<Flex align="center">
{crumbs.filter(c => c).map((crumb, index, crumbs) => [
- crumb.to ? (
- <Link key={"title" + index} to={crumb.to}>
- <BrowseHeader>{crumb.title}</BrowseHeader>
- </Link>
- ) : (
- <BrowseHeader>{crumb.title}</BrowseHeader>
+ crumb.to && (
+ <Flex align="center">
+ <Link key={"title" + index} to={crumb.to}>
+ <Crumb>{crumb.title}</Crumb>
+ </Link>
+ {index < crumbs.length - 1 ? (
+ <Icon
+ key={"divider" + index}
+ name="chevronright"
+ color={colors["text-light"]}
+ mx={1}
+ />
+ ) : null}
+ </Flex>
),
- index < crumbs.length - 1 ? (
- <Icon key={"divider" + index} name="chevronright" mx={2} />
- ) : null,
])}
</Flex>
);
diff --git a/frontend/src/metabase/components/Calendar.css b/frontend/src/metabase/components/Calendar.css
index 672333441a30e84b2c80019d2c6417860bf00dde..861a91a4c59e6340193dcaf0d56247a126010060 100644
--- a/frontend/src/metabase/components/Calendar.css
+++ b/frontend/src/metabase/components/Calendar.css
@@ -8,9 +8,9 @@
}
.Calendar-day {
- color: color(var(--base-grey) shade(30%));
+ color: var(--color-text-medium);
position: relative;
- border: 1px solid color(var(--base-grey) shade(20%) alpha(-50%));
+ border: 1px solid color(var(--color-border) shade(20%) alpha(-50%));
border-radius: 0;
border-bottom-width: 0;
border-right-width: 0;
@@ -36,7 +36,7 @@
}
.Calendar-day:hover {
- color: var(--purple-color);
+ color: var(--color-accent2);
}
.Calendar-day-name {
@@ -46,12 +46,12 @@
.Calendar-day--selected,
.Calendar-day--selected-end {
color: white !important;
- background-color: var(--purple-color);
+ background-color: var(--color-accent2);
z-index: 1;
}
.Calendar-day--in-range {
- background-color: #e3daeb;
+ background-color: var(--color-bg-medium);
}
.Calendar-day--selected:after,
@@ -63,7 +63,7 @@
bottom: -1px;
left: -2px;
right: -2px;
- border: 2px solid color(var(--purple-color) shade(25%));
+ border: 2px solid var(--color-accent2);
border-radius: 4px;
z-index: 2;
}
@@ -77,20 +77,20 @@
.Calendar-day--week-start.Calendar-day--in-range:after {
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
- border-left-color: color(var(--purple-color) shade(25%));
+ border-left-color: var(--color-accent2);
}
.Calendar-day--week-end.Calendar-day--in-range:after {
border-top-right-radius: 4px;
border-bottom-right-radius: 4px;
- border-right-color: color(var(--purple-color) shade(25%));
+ border-right-color: var(--color-accent2);
}
.circle-button {
display: block;
font-size: 20px;
- color: color(var(--base-grey) shade(30%));
- border: 2px solid color(var(--base-grey) shade(10%));
+ color: var(--color-text-medium);
+ border: 2px solid var(--color-border);
border-radius: 99px;
width: 24px;
height: 24px;
@@ -102,8 +102,8 @@
}
.circle-button:hover {
- color: var(--purple-color);
- border-color: var(--purple-color);
+ color: var(--color-accent2);
+ border-color: var(--color-accent2);
}
.circle-button--top {
diff --git a/frontend/src/metabase/components/Card.info.js b/frontend/src/metabase/components/Card.info.js
new file mode 100644
index 0000000000000000000000000000000000000000..36aa39b8fc834f79c9ff89c1368aff9d0b60c99a
--- /dev/null
+++ b/frontend/src/metabase/components/Card.info.js
@@ -0,0 +1,27 @@
+import React from "react";
+import Card from "metabase/components/Card";
+export const component = Card;
+
+export const description = `
+A generic card component.
+`;
+
+const DemoContent = () => <div className="p4">Look, a card!</div>;
+
+export const examples = {
+ normal: (
+ <Card>
+ <DemoContent />
+ </Card>
+ ),
+ dark: (
+ <Card dark>
+ <DemoContent />
+ </Card>
+ ),
+ hoverable: (
+ <Card hoverable>
+ <DemoContent />
+ </Card>
+ ),
+};
diff --git a/frontend/src/metabase/components/Card.jsx b/frontend/src/metabase/components/Card.jsx
index d4e6603951497a54f0dbd5a384d74bdb2287d2fd..e6072c9ac137922ff8073cca40cebef9117373c6 100644
--- a/frontend/src/metabase/components/Card.jsx
+++ b/frontend/src/metabase/components/Card.jsx
@@ -1,17 +1,18 @@
import styled from "styled-components";
import { space } from "styled-system";
-import { normal } from "metabase/lib/colors";
+import colors, { alpha } from "metabase/lib/colors";
const Card = styled.div`
- ${space} background-color: ${props => (props.dark ? "#2e353b" : "white")};
- border: 1px solid ${props => (props.dark ? "transparent" : "#f5f6f7")};
+ ${space} background-color: ${props =>
+ props.dark ? colors["text-dark"] : "white"};
+ border: 1px solid ${props => (props.dark ? "transparent" : colors["border"])};
${props => props.dark && `color: white`};
border-radius: 6px;
- box-shadow: 0 1px 3px ${props => (props.dark ? "#65686b" : normal.grey1)};
+ box-shadow: 0 5px 22px ${props => colors["shadow"]};
${props =>
props.hoverable &&
`&:hover {
- box-shadow: 0 2px 3px ${props.dark ? "#2e35b" : "#DCE1E4"};
+ box-shadow: 0 5px 16px ${alpha(colors["shadow"], 0.1)};
}`};
`;
diff --git a/frontend/src/metabase/components/CheckBox.jsx b/frontend/src/metabase/components/CheckBox.jsx
index b1ab71d20b52fad501086743b5b496fb3f218497..53a3fab28363afa07207f96971d25e9c6405024a 100644
--- a/frontend/src/metabase/components/CheckBox.jsx
+++ b/frontend/src/metabase/components/CheckBox.jsx
@@ -2,7 +2,7 @@ import React, { Component } from "react";
import PropTypes from "prop-types";
import Icon from "metabase/components/Icon";
-import { normal as defaultColors } from "metabase/lib/colors";
+import colors, { normal as defaultColors } from "metabase/lib/colors";
export default class CheckBox extends Component {
static propTypes = {
@@ -36,7 +36,7 @@ export default class CheckBox extends Component {
const { checked, indeterminate, color, padding, size, noIcon } = this.props;
const checkedColor = defaultColors[color];
- const uncheckedColor = "#ddd";
+ const uncheckedColor = colors["text-light"];
const checkboxStyle = {
width: size,
diff --git a/frontend/src/metabase/components/CollectionLanding.jsx b/frontend/src/metabase/components/CollectionLanding.jsx
index 9de58109fcf4233d943193cd9b9b1c21fdb5081c..533df217b6294fa4fd4ea3451c10d0456f8a7041 100644
--- a/frontend/src/metabase/components/CollectionLanding.jsx
+++ b/frontend/src/metabase/components/CollectionLanding.jsx
@@ -8,7 +8,7 @@ import BulkActionBar from "metabase/components/BulkActionBar";
import cx from "classnames";
import * as Urls from "metabase/lib/urls";
-import { normal } from "metabase/lib/colors";
+import colors, { normal } from "metabase/lib/colors";
import Button from "metabase/components/Button";
import Card from "metabase/components/Card";
@@ -20,7 +20,6 @@ import Icon from "metabase/components/Icon";
import Link from "metabase/components/Link";
import CollectionEmptyState from "metabase/components/CollectionEmptyState";
import EntityMenu from "metabase/components/EntityMenu";
-import Ellipsified from "metabase/components/Ellipsified";
import VirtualizedList from "metabase/components/VirtualizedList";
import BrowserCrumbs from "metabase/components/BrowserCrumbs";
@@ -29,6 +28,8 @@ import { entityObjectLoader } from "metabase/entities/containers/EntityObjectLoa
import { ROOT_COLLECTION } from "metabase/entities/collections";
+import CollectionList from "metabase/components/CollectionList";
+
// drag-and-drop components
import ItemDragSource from "metabase/containers/dnd/ItemDragSource";
import CollectionDropTarget from "metabase/containers/dnd/CollectionDropTarget";
@@ -36,73 +37,6 @@ import PinPositionDropTarget from "metabase/containers/dnd/PinPositionDropTarget
import PinDropTarget from "metabase/containers/dnd/PinDropTarget";
import ItemsDragLayer from "metabase/containers/dnd/ItemsDragLayer";
-const CollectionItem = ({ collection, color, iconName = "all" }) => (
- <Link
- to={`collection/${collection.id}`}
- hover={{ color: normal.blue }}
- color={color || normal.grey2}
- >
- <Flex align="center" py={1} key={`collection-${collection.id}`}>
- <Icon name={iconName} mx={1} color="#93B3C9" />
- <h4>
- <Ellipsified>{collection.name}</Ellipsified>
- </h4>
- </Flex>
- </Link>
-);
-
-@connect(({ currentUser }) => ({ currentUser }), null)
-class CollectionList extends React.Component {
- render() {
- const { collections, currentUser, isRoot } = this.props;
- return (
- <Box mb={2}>
- <Box my={2}>
- {isRoot && (
- <Box className="relative">
- <CollectionDropTarget
- collection={{ id: currentUser.personal_collection_id }}
- >
- <CollectionItem
- collection={{
- name: t`My personal collection`,
- id: currentUser.personal_collection_id,
- }}
- iconName="star"
- />
- </CollectionDropTarget>
- </Box>
- )}
- {isRoot &&
- currentUser.is_superuser && (
- <CollectionItem
- collection={{
- name: t`Everyone else's personal collections`,
- // Bit of a hack. The route /collection/users lists
- // user collections but is not itself a colllection,
- // but using the fake id users here works
- id: "users",
- }}
- iconName="person"
- />
- )}
- </Box>
- {collections
- .filter(c => c.id !== currentUser.personal_collection_id)
- .map(collection => (
- <Box key={collection.id} mb={1} className="relative">
- <CollectionDropTarget collection={collection}>
- <ItemDragSource item={collection}>
- <CollectionItem collection={collection} />
- </ItemDragSource>
- </CollectionDropTarget>
- </Box>
- ))}
- </Box>
- );
- }
-}
-
const ROW_HEIGHT = 72;
import { entityListLoader } from "metabase/entities/containers/EntityListLoader";
@@ -160,142 +94,143 @@ class DefaultLanding extends React.Component {
onSelectNone();
};
- // Show the
- const showCollectionList =
- collectionId === "root" || collections.length > 0;
-
return (
- <Flex>
- {showCollectionList && (
- <Box w={1 / 3} mr={3}>
- <Box>
- <h4>{t`Collections`}</h4>
- </Box>
- <CollectionList
- collections={collections}
- isRoot={collectionId === "root"}
- />
- </Box>
- )}
- <Box w={2 / 3}>
+ <Box>
+ <Box>
<Box>
- {pinned.length === 0 && unpinned.length === 0 ? (
- <CollectionEmptyState />
- ) : (
- <Box>
- {pinned.length > 0 ? (
- <Box mb={2}>
- <Box mb={2}>
- <h4>{t`Pinned items`}</h4>
- </Box>
- <PinDropTarget
- pinIndex={1}
- marginLeft={8}
- marginRight={8}
- noBorder
- >
- <Grid>
- {pinned.map((item, index) => (
- <GridItem w={1 / 2} className="relative">
- <ItemDragSource item={item}>
- <PinnedItem
- key={`${item.type}:${item.id}`}
- index={index}
- item={item}
- collection={collection}
- />
- <PinPositionDropTarget pinIndex={index} left />
- <PinPositionDropTarget
- pinIndex={index + 1}
- right
- />
- </ItemDragSource>
- </GridItem>
- ))}
- {pinned.length % 2 === 1 ? (
- <GridItem w={1 / 2} className="relative">
- <PinPositionDropTarget pinIndex={pinned.length} />
- </GridItem>
- ) : null}
- </Grid>
- </PinDropTarget>
- </Box>
- ) : (
- <PinDropTarget pinIndex={1} hideUntilDrag>
- {({ hovered }) => (
- <div
- className={cx(
- "p2 flex layout-centered",
- hovered ? "text-brand" : "text-grey-2",
- )}
- >
- <Icon name="pin" mr={1} />
- {t`Drag something here to pin it to the top`}
- </div>
- )}
- </PinDropTarget>
- )}
- <Flex align="center" mb={2}>
- {pinned.length > 0 && (
- <Box>
- <h4>{t`Saved here`}</h4>
- </Box>
- )}
- </Flex>
- {unpinned.length > 0 ? (
- <PinDropTarget pinIndex={null} margin={8}>
- <Card
- mb={selected.length > 0 ? 5 : 2}
- style={{
- position: "relative",
- height: ROW_HEIGHT * unpinned.length,
- }}
- >
- <VirtualizedList
- items={unpinned}
- rowHeight={ROW_HEIGHT}
- renderItem={({ item, index }) => (
- <ItemDragSource item={item} selection={selection}>
- <NormalItem
+ <Box>
+ {pinned.length > 0 ? (
+ <Box mx={4} mt={2} mb={3}>
+ <CollectionSectionHeading>{t`Pins`}</CollectionSectionHeading>
+ <PinDropTarget
+ pinIndex={pinned[pinned.length - 1].collection_position + 1}
+ noDrop
+ marginLeft={8}
+ marginRight={8}
+ >
+ <Grid>
+ {pinned.map((item, index) => (
+ <GridItem w={1 / 3} className="relative">
+ <ItemDragSource item={item}>
+ <PinnedItem
key={`${item.type}:${item.id}`}
+ index={index}
item={item}
collection={collection}
- selection={selection}
- onToggleSelected={onToggleSelected}
- onMove={moveItems => this.setState({ moveItems })}
+ />
+ <PinPositionDropTarget
+ pinIndex={item.collection_position}
+ left
+ />
+ <PinPositionDropTarget
+ pinIndex={item.collection_position + 1}
+ right
/>
</ItemDragSource>
- )}
- />
- </Card>
+ </GridItem>
+ ))}
+ {pinned.length % 2 === 1 ? (
+ <GridItem w={1 / 4} className="relative">
+ <PinPositionDropTarget
+ pinIndex={
+ pinned[pinned.length - 1].collection_position + 1
+ }
+ />
+ </GridItem>
+ ) : null}
+ </Grid>
</PinDropTarget>
- ) : (
- <PinDropTarget pinIndex={null} hideUntilDrag margin={10}>
- {({ hovered }) => (
- <div
- className={cx(
- "m2 flex layout-centered",
- hovered ? "text-brand" : "text-grey-2",
- )}
- >
- {t`Drag here to un-pin`}
- </div>
+ </Box>
+ ) : (
+ <PinDropTarget pinIndex={1} hideUntilDrag>
+ {({ hovered }) => (
+ <div
+ className={cx(
+ "p2 flex layout-centered",
+ hovered ? "text-brand" : "text-grey-2",
+ )}
+ >
+ <Icon name="pin" mr={1} />
+ {t`Drag something here to pin it to the top`}
+ </div>
+ )}
+ </PinDropTarget>
+ )}
+ <Box pt={2} px={4} bg="white">
+ <Box py={2}>
+ <CollectionSectionHeading>
+ {t`Collections`}
+ </CollectionSectionHeading>
+ </Box>
+
+ <CollectionList
+ currentCollection={collection}
+ collections={collections}
+ isRoot={collectionId === "root"}
+ />
+ <Box>
+ <Box align="center" mb={1} mt={3}>
+ <CollectionSectionHeading>
+ {t`Dashboards questions and pulses`}
+ </CollectionSectionHeading>
+ {unpinned.length === 0 && (
+ <Box pb={4}>
+ <CollectionEmptyState />
+ </Box>
)}
- </PinDropTarget>
- )}
+ </Box>
+ {unpinned.length > 0 ? (
+ <PinDropTarget pinIndex={null} margin={8}>
+ <Box>
+ <Box
+ mb={selected.length > 0 ? 5 : 2}
+ style={{
+ position: "relative",
+ height: ROW_HEIGHT * unpinned.length,
+ }}
+ >
+ <VirtualizedList
+ items={unpinned}
+ rowHeight={ROW_HEIGHT}
+ renderItem={({ item, index }) => (
+ <ItemDragSource item={item} selection={selection}>
+ <NormalItem
+ key={`${item.type}:${item.id}`}
+ item={item}
+ collection={collection}
+ selection={selection}
+ onToggleSelected={onToggleSelected}
+ onMove={moveItems =>
+ this.setState({ moveItems })
+ }
+ />
+ </ItemDragSource>
+ )}
+ />
+ </Box>
+ </Box>
+ </PinDropTarget>
+ ) : (
+ <PinDropTarget pinIndex={null} hideUntilDrag margin={10}>
+ {({ hovered }) => (
+ <div
+ className={cx(
+ "m2 flex layout-centered",
+ hovered ? "text-brand" : "text-grey-2",
+ )}
+ >
+ {t`Drag here to un-pin`}
+ </div>
+ )}
+ </PinDropTarget>
+ )}
+ </Box>
</Box>
- )}
+ </Box>
<BulkActionBar showing={selected.length > 0}>
- <Flex align="center" w="100%">
- {showCollectionList && (
- <Box w={1 / 3}>
- <span className="hidden">spacer</span>
- </Box>
- )}
- <Flex w={2 / 3} mx={showCollectionList ? 3 : 0} align="center">
- <Box ml={showCollectionList ? 3 : 2}>
- <SelectionControls {...this.props} />
- </Box>
+ <Flex align="center">
+ <Flex align="center">
+ <SelectionControls {...this.props} />
<BulkActionControls
onArchive={
_.all(selected, item => item.setArchived)
@@ -348,7 +283,7 @@ class DefaultLanding extends React.Component {
</Modal>
)}
<ItemsDragLayer selected={selected} />
- </Flex>
+ </Box>
);
}
}
@@ -464,30 +399,28 @@ class CollectionLanding extends React.Component {
: [];
return (
- <Box mx={4}>
+ <Box>
<Box>
- <Flex align="center">
- <BrowserCrumbs
- crumbs={[
- ...ancestors.map(({ id, name }) => ({
- title: (
- <CollectionDropTarget collection={{ id }} margin={8}>
- {name}
- </CollectionDropTarget>
- ),
- to: Urls.collection(id),
- })),
- { title: currentCollection.name },
- ]}
- />
+ <Flex align="center" mt={2} mb={3} mx={4}>
+ <Box>
+ <Box mb={1}>
+ <BrowserCrumbs
+ crumbs={[
+ ...ancestors.map(({ id, name }) => ({
+ title: (
+ <CollectionDropTarget collection={{ id }} margin={8}>
+ {name}
+ </CollectionDropTarget>
+ ),
+ to: Urls.collection(id),
+ })),
+ ]}
+ />
+ </Box>
+ <h1 style={{ fontWeight: 900 }}>{currentCollection.name}</h1>
+ </Box>
<Flex ml="auto">
- {currentCollection &&
- currentCollection.can_write && (
- <Box ml={1}>
- <NewObjectMenu collectionId={collectionId} />
- </Box>
- )}
{currentCollection &&
currentCollection.can_write &&
!currentCollection.personal_owner_id && (
@@ -519,27 +452,13 @@ class CollectionLanding extends React.Component {
}
}
-const NewObjectMenu = ({ collectionId }) => (
- <EntityMenu
- items={[
- {
- title: t`New dashboard`,
- icon: "dashboard",
- link: Urls.newDashboard(collectionId),
- },
- {
- title: t`New pulse`,
- icon: "pulse",
- link: Urls.newPulse(collectionId),
- },
- {
- title: t`New collection`,
- icon: "all",
- link: Urls.newCollection(collectionId),
- },
- ]}
- triggerIcon="add"
- />
+const CollectionSectionHeading = ({ children }) => (
+ <h5
+ className="text-uppercase"
+ style={{ color: colors["text-medium"], fontWeight: 900 }}
+ >
+ {children}
+ </h5>
);
const CollectionEditMenu = ({ isRoot, collectionId }) => (
diff --git a/frontend/src/metabase/components/CollectionList.jsx b/frontend/src/metabase/components/CollectionList.jsx
new file mode 100644
index 0000000000000000000000000000000000000000..e2745432740b2fc2a38f0e280a34cdfefa7f9281
--- /dev/null
+++ b/frontend/src/metabase/components/CollectionList.jsx
@@ -0,0 +1,118 @@
+import React from "react";
+import { t } from "c-3po";
+import { Box, Flex } from "grid-styled";
+import { connect } from "react-redux";
+
+import colors, { normal } from "metabase/lib/colors";
+import * as Urls from "metabase/lib/urls";
+
+import Ellipsified from "metabase/components/Ellipsified";
+import { Grid, GridItem } from "metabase/components/Grid";
+import Icon from "metabase/components/Icon";
+import Link from "metabase/components/Link";
+
+import CollectionDropTarget from "metabase/containers/dnd/CollectionDropTarget";
+import ItemDragSource from "metabase/containers/dnd/ItemDragSource";
+
+const CollectionItem = ({ collection, color, iconName = "all" }) => (
+ <Link
+ to={`collection/${collection.id}`}
+ color={color || normal.grey2}
+ className="text-brand-hover"
+ >
+ <Box bg={colors["bg-light"]} p={2} mb={1}>
+ <Flex align="center" py={1} key={`collection-${collection.id}`}>
+ <Icon name={iconName} mx={1} />
+ <h4 className="overflow-hidden">
+ <Ellipsified>{collection.name}</Ellipsified>
+ </h4>
+ </Flex>
+ </Box>
+ </Link>
+);
+
+@connect(({ currentUser }) => ({ currentUser }), null)
+class CollectionList extends React.Component {
+ render() {
+ const {
+ collections,
+ currentUser,
+ currentCollection,
+ isRoot,
+ w,
+ } = this.props;
+ return (
+ <Box>
+ <Grid>
+ {collections
+ .filter(c => c.id !== currentUser.personal_collection_id)
+ .map(collection => (
+ <GridItem w={w}>
+ <CollectionDropTarget collection={collection}>
+ <ItemDragSource item={collection}>
+ <CollectionItem collection={collection} />
+ </ItemDragSource>
+ </CollectionDropTarget>
+ </GridItem>
+ ))}
+ {currentCollection && (
+ <GridItem w={w}>
+ <Link
+ to={Urls.newCollection(currentCollection.id)}
+ color={normal.grey2}
+ hover={{ color: normal.blue }}
+ >
+ <Box p={[1, 2]} className="bordered rounded">
+ <Flex align="center" py={1}>
+ <Icon name="add" mr={1} bordered />
+ <h4>{t`New collection`}</h4>
+ </Flex>
+ </Box>
+ </Link>
+ </GridItem>
+ )}
+ </Grid>
+ <Box mt={[1, 2]}>
+ <Grid>
+ {isRoot && (
+ <GridItem w={w}>
+ <CollectionDropTarget
+ collection={{ id: currentUser.personal_collection_id }}
+ >
+ <CollectionItem
+ collection={{
+ name: t`My personal collection`,
+ id: currentUser.personal_collection_id,
+ }}
+ iconName="star"
+ />
+ </CollectionDropTarget>
+ </GridItem>
+ )}
+ {isRoot &&
+ currentUser.is_superuser && (
+ <GridItem w={w}>
+ <CollectionItem
+ collection={{
+ name: t`Everyone else's personal collections`,
+ // Bit of a hack. The route /collection/users lists
+ // user collections but is not itself a colllection,
+ // but using the fake id users here works
+ id: "users",
+ }}
+ iconName="person"
+ />
+ </GridItem>
+ )}
+ </Grid>
+ </Box>
+ </Box>
+ );
+ }
+}
+
+CollectionList.defaultProps = {
+ w: [1, 1 / 2, 1 / 4],
+};
+
+export default CollectionList;
diff --git a/frontend/src/metabase/components/ColorPicker.jsx b/frontend/src/metabase/components/ColorPicker.jsx
index 28676d41ebccc3764ec86ca717e1440f055d6f18..d663d206d494524a41ab60e740d7a38ce3e0aee5 100644
--- a/frontend/src/metabase/components/ColorPicker.jsx
+++ b/frontend/src/metabase/components/ColorPicker.jsx
@@ -20,7 +20,6 @@ const ColorSquare = ({ color, size }) => (
class ColorPicker extends Component {
static defaultProps = {
- colors: [...Object.values(normal)],
size: DEFAULT_COLOR_SQUARE_SIZE,
triggerSize: DEFAULT_COLOR_SQUARE_SIZE,
padding: 4,
@@ -35,7 +34,8 @@ class ColorPicker extends Component {
};
render() {
- const { colors, onChange, padding, size, triggerSize, value } = this.props;
+ const { onChange, padding, size, triggerSize, value } = this.props;
+ const colors = this.props.colors || [...Object.values(normal)];
return (
<div className="inline-block">
<PopoverWithTrigger
diff --git a/frontend/src/metabase/components/ColumnarSelector.css b/frontend/src/metabase/components/ColumnarSelector.css
index 26033e2b7376a9e6635456b524d84f610d0fffdf..fb4a782fc28a4bf599c0ad00997fa216463ed3f9 100644
--- a/frontend/src/metabase/components/ColumnarSelector.css
+++ b/frontend/src/metabase/components/ColumnarSelector.css
@@ -1,6 +1,6 @@
.ColumnarSelector {
display: flex;
- background-color: #fcfcfc;
+ background-color: var(--color-bg-white);
font-weight: 700;
}
@@ -16,7 +16,7 @@
}
.ColumnarSelector-title {
- color: color(var(--base-grey) shade(30%));
+ color: var(--color-text-medium);
text-transform: uppercase;
font-size: 10px;
font-weight: 700;
@@ -30,7 +30,7 @@
.ColumnarSelector-description {
margin-top: 0.5em;
- color: color(var(--base-grey) shade(30%));
+ color: var(--color-text-medium);
max-width: 270px;
}
@@ -45,24 +45,24 @@
.ColumnarSelector-row:not(.ColumnarSelector-row--disabled):hover,
.ColumnarSelector-row:not(.ColumnarSelector-row--disabled):hover .Icon {
- background-color: var(--brand-color) !important;
+ background-color: var(--color-brand) !important;
color: white !important;
}
.ColumnarSelector-row:not(.ColumnarSelector-row--disabled):hover
.ColumnarSelector-description {
- color: rgba(255, 255, 255, 0.5);
+ color: color(var(--color-text-white) alpha(-50%));
}
.ColumnarSelector-row--selected {
color: inherit !important;
background: white;
- border-top: var(--border-size) var(--border-style) var(--border-color);
- border-bottom: var(--border-size) var(--border-style) var(--border-color);
+ border-top: var(--border-size) var(--border-style) var(--color-border);
+ border-bottom: var(--border-size) var(--border-style) var(--color-border);
}
.ColumnarSelector-row--disabled {
- color: var(--grey-3);
+ color: var(--color-text-medium);
}
.ColumnarSelector-row .Icon-check {
@@ -81,7 +81,7 @@
/* only apply if there's more than one, aka the last is not the first */
.ColumnarSelector-column:last-child:not(:first-child) {
background-color: white;
- border-left: var(--border-size) var(--border-style) var(--border-color);
+ border-left: var(--border-size) var(--border-style) var(--color-border);
position: relative;
left: -1px;
}
@@ -90,5 +90,5 @@
background: inherit;
border-top: none;
border-bottom: none;
- color: var(--brand-color);
+ color: var(--color-brand);
}
diff --git a/frontend/src/metabase/components/DatabaseDetailsForm.jsx b/frontend/src/metabase/components/DatabaseDetailsForm.jsx
index 8002abaa3e0bdaf906420462c770276ea60ea118..ff989adccb33dc3dc126568fb96dcc6a0fec89aa 100644
--- a/frontend/src/metabase/components/DatabaseDetailsForm.jsx
+++ b/frontend/src/metabase/components/DatabaseDetailsForm.jsx
@@ -127,8 +127,12 @@ export default class DatabaseDetailsForm extends Component {
for (let field of engines[engine]["details-fields"]) {
let val = details[field.name] === "" ? null : details[field.name];
- if (val && field.type === "integer") val = parseInt(val);
- if (val == null && field.default) val = field.default;
+ if (val && field.type === "integer") {
+ val = parseInt(val);
+ }
+ if (val == null && field.default) {
+ val = field.default;
+ }
request.details[field.name] = val;
}
diff --git a/frontend/src/metabase/components/DirectionalButton.jsx b/frontend/src/metabase/components/DirectionalButton.jsx
index e17dbb4ad9618c61e2228bcab53ff906c39ad1b6..43afe81ad2d9f3def484e396b0371f4f9abb66f3 100644
--- a/frontend/src/metabase/components/DirectionalButton.jsx
+++ b/frontend/src/metabase/components/DirectionalButton.jsx
@@ -1,13 +1,15 @@
import React from "react";
import Icon from "metabase/components/Icon";
+import colors from "metabase/lib/colors";
+
const DirectionalButton = ({ direction = "back", onClick }) => (
<div
className="shadowed cursor-pointer text-brand-hover text-grey-4 flex align-center circle p2 bg-white transition-background transition-color"
onClick={onClick}
style={{
- border: "1px solid #DCE1E4",
- boxShadow: "0 2px 4px 0 #DCE1E4",
+ border: `1px solid ${colors["border"]}`,
+ boxShadow: `0 2px 4px 0 ${colors["shadow"]}`,
}}
>
<Icon name={`${direction}Arrow`} />
diff --git a/frontend/src/metabase/components/DownloadButton.jsx b/frontend/src/metabase/components/DownloadButton.jsx
index a3b8278b3aeb2504903a4064082a5cb924b0cb6a..16ea2ae30f8f41cccad04063e366c3408ffe9815 100644
--- a/frontend/src/metabase/components/DownloadButton.jsx
+++ b/frontend/src/metabase/components/DownloadButton.jsx
@@ -1,6 +1,8 @@
import React from "react";
import PropTypes from "prop-types";
+import { extractQueryParams } from "metabase/lib/urls";
+
import Button from "metabase/components/Button.jsx";
const DownloadButton = ({
@@ -14,10 +16,7 @@ const DownloadButton = ({
...props
}) => (
<form className={className} style={style} method={method} action={url}>
- {params &&
- Object.entries(params).map(([name, value]) => (
- <input key={name} type="hidden" name={name} value={value} />
- ))}
+ {params && extractQueryParams(params).map(getInput)}
<Button
onClick={e => {
if (window.OSX) {
@@ -34,6 +33,10 @@ const DownloadButton = ({
</form>
);
+const getInput = ([name, value]) => (
+ <input type="hidden" name={name} value={value} />
+);
+
DownloadButton.propTypes = {
className: PropTypes.string,
style: PropTypes.object,
diff --git a/frontend/src/metabase/components/EntityItem.jsx b/frontend/src/metabase/components/EntityItem.jsx
index ec0171b4c2a0f85e245cf37b8d1eedb17b15fdfa..b77542e0675cdeaa7eb348020405d38364420e8a 100644
--- a/frontend/src/metabase/components/EntityItem.jsx
+++ b/frontend/src/metabase/components/EntityItem.jsx
@@ -9,17 +9,14 @@ import CheckBox from "metabase/components/CheckBox";
import Ellipsified from "metabase/components/Ellipsified";
import Icon from "metabase/components/Icon";
-import { normal } from "metabase/lib/colors";
+import colors from "metabase/lib/colors";
const EntityItemWrapper = Flex.extend`
- border-bottom: 1px solid #f8f9fa;
+ border-bottom: 1px solid ${colors["bg-light"]};
/* TODO - figure out how to use the prop instead of this? */
align-items: center;
&:hover {
- color: ${normal.blue};
- }
- &:last-child {
- border-bottom: none;
+ color: ${colors["brand"]};
}
`;
@@ -55,7 +52,7 @@ const EntityItem = ({
].filter(action => action);
return (
- <EntityItemWrapper py={2} px={2} className="hover-parent hover--visibility">
+ <EntityItemWrapper py={2} className="hover-parent hover--visibility">
<IconWrapper
p={1}
mr={1}
diff --git a/frontend/src/metabase/components/EntityLayout.js b/frontend/src/metabase/components/EntityLayout.js
index 05a415ba746111af274e6b545336e93c001a97a5..af41b3dab7250814a48b8a1af409af73bd0b4f48 100644
--- a/frontend/src/metabase/components/EntityLayout.js
+++ b/frontend/src/metabase/components/EntityLayout.js
@@ -2,6 +2,8 @@ import React from "react";
import { Box, Flex } from "grid-styled";
import Subhead from "metabase/components/Subhead";
+import colors from "metabase/lib/colors";
+
export const Wrapper = ({ children }) => (
<Box w="80%" ml="auto" mr="auto">
{children}
@@ -10,11 +12,11 @@ export const Wrapper = ({ children }) => (
export const Canvas = ({ children }) => (
<Box
- bg="#FCFDFD"
+ bg={colors["bg-white"]}
p={2}
style={{
- borderTop: "#F4F5F6",
- borderBottom: "#F5F5F6",
+ borderTop: colors["border"],
+ borderBottom: colors["border"],
}}
>
{children}
diff --git a/frontend/src/metabase/components/EntityMenu.jsx b/frontend/src/metabase/components/EntityMenu.jsx
index 1200ac56679a45c7048af75fbd55e6c0470e5b9d..3cb0d540698c8dbcbc66c34d35f0ba4404895c35 100644
--- a/frontend/src/metabase/components/EntityMenu.jsx
+++ b/frontend/src/metabase/components/EntityMenu.jsx
@@ -30,7 +30,9 @@ class EntityMenu extends Component {
};
toggleMenu = () => {
- if (this.state.freezeMenu) return;
+ if (this.state.freezeMenu) {
+ return;
+ }
const open = !this.state.open;
this.setState({ open, menuItemContent: null });
diff --git a/frontend/src/metabase/components/EntityMenuItem.jsx b/frontend/src/metabase/components/EntityMenuItem.jsx
index 4c8ece386e02d8c422eb0ae95b23e3145b10f1a0..73be5efff36bde7c6a4f598188b8ada1c72e8a71 100644
--- a/frontend/src/metabase/components/EntityMenuItem.jsx
+++ b/frontend/src/metabase/components/EntityMenuItem.jsx
@@ -4,11 +4,13 @@ import { Link } from "react-router";
import Icon from "metabase/components/Icon";
+import colors from "metabase/lib/colors";
+
const itemClasses = cxs({
display: "flex",
alignItems: "center",
cursor: "pointer",
- color: "#616D75",
+ color: colors["text-medium"],
paddingLeft: "1.45em",
paddingRight: "1.45em",
paddingTop: "0.85em",
@@ -16,14 +18,14 @@ const itemClasses = cxs({
textDecoration: "none",
transition: "all 300ms linear",
":hover": {
- color: "#509ee3",
+ color: colors["brand"],
},
"> .Icon": {
- color: "#BCC5CA",
+ color: colors["text-light"],
marginRight: "0.65em",
},
":hover > .Icon": {
- color: "#509ee3",
+ color: colors["brand"],
transition: "all 300ms linear",
},
// icon specific tweaks
@@ -39,7 +41,7 @@ const itemClasses = cxs({
"> .Icon.Icon-download": {
transform: `translateY(1px)`,
},
- // the history icon is wider so it needs adjustement to center it with other
+ // the history icon is wider so it needs adjustment to center it with other
// icons
"> .Icon.Icon-history": {
transform: `translateX(-2px)`,
diff --git a/frontend/src/metabase/components/EntityMenuTrigger.jsx b/frontend/src/metabase/components/EntityMenuTrigger.jsx
index 4c3d38eeebe44a4e08548b1339bf819138dfaf01..19644855f40198fddffbc75de9aad81097409a7f 100644
--- a/frontend/src/metabase/components/EntityMenuTrigger.jsx
+++ b/frontend/src/metabase/components/EntityMenuTrigger.jsx
@@ -2,8 +2,10 @@ import React from "react";
import Icon from "metabase/components/Icon";
import cxs from "cxs";
+import colors from "metabase/lib/colors";
+
const EntityMenuTrigger = ({ icon, onClick, open }) => {
- const interactionColor = "#F2F4F5";
+ const interactionColor = colors["bg-medium"];
const classes = cxs({
display: "flex",
alignItems: "center",
@@ -12,11 +14,11 @@ const EntityMenuTrigger = ({ icon, onClick, open }) => {
height: 40,
borderRadius: 99,
cursor: "pointer",
- color: open ? "#509ee3" : "inherit",
+ color: open ? colors["brand"] : "inherit",
backgroundColor: open ? interactionColor : "transparent",
":hover": {
backgroundColor: interactionColor,
- color: "#509ee3",
+ color: colors["brand"],
transition: "all 300ms linear",
},
// special cases for certain icons
diff --git a/frontend/src/metabase/components/EntityPage.jsx b/frontend/src/metabase/components/EntityPage.jsx
index 944ae6427d9f8f601930c082d7bb8bf43a8428e7..3a15c0ed5184d9696bed7a17fe703cb491a5a627 100644
--- a/frontend/src/metabase/components/EntityPage.jsx
+++ b/frontend/src/metabase/components/EntityPage.jsx
@@ -13,6 +13,8 @@ import QuestionAndResultLoader from "metabase/containers/QuestionAndResultLoader
import RelatedItems from "metabase/components/RelatedItems";
+import colors from "metabase/lib/colors";
+
class EntityPage extends Component {
render() {
return (
@@ -32,7 +34,7 @@ class EntityPage extends Component {
<div key="entity">
<Box
className="border-bottom hover-parent hover--visibility relative"
- style={{ backgroundColor: "#FCFDFD", height: "65vh" }}
+ style={{ backgroundColor: colors["bg-white"], height: "65vh" }}
>
<Box className="hover-child absolute top right">
{!loading && (
@@ -65,7 +67,10 @@ class EntityPage extends Component {
<Box
p={2}
mt={4}
- style={{ border: "1px solid #ddd", borderRadius: 6 }}
+ style={{
+ border: `1px solid ${colors["border"]}`,
+ borderRadius: 6,
+ }}
>
<Box>
<h3>Ways to view this</h3>
diff --git a/frontend/src/metabase/components/ExplorePane.jsx b/frontend/src/metabase/components/ExplorePane.jsx
index dfd1753c6092dcbc105463bc2ef05786f605e092..f5f062d293485f78762fd5b6a9ca90e00a79ca93 100644
--- a/frontend/src/metabase/components/ExplorePane.jsx
+++ b/frontend/src/metabase/components/ExplorePane.jsx
@@ -156,20 +156,17 @@ export const ExploreList = ({
);
export const ExploreOption = ({ option }: { option: Candidate }) => (
- <Link to={option.url} className="flex align-center text-bold no-decoration">
- <div
- className="bg-grey-0 flex align-center rounded mr2 p2 justify-center text-gold"
- style={{ width: 48, height: 48 }}
- >
- <Icon name="bolt" size={24} className="flex-no-shrink" />
- </div>
+ <Link
+ to={option.url}
+ className="flex align-center text-bold no-decoration text-grey-5 text-brand-hover bg-grey-0 p2 py3"
+ >
+ <Icon
+ name="bolt"
+ size={20}
+ className="flex-no-shrink mr1 justify-center text-gold"
+ />
<div>
- <div className="link">{option.title}</div>
- {option.description && (
- <div className="text-grey-4 text-small" style={{ marginTop: "0.25em" }}>
- {option.description}
- </div>
- )}
+ <span className="text-normal">{t`A look at your`}</span> {option.title}
</div>
</Link>
);
diff --git a/frontend/src/metabase/components/Header.jsx b/frontend/src/metabase/components/Header.jsx
index 9d164d36d5be38bfc2eb5df3efecdcb3c4c214b9..c062d59fc9d7792866f388a3414e2a2082aae627 100644
--- a/frontend/src/metabase/components/Header.jsx
+++ b/frontend/src/metabase/components/Header.jsx
@@ -37,7 +37,9 @@ export default class Header extends Component {
}
updateHeaderHeight() {
- if (!this.refs.header) return;
+ if (!this.refs.header) {
+ return;
+ }
const rect = ReactDOM.findDOMNode(this.refs.header).getBoundingClientRect();
const headerHeight = rect.top + getScrollY();
diff --git a/frontend/src/metabase/components/IconWrapper.jsx b/frontend/src/metabase/components/IconWrapper.jsx
index 28cf3fec5b813ac5c6a157ccd0693b8f6accddcf..27120f2fbf966217b362eb7e638de8256879b29e 100644
--- a/frontend/src/metabase/components/IconWrapper.jsx
+++ b/frontend/src/metabase/components/IconWrapper.jsx
@@ -1,7 +1,8 @@
import { Flex } from "grid-styled";
+import colors from "metabase/lib/colors";
const IconWrapper = Flex.extend`
- background: #f4f5f6;
+ background: ${props => colors["bg-light"]};
border-radius: 6px;
`;
diff --git a/frontend/src/metabase/components/List.css b/frontend/src/metabase/components/List.css
index 91ae511cd6bd3b6837ec60d319f4e14ef1cc0528..02bd56af9a7d2a6ae24c0575201541d3addba67b 100644
--- a/frontend/src/metabase/components/List.css
+++ b/frontend/src/metabase/components/List.css
@@ -1,8 +1,8 @@
:root {
- --title-color: #606e7b;
- --subtitle-color: #aab7c3;
- --muted-color: #deeaf1;
- --blue-color: #2d86d4;
+ --title-color: var(--color-text-medium);
+ --subtitle-color: var(--color-text-medium);
+ --muted-color: var(--color-text-light);
+ --blue-color: var(--color-brand);
}
:local(.list) {
@@ -32,7 +32,7 @@
composes: flex flex-full pb2 border-bottom from "style";
align-items: center;
height: 100%;
- border-color: #edf5fb;
+ border-color: var(--color-border);
}
:local(.headerLink) {
@@ -61,7 +61,7 @@
max-width: 550px;
padding-top: 20px;
padding-bottom: 20px;
- border-color: #edf5fb;
+ border-color: var(--color-border);
}
:local(.itemTitle) {
diff --git a/frontend/src/metabase/components/NewsletterForm.jsx b/frontend/src/metabase/components/NewsletterForm.jsx
index 8fa100920c2c6f78cde7ab4a7f8fdc9caeeedbf0..4d874748026d81036d897995399999c15da5e407 100644
--- a/frontend/src/metabase/components/NewsletterForm.jsx
+++ b/frontend/src/metabase/components/NewsletterForm.jsx
@@ -4,6 +4,7 @@ import PropTypes from "prop-types";
import ReactDOM from "react-dom";
import { t } from "c-3po";
import Icon from "metabase/components/Icon.jsx";
+import colors from "metabase/lib/colors";
export default class NewsletterForm extends Component {
constructor(props, context) {
@@ -18,7 +19,7 @@ export default class NewsletterForm extends Component {
input: {
fontSize: "1.1rem",
- color: "#676C72",
+ color: colors["text-dark"],
width: "350px",
},
@@ -73,7 +74,10 @@ export default class NewsletterForm extends Component {
<div className="MB-Newsletter sm-float-right">
<div>
- <div style={{ color: "#878E95" }} className="text-grey-4 h3 pb3">
+ <div
+ style={{ color: colors["text-medium"] }}
+ className="text-grey-4 h3 pb3"
+ >
{t`Get infrequent emails about new releases and feature updates.`}
</div>
diff --git a/frontend/src/metabase/components/PasswordReveal.jsx b/frontend/src/metabase/components/PasswordReveal.jsx
index 1340433575df7d345721ba5d327c5d9950c9f1a5..956159a9b8bbbd8139f30de5f80ca016bc0c068d 100644
--- a/frontend/src/metabase/components/PasswordReveal.jsx
+++ b/frontend/src/metabase/components/PasswordReveal.jsx
@@ -2,6 +2,7 @@
import React, { Component } from "react";
import CopyButton from "metabase/components/CopyButton";
import { t } from "c-3po";
+import colors from "metabase/lib/colors";
type State = {
visible: boolean,
@@ -15,7 +16,7 @@ const styles = {
input: {
fontSize: "1.2rem",
letterSpacing: "2",
- color: "#676C72",
+ color: colors["text-dark"],
outline: "none",
},
};
diff --git a/frontend/src/metabase/components/Popover.css b/frontend/src/metabase/components/Popover.css
index 568be868d48641ea1245d40b74d31e70bcdda766..29a864e425a515184cfd53da6179f42a00b5514f 100644
--- a/frontend/src/metabase/components/Popover.css
+++ b/frontend/src/metabase/components/Popover.css
@@ -16,9 +16,9 @@
}
.PopoverBody.PopoverBody--withBackground {
- border: 1px solid #ddd;
- box-shadow: 0 4px 10px rgba(0, 0, 0, 0.1);
- background-color: #fff;
+ border: 1px solid var(--color-border);
+ box-shadow: 0 4px 10px var(--color-shadow);
+ background-color: var(--color-bg-white);
border-radius: 4px;
overflow: hidden;
}
@@ -34,7 +34,7 @@
.PopoverBody.PopoverBody--tooltip {
color: white;
font-weight: bold;
- background-color: rgb(76, 71, 71);
+ background-color: var(--color-bg-black);
border: none;
pointer-events: none;
}
@@ -62,7 +62,7 @@
.PopoverHeader {
display: flex;
- border-bottom: 1px solid var(--border-color);
+ border-bottom: 1px solid var(--color-border);
min-width: 400px;
}
@@ -76,7 +76,7 @@
text-transform: uppercase;
font-size: 0.8em;
font-weight: 700;
- color: color(var(--base-grey) shade(30%));
+ color: var(--color-text-medium);
border-bottom: 2px solid transparent;
}
@@ -105,19 +105,19 @@
/* create a slightly larger arrow on the right for border purposes */
.PopoverHeader-item--withArrow:before {
right: -16px;
- border-left-color: #ddd;
+ border-left-color: var(--color-border);
}
/* create a smaller inset arrow on the right */
.PopoverHeader-item--withArrow:after {
right: -15px;
- border-left-color: #fff;
+ border-left-color: var(--color-bg-white);
}
/* create a slightly larger arrow on the top for border purposes */
.tether-element-attached-top .PopoverBody--withArrow:before {
top: -20px;
- border-bottom-color: #ddd;
+ border-bottom-color: var(--color-border);
}
.tether-element-attached-top .PopoverBody--tooltip:before {
border-bottom: none;
@@ -126,16 +126,16 @@
/* create a smaller inset arrow on the top */
.tether-element-attached-top .PopoverBody--withArrow:after {
top: -18px;
- border-bottom-color: #fff;
+ border-bottom-color: var(--color-bg-white);
}
.tether-element-attached-top .PopoverBody--tooltip:after {
- border-bottom-color: rgb(76, 71, 71);
+ border-bottom-color: var(--color-bg-black);
}
/* create a slightly larger arrow on the bottom for border purposes */
.tether-element-attached-bottom .PopoverBody--withArrow:before {
bottom: -20px;
- border-top-color: #ddd;
+ border-top-color: var(--color-border);
}
.tether-element-attached-bottom .PopoverBody--tooltip:before {
border-top: none;
@@ -144,10 +144,10 @@
/* create a smaller inset arrow on the bottom */
.tether-element-attached-bottom .PopoverBody--withArrow:after {
bottom: -18px;
- border-top-color: #fff;
+ border-top-color: var(--color-bg-white);
}
.tether-element-attached-bottom .PopoverBody--tooltip:after {
- border-top-color: rgb(76, 71, 71);
+ border-top-color: var(--color-bg-black);
}
/* if the tether element is attached right, move our arrows right */
diff --git a/frontend/src/metabase/components/Popover.jsx b/frontend/src/metabase/components/Popover.jsx
index d67fa8afa6a8ea4a6dffe581fa1252b542f8e162..2d87309b3cbe3615cd3d86764e35aad7764e01b9 100644
--- a/frontend/src/metabase/components/Popover.jsx
+++ b/frontend/src/metabase/components/Popover.jsx
@@ -108,9 +108,10 @@ export default class Popover extends Component {
if (this._popoverElement.parentNode) {
this._popoverElement.parentNode.removeChild(this._popoverElement);
}
- clearInterval(this._timer);
- delete this._popoverElement, this._timer;
+ delete this._popoverElement;
}, POPOVER_TRANSITION_LEAVE);
+ clearInterval(this._timer);
+ delete this._timer;
}
}
diff --git a/frontend/src/metabase/components/ProgressBar.jsx b/frontend/src/metabase/components/ProgressBar.jsx
index 613a93c5137424b0ceeafa01bca4bf3151594aa6..e59fb71796710172aff4dbd9858cd0e195a5a50c 100644
--- a/frontend/src/metabase/components/ProgressBar.jsx
+++ b/frontend/src/metabase/components/ProgressBar.jsx
@@ -2,7 +2,7 @@
import React, { Component } from "react";
import cxs from "cxs";
-import { normal } from "metabase/lib/colors";
+import colors from "metabase/lib/colors";
type Props = {
percentage: number,
@@ -15,7 +15,7 @@ export default class ProgressBar extends Component {
static defaultProps = {
animated: false,
- color: normal.blue,
+ color: colors["brand"],
};
render() {
@@ -48,7 +48,7 @@ export default class ProgressBar extends Component {
left: 0,
width: `${width / 4}%`,
height: "100%",
- backgroundColor: "rgba(0, 0, 0, 0.12)",
+ backgroundColor: colors["bg-black"],
animation: animated ? "progress-bar 1.5s linear infinite" : "none",
},
});
diff --git a/frontend/src/metabase/components/Sidebar.css b/frontend/src/metabase/components/Sidebar.css
index 1f0303641d7aa22cfc7058d155a27276897830fa..f24b2b89e5375b8cf726ca854a60aa15964de121 100644
--- a/frontend/src/metabase/components/Sidebar.css
+++ b/frontend/src/metabase/components/Sidebar.css
@@ -15,9 +15,9 @@
:local(.sidebar) {
composes: py2 from "style";
width: 345px;
- background-color: rgb(248, 252, 253);
- border-right: 1px solid rgb(223, 238, 245);
- color: #606e7b;
+ background-color: var(--color-bg-light);
+ border-right: 1px solid var(--color-border);
+ color: var(--color-text-medium);
}
:local(.sidebar) a {
@@ -39,7 +39,7 @@
composes: transition-color from "style";
composes: transition-background from "style";
font-size: 1em;
- color: #cfe4f5;
+ color: var(--color-text-light);
}
:local(.item) :local(.icon) {
@@ -57,8 +57,8 @@
:local(.sectionTitle.selected),
:local(.item):hover,
:local(.sectionTitle):hover {
- background-color: #e3f0f9;
- color: #2d86d4;
+ background-color: var(--color-bg-medium);
+ color: var(--color-brand);
}
:local(.divider) {
@@ -69,7 +69,7 @@
:local(.name) {
composes: ml2 text-bold from "style";
- color: #9caebe;
+ color: var(--color-text-medium);
text-overflow: ellipsis;
white-space: nowrap;
overflow-x: hidden;
@@ -77,7 +77,7 @@
:local(.item):hover :local(.name),
:local(.item.selected) :local(.name) {
- color: #2d86d4;
+ color: var(--color-brand);
}
:local(.icon) {
diff --git a/frontend/src/metabase/components/StepIndicators.jsx b/frontend/src/metabase/components/StepIndicators.jsx
index 993f4be37a65712ddeea1c7df200b94dfcfe0fbe..f705ef5886ebac73c6bd58717d5bbb732f80a30d 100644
--- a/frontend/src/metabase/components/StepIndicators.jsx
+++ b/frontend/src/metabase/components/StepIndicators.jsx
@@ -1,7 +1,7 @@
/* @flow */
import React from "react";
-import { normal } from "metabase/lib/colors";
+import colors from "metabase/lib/colors";
type Props = {
activeDotColor?: string,
@@ -12,7 +12,7 @@ type Props = {
};
const StepIndicators = ({
- activeDotColor = normal.blue,
+ activeDotColor = colors["brand"],
currentStep = 0,
dotSize = 8,
goToStep,
@@ -30,7 +30,7 @@ const StepIndicators = ({
marginLeft: 2,
marginRight: 2,
backgroundColor:
- index + 1 === currentStep ? activeDotColor : "#D8D8D8",
+ index + 1 === currentStep ? activeDotColor : colors["text-light"],
transition: "background 600ms ease-in",
}}
key={index}
diff --git a/frontend/src/metabase/components/TermWithDefinition.jsx b/frontend/src/metabase/components/TermWithDefinition.jsx
index 3c081499c434c51392c0602e4704634168fd4ddb..11ac2f2d9ee9a9f657b8862383b2598f1eca5f47 100644
--- a/frontend/src/metabase/components/TermWithDefinition.jsx
+++ b/frontend/src/metabase/components/TermWithDefinition.jsx
@@ -1,10 +1,11 @@
import React from "react";
import cxs from "cxs";
import Tooltip from "metabase/components/Tooltip";
+import colors from "metabase/lib/colors";
const termStyles = cxs({
textDecoration: "none",
- borderBottom: "1px dotted #DCE1E4",
+ borderBottom: `1px dotted ${colors["border"]}`,
});
export const TermWithDefinition = ({ children, definition, link }) => (
<Tooltip tooltip={definition}>
diff --git a/frontend/src/metabase/components/Toggle.css b/frontend/src/metabase/components/Toggle.css
index 8bcda78577d880ee322c591b509f8ba79bb5902d..c1f1274628eea49aa3dece82cfcf06659a461b43 100644
--- a/frontend/src/metabase/components/Toggle.css
+++ b/frontend/src/metabase/components/Toggle.css
@@ -1,13 +1,13 @@
:local(.toggle) {
position: relative;
display: inline-block;
- color: var(--brand-color);
+ color: var(--color-brand);
box-sizing: border-box;
width: 48px;
height: 24px;
border-radius: 99px;
- border: 1px solid #eaeaea;
- background-color: #f7f7f7;
+ border: 1px solid var(--color-border);
+ background-color: var(--color-bg-medium);
transition: all 0.3s;
}
@@ -23,8 +23,9 @@
position: absolute;
top: 1px;
left: 1px;
- background-color: #d9d9d9;
+ background-color: white;
transition: all 0.3s;
+ box-shadow: 2px 2px 6px var(--color-shadow);
}
:local(.toggle.selected):after {
diff --git a/frontend/src/metabase/components/Triggerable.jsx b/frontend/src/metabase/components/Triggerable.jsx
index 2d4b9342e179e783f45558a1bb18aaa0847b77ef..14ca1ff2d17b321c16c64fcb849a6b0552d2c4ad 100644
--- a/frontend/src/metabase/components/Triggerable.jsx
+++ b/frontend/src/metabase/components/Triggerable.jsx
@@ -107,6 +107,7 @@ export default ComposedComponent =>
triggerClasses,
triggerStyle,
triggerClassesOpen,
+ triggerClassesClose,
} = this.props;
const { isOpen } = this.state;
@@ -142,6 +143,7 @@ export default ComposedComponent =>
className={cx(
triggerClasses,
isOpen && triggerClassesOpen,
+ !isOpen && triggerClassesClose,
"no-decoration",
{
"cursor-default": this.props.disabled,
diff --git a/frontend/src/metabase/components/UserAvatar.jsx b/frontend/src/metabase/components/UserAvatar.jsx
index 22600d03ee3cdddc205ec8a9923df4196ac75947..78471a747d601c8377dcd6632ed12eaf9514e086 100644
--- a/frontend/src/metabase/components/UserAvatar.jsx
+++ b/frontend/src/metabase/components/UserAvatar.jsx
@@ -19,6 +19,7 @@ export default class UserAvatar extends Component {
static propTypes = {
background: PropTypes.string,
user: PropTypes.object.isRequired,
+ transparent: PropTypes.bool,
};
static defaultProps = {
@@ -51,7 +52,11 @@ export default class UserAvatar extends Component {
return (
<div
className={cx(classes)}
- style={{ ...this.styles, ...this.props.style }}
+ style={{
+ ...this.styles,
+ ...this.props.style,
+ ...(this.props.transparent ? { background: "transparent" } : {}),
+ }}
>
{this.userInitials()}
</div>
diff --git a/frontend/src/metabase/components/VirtualizedList.jsx b/frontend/src/metabase/components/VirtualizedList.jsx
index 44e48a07d6bcc089647c73e7cb414b3c66f57a3f..fa2928f3b6d2089cf02c2dcd79e33e1a8020ef61 100644
--- a/frontend/src/metabase/components/VirtualizedList.jsx
+++ b/frontend/src/metabase/components/VirtualizedList.jsx
@@ -6,9 +6,8 @@ const VirtualizedList = ({ items, rowHeight, renderItem }) => (
<AutoSizer>
{({ width }) => (
<WindowScroller>
- {({ height, isScrolling, registerChild, scrollTop }) => (
+ {({ height, isScrolling, scrollTop }) => (
<List
- ref={registerChild}
autoHeight
width={width}
height={Math.min(height, rowHeight * items.length)}
diff --git a/frontend/src/metabase/components/form/widgets/FormColorWidget.jsx b/frontend/src/metabase/components/form/widgets/FormColorWidget.jsx
index 91d93194dded04c016bdaa41a18120c6f8cd13bf..5c8cd379214dc97f11db7b7b3b5bdb69479755ab 100644
--- a/frontend/src/metabase/components/form/widgets/FormColorWidget.jsx
+++ b/frontend/src/metabase/components/form/widgets/FormColorWidget.jsx
@@ -3,9 +3,15 @@ import React from "react";
import ColorPicker from "metabase/components/ColorPicker";
import cx from "classnames";
-const FormColorWidget = ({ field, offset }) => (
+const FormColorWidget = ({ field, offset, initial }) => (
<div className={cx({ "Form-offset": offset })}>
- <ColorPicker {...field} />
+ <ColorPicker
+ {...field}
+ value={
+ // if the field has a value use that, otherwise use the initial
+ field.value || initial()
+ }
+ />
</div>
);
diff --git a/frontend/src/metabase/containers/CollectionPicker.jsx b/frontend/src/metabase/containers/CollectionPicker.jsx
index 4c4ea07d64a9d8ff169ef902c958425706065cf1..d8d330324decc76d68267d66c833cf8b95babf0e 100644
--- a/frontend/src/metabase/containers/CollectionPicker.jsx
+++ b/frontend/src/metabase/containers/CollectionPicker.jsx
@@ -8,7 +8,9 @@ import Breadcrumbs from "metabase/components/Breadcrumbs";
import { getExpandedCollectionsById } from "metabase/entities/collections";
-const COLLECTION_ICON_COLOR = "#DCE1E4";
+import colors from "metabase/lib/colors";
+
+const COLLECTION_ICON_COLOR = colors["text-light"];
const isRoot = collection => collection.id === "root" || collection.id == null;
@@ -90,7 +92,7 @@ export default class CollectionPicker extends React.Component {
!isRoot(collection) && (
<Icon
name="chevronright"
- className="p1 ml-auto circular text-grey-2 border-grey-2 bordered bg-white-hover cursor-pointer"
+ className="p1 ml-auto circular text-grey-2 bordered bg-white-hover cursor-pointer"
onClick={e => {
e.stopPropagation();
this.setState({ parentId: collection.id });
diff --git a/frontend/src/metabase/containers/EntitySearch.jsx b/frontend/src/metabase/containers/EntitySearch.jsx
index 968ba9d9357e94615df582dc74e0748942b3b987..781b783faa6626e11079faeabb4b430e081a1223 100644
--- a/frontend/src/metabase/containers/EntitySearch.jsx
+++ b/frontend/src/metabase/containers/EntitySearch.jsx
@@ -16,6 +16,8 @@ import { KEYCODE_DOWN, KEYCODE_ENTER, KEYCODE_UP } from "metabase/lib/keyboard";
import { LocationDescriptor } from "metabase/meta/types/index";
import { parseHashOptions, updateQueryString } from "metabase/lib/browser";
+import colors from "metabase/lib/colors";
+
const PAGE_SIZE = 10;
const SEARCH_GROUPINGS = [
@@ -448,7 +450,11 @@ export const SearchResultsGroup = ({
<div>
{groupName !== null && (
<div className="flex align-center bg-slate-almost-extra-light bordered mt3 px3 py2">
- <Icon className="mr1" style={{ color: "#BCC5CA" }} name={groupIcon} />
+ <Icon
+ className="mr1"
+ style={{ color: colors["text-light"] }}
+ name={groupIcon}
+ />
<h4>{groupName}</h4>
</div>
)}
diff --git a/frontend/src/metabase/containers/Overworld.jsx b/frontend/src/metabase/containers/Overworld.jsx
index 4ee7e733cf2806bb1f9d69d4b6c31b4522473f82..74eca11aecc53e904279a867de8486eea39fc3d3 100644
--- a/frontend/src/metabase/containers/Overworld.jsx
+++ b/frontend/src/metabase/containers/Overworld.jsx
@@ -1,4 +1,5 @@
import React from "react";
+import _ from "underscore";
import { Box, Flex } from "grid-styled";
import { connect } from "react-redux";
import { t } from "c-3po";
@@ -9,7 +10,7 @@ import { DatabaseListLoader } from "metabase/components/BrowseApp";
import ExplorePane from "metabase/components/ExplorePane";
import * as Urls from "metabase/lib/urls";
-import { normal } from "metabase/lib/colors";
+import colors, { normal } from "metabase/lib/colors";
import Card from "metabase/components/Card";
import { Grid, GridItem } from "metabase/components/Grid";
@@ -19,20 +20,45 @@ import Subhead from "metabase/components/Subhead";
import { getUser } from "metabase/home/selectors";
+import CollectionList from "metabase/components/CollectionList";
+
import MetabotLogo from "metabase/components/MetabotLogo";
import Greeting from "metabase/lib/greeting";
-const mapStateToProps = state => ({
- user: getUser(state),
-});
+import { entityListLoader } from "metabase/entities/containers/EntityListLoader";
+
+const PAGE_PADDING = [1, 2, 4];
//class Overworld extends Zelda
-@connect(mapStateToProps)
+@entityListLoader({
+ entityType: "search",
+ entityQuery: (state, props) => ({ collection: "root" }),
+ wrapped: true,
+})
+@connect((state, props) => {
+ // split out collections, pinned, and unpinned since bulk actions only apply to unpinned
+ const [collections, items] = _.partition(
+ props.list,
+ item => item.model === "collection",
+ );
+ const [pinned, unpinned] = _.partition(
+ items,
+ item => item.collection_position != null,
+ );
+ // sort the pinned items by collection_position
+ pinned.sort((a, b) => a.collection_position - b.collection_position);
+ return {
+ collections,
+ pinned,
+ unpinned,
+ user: getUser(state),
+ };
+})
class Overworld extends React.Component {
render() {
return (
- <Box px={4}>
- <Flex mt={3} mb={1} align="center">
+ <Box>
+ <Flex px={PAGE_PADDING} pt={3} pb={1} align="center">
<MetabotLogo />
<Box ml={2}>
<Subhead>{Greeting.sayHello(this.props.user.first_name)}</Subhead>
@@ -50,18 +76,25 @@ class Overworld extends React.Component {
<CandidateListLoader>
{({ candidates, sampleCandidates, isSample }) => {
return (
- <ExplorePane
- candidates={candidates}
- withMetabot={false}
- title=""
- gridColumns={1 / 3}
- asCards={true}
- description={
- isSample
- ? t`Once you connect your own data, I can show you some automatic explorations called x-rays. Here are some examples with sample data.`
- : t`I took a look at the data you just connected, and I have some explorations of interesting things I found. Hope you like them!`
- }
- />
+ <Box mx={PAGE_PADDING} mt={2}>
+ <Box mb={1}>
+ <h4>{t`Not sure where to start?`}</h4>
+ </Box>
+ <Card px={3} pb={1}>
+ <ExplorePane
+ candidates={candidates}
+ withMetabot={false}
+ title=""
+ gridColumns={1 / 3}
+ asCards={false}
+ description={
+ isSample
+ ? t`Once you connect your own data, I can show you some automatic explorations called x-rays. Here are some examples with sample data.`
+ : t`I took a look at the data you have connected, and I have some explorations of interesting things I found. Hope you like them!`
+ }
+ />
+ </Card>
+ </Box>
);
}}
</CandidateListLoader>
@@ -69,14 +102,14 @@ class Overworld extends React.Component {
}
return (
- <Box>
+ <Box px={PAGE_PADDING}>
<Box mt={3} mb={1}>
- <h4>{t`Pinned dashboards`}</h4>
+ <h4>{t`Start here`}</h4>
</Box>
- <Grid w={1 / 3}>
+ <Grid>
{pinnedDashboards.map(pin => {
return (
- <GridItem>
+ <GridItem w={[1, 1 / 2, 1 / 3]}>
<Link
to={Urls.dashboard(pin.id)}
hover={{ color: normal.blue }}
@@ -96,38 +129,49 @@ class Overworld extends React.Component {
</GridItem>
);
})}
- <GridItem>
- <Link
- to="/collection/root"
- color={normal.grey2}
- className="text-brand-hover"
- >
- <Flex p={4} align="center">
- <h3>See more items</h3>
- <Icon name="chevronright" size={14} ml={1} />
- </Flex>
- </Link>
- </GridItem>
</Grid>
</Box>
);
}}
</CollectionItemsLoader>
- <Box mt={4}>
+ <Box px={PAGE_PADDING} my={3}>
+ <Box mb={2}>
+ <h4>{t`Our analytics`}</h4>
+ </Box>
+ <Card p={[2, 3]}>
+ <CollectionList collections={this.props.collections} />
+ <Link
+ to="/collection/root"
+ color={normal.grey2}
+ className="text-brand-hover"
+ >
+ <Flex bg={colors["bg-light"]} p={2} mb={1} align="center">
+ <Box ml="auto" mr="auto">
+ <Flex align="center">
+ <h3>{t`Browse all items`}</h3>
+ <Icon name="chevronright" size={14} ml={1} />
+ </Flex>
+ </Box>
+ </Flex>
+ </Link>
+ </Card>
+ </Box>
+
+ <Box pt={2} px={PAGE_PADDING}>
<h4>{t`Our data`}</h4>
- <Box mt={2}>
+ <Box mt={2} mb={4}>
<DatabaseListLoader>
{({ databases }) => {
return (
- <Grid w={1 / 3}>
+ <Grid>
{databases.map(database => (
- <GridItem>
+ <GridItem w={[1, 1 / 3]}>
<Link
to={`browse/${database.id}`}
hover={{ color: normal.blue }}
>
- <Box p={3} bg="#F2F5F7">
+ <Box p={3} bg={colors["bg-medium"]}>
<Icon
name="database"
color={normal.green}
diff --git a/frontend/src/metabase/containers/UserCollectionList.jsx b/frontend/src/metabase/containers/UserCollectionList.jsx
index ba678d63c08d3239e45f2b6e22b67993c3fa270c..51ab222c6f494b2f8a1bd5e6f4edb99594c7e02d 100644
--- a/frontend/src/metabase/containers/UserCollectionList.jsx
+++ b/frontend/src/metabase/containers/UserCollectionList.jsx
@@ -3,6 +3,7 @@ import { Box, Flex } from "grid-styled";
import { t } from "c-3po";
import * as Urls from "metabase/lib/urls";
+import colors from "metabase/lib/colors";
import Card from "metabase/components/Card";
import Icon from "metabase/components/Icon";
@@ -18,12 +19,14 @@ const UserListLoader = ({ children, ...props }) => (
const UserCollectionList = () => (
<Box px={4}>
- <BrowserCrumbs
- crumbs={[
- { title: t`Saved items`, to: Urls.collection() },
- { title: t`Everyone else’s personal collections` },
- ]}
- />
+ <Box py={2}>
+ <BrowserCrumbs
+ crumbs={[
+ { title: t`Our analytics`, to: Urls.collection() },
+ { title: t`Everyone else’s personal collections` },
+ ]}
+ />
+ </Box>
<UserListLoader>
{({ list }) => {
return (
@@ -43,7 +46,7 @@ const UserCollectionList = () => (
<Icon
name="person"
mr={1}
- color="#93B3C9"
+ color={colors["text-medium"]}
size={22}
/>
<h2>{user.common_name}</h2>
diff --git a/frontend/src/metabase/containers/dnd/DropArea.jsx b/frontend/src/metabase/containers/dnd/DropArea.jsx
index a0cd8caaa0f24e87a4e6203e778ad7bd01bfc73a..3288f9874c3c92d5ce75b1aa82120abf2dd5b3af 100644
--- a/frontend/src/metabase/containers/dnd/DropArea.jsx
+++ b/frontend/src/metabase/containers/dnd/DropArea.jsx
@@ -5,7 +5,7 @@ import { normal } from "metabase/lib/colors";
const DropTargetBackgroundAndBorder = ({
highlighted,
hovered,
- noBorder = false,
+ noDrop = false,
margin = 0,
marginLeft = margin,
marginRight = margin,
@@ -25,7 +25,7 @@ const DropTargetBackgroundAndBorder = ({
zIndex: -1,
boxSizing: "border-box",
border: "2px solid transparent",
- borderColor: hovered & !noBorder ? normal.blue : "transparent",
+ borderColor: hovered & !noDrop ? normal.blue : "transparent",
}}
/>
);
diff --git a/frontend/src/metabase/containers/dnd/ItemsDragLayer.jsx b/frontend/src/metabase/containers/dnd/ItemsDragLayer.jsx
index a5fee5c8d5c6f50929b761d713ef02fa30e3bf0a..5a610618a64ea82546ddecd99e08949f1e2026a1 100644
--- a/frontend/src/metabase/containers/dnd/ItemsDragLayer.jsx
+++ b/frontend/src/metabase/containers/dnd/ItemsDragLayer.jsx
@@ -22,13 +22,15 @@ export default class ItemsDragLayer extends React.Component {
return null;
}
const items = selected.length > 0 ? selected : [item.item];
+ const x = currentOffset.x + window.scrollX;
+ const y = currentOffset.y + window.scrollY;
return (
<div
style={{
position: "absolute",
top: 0,
left: 0,
- transform: `translate(${currentOffset.x}px, ${currentOffset.y}px)`,
+ transform: `translate(${x}px, ${y}px)`,
pointerEvents: "none",
}}
>
diff --git a/frontend/src/metabase/containers/dnd/PinDropTarget.jsx b/frontend/src/metabase/containers/dnd/PinDropTarget.jsx
index 592433cc14796b47c1afa11a29aaf9f4a923ce95..e9cff8d2f93a940bcb0623e3a4a3f99cc9dbb2f6 100644
--- a/frontend/src/metabase/containers/dnd/PinDropTarget.jsx
+++ b/frontend/src/metabase/containers/dnd/PinDropTarget.jsx
@@ -7,7 +7,9 @@ const PinDropTarget = DropTarget(
PinnableDragTypes,
{
drop(props, monitor, component) {
- return { pinIndex: props.pinIndex };
+ if (!props.noDrop) {
+ return { pinIndex: props.pinIndex };
+ }
},
canDrop(props, monitor) {
const { item } = monitor.getItem();
diff --git a/frontend/src/metabase/containers/dnd/PinPositionDropTarget.jsx b/frontend/src/metabase/containers/dnd/PinPositionDropTarget.jsx
index 713156695d5507e0cf851955a1705ad049a6e614..ad3db20cbf394c180d51d36c78d8be16b9a73e4e 100644
--- a/frontend/src/metabase/containers/dnd/PinPositionDropTarget.jsx
+++ b/frontend/src/metabase/containers/dnd/PinPositionDropTarget.jsx
@@ -10,6 +10,20 @@ const PIN_DROP_TARGET_INDICATOR_WIDTH = 3;
PinnableDragTypes,
{
drop(props, monitor, component) {
+ const { item } = monitor.getItem();
+ // no need to move to the same position
+ if (item.collection_position == props.pinIndex) {
+ return;
+ }
+ // no already pinned, so add it at the dropped position
+ if (item.collection_position == null) {
+ return { pinIndex: props.pinIndex };
+ }
+ // being moved to a later position, which will cause everything to be shifted down, so subtract one
+ if (item.collection_position < props.pinIndex) {
+ return { pinIndex: props.pinIndex - 1 };
+ }
+ // being moved to an earlier position, no need to account for shift
return { pinIndex: props.pinIndex };
},
},
diff --git a/frontend/src/metabase/css/admin.css b/frontend/src/metabase/css/admin.css
index 620263bf0089ecf1b428a7e6e0214957c85a49f9..17226a704a11741afcee534fe08dad03bb0d3be1 100644
--- a/frontend/src/metabase/css/admin.css
+++ b/frontend/src/metabase/css/admin.css
@@ -1,24 +1,24 @@
:root {
- --admin-nav-bg-color: #8091ab;
- --admin-nav-bg-color-tint: #9aa7bc;
- --admin-nav-item-text-color: rgba(255, 255, 255, 0.63);
- --admin-nav-item-text-active-color: #fff;
+ --admin-nav-bg-color: var(--color-bg-dark);
+ --admin-nav-bg-color-tint: var(--color-bg-dark);
+ --admin-nav-item-text-color: color(var(--color-text-white) alpha(-37%));
+ --admin-nav-item-text-active-color: var(--color-text-white);
--page-header-padding: 2.375rem;
}
.AdminNav {
- background: var(--admin-nav-bg-color);
- color: #fff;
+ background: var(--color-bg-dark);
+ color: var(--color-text-white);
font-size: 0.85rem;
}
.AdminNav .NavItem {
- color: var(--admin-nav-item-text-color);
+ color: color(var(--color-text-white) alpha(-37%));
}
.AdminNav .NavItem:hover,
.AdminNav .NavItem.is--selected {
- color: var(--admin-nav-item-text-active-color);
+ color: var(--color-text-white);
}
/* TODO: this feels itchy. should refactor .NavItem.is--selected to be less cascadey */
@@ -29,27 +29,27 @@
.AdminNav .NavDropdown.open .NavDropdown-button,
.AdminNav .NavDropdown .NavDropdown-content-layer {
- background-color: var(--admin-nav-bg-color-tint);
+ background-color: var(--color-bg-dark);
}
.AdminNav .Dropdown-item:hover {
- background-color: var(--admin-nav-bg-color);
+ background-color: var(--color-bg-dark);
}
/* utility to get a simple common hover state for admin items */
.HoverItem:hover,
.AdminHoverItem:hover {
- background-color: #f3f8fd;
+ background-color: var(--color-bg-medium);
transition: background 0.2s linear;
}
.AdminNav .Dropdown-chevron {
- color: #fff;
+ color: var(--color-text-white);
}
.Actions {
- background-color: rgba(243, 243, 243, 0.46);
- border: 1px solid #e0e0e0;
+ background-color: color(var(--color-bg-light) alpha(-54%));
+ border: 1px solid var(--color-border);
padding: 2em;
}
@@ -74,13 +74,13 @@
}
.ContentTable thead {
- border-bottom: 1px solid #d8d8d8;
+ border-bottom: 1px solid var(--color-border);
}
.AdminBadge {
- background-color: #a989c5;
+ background-color: var(--color-accent2);
border-radius: 4px;
- color: #fff;
+ color: var(--color-text-white);
padding: 0.25em;
}
.PageHeader {
@@ -107,7 +107,7 @@
/* TODO: remove this and apply AdminHoverItem to content rows */
.ContentTable tbody tr:hover {
- background-color: rgba(74, 144, 226, 0.04);
+ background-color: color(var(--color-brand) alpha(-96%));
}
.ContentTable tr:hover .Table-actions {
@@ -116,11 +116,11 @@
}
.AdminList {
- background-color: #f9fbfc;
- border: var(--border-size) var(--border-style) var(--border-color);
+ background-color: var(--color-bg-light);
+ border: var(--border-size) var(--border-style) var(--color-border);
border-radius: var(--default-border-radius);
width: 266px;
- box-shadow: inset -1px -1px 3px rgba(0, 0, 0, 0.05);
+ box-shadow: inset -1px -1px 3px var(--color-shadow);
padding-bottom: 0.75em;
}
@@ -136,7 +136,7 @@
bottom: 0;
margin: auto;
margin-left: 1em;
- color: #c0c0c0;
+ color: var(--color-text-light);
}
.AdminList-search .AdminInput {
@@ -146,7 +146,7 @@
width: 100%;
border-top-left-radius: var(--default-border-radius);
border-top-right-radius: var(--default-border-radius);
- border-bottom-color: var(--border-color);
+ border-bottom-color: var(--color-border);
}
.AdminList-item {
@@ -157,37 +157,37 @@
}
.AdminList-item.selected {
- color: var(--brand-color);
+ color: var(--color-brand);
}
.AdminList-item.selected,
.AdminList-item:hover {
background-color: white;
- border-color: var(--border-color);
+ border-color: var(--color-border);
margin-left: -0.5em;
margin-right: -0.5em;
padding-left: 1.5em;
padding-right: 1.5em;
- box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
+ box-shadow: 0 1px 2px var(--color-shadow);
}
.AdminList-section {
margin-top: 1em;
padding: 0.5em 1em 0.5em 1em;
text-transform: uppercase;
- color: color(var(--base-grey) shade(20%));
+ color: var(--color-text-light);
font-weight: 700;
font-size: smaller;
}
.AdminInput {
- color: var(--default-font-color);
+ color: var(--color-text-dark);
padding: var(--padding-1);
- background-color: #fcfcfc;
+ background-color: var(--color-bg-light);
border: 1px solid transparent;
}
.AdminInput:focus {
- border-color: var(--brand-color);
+ border-color: var(--color-brand);
box-shadow: none;
outline: 0;
}
@@ -195,7 +195,7 @@
.AdminSelect {
display: inline-block;
padding: 0.6em;
- border: 1px solid var(--border-color);
+ border: 1px solid var(--color-border);
border-radius: var(--default-border-radius);
font-size: 14px;
font-weight: 700;
@@ -220,7 +220,7 @@
}
.MetadataTable-title {
- background-color: #fcfcfc;
+ background-color: var(--color-bg-white);
}
.TableEditor-table-name {
@@ -237,32 +237,32 @@
}
.TableEditor-field-visibility {
- /*color: var(--orange-color);*/
+ /*color: var(--color-warning);*/
}
.TableEditor-field-visibility .ColumnarSelector-row:hover {
- background-color: var(--brand-color) !important;
+ background-color: var(--color-brand) !important;
color: white !important;
}
.TableEditor-field-type {
- /*color: var(--purple-color);*/
+ /*color: var(--color-accent2);*/
}
.TableEditor-field-type .ColumnarSelector-row:hover {
- background-color: var(--brand-color) !important;
+ background-color: var(--color-brand) !important;
color: white !important;
}
.TableEditor-field-special-type,
.TableEditor-field-target {
margin-top: 3px;
- /*color: var(--green-color);*/
+ /*color: var(--color-accent1);*/
}
.TableEditor-field-special-type .ColumnarSelector-row:hover,
.TableEditor-field-target .ColumnarSelector-row:hover {
- background-color: var(--brand-color) !important;
+ background-color: var(--color-brand) !important;
color: white !important;
}
@@ -297,13 +297,13 @@
.AdminTable th {
text-transform: uppercase;
- color: color(var(--base-grey) shade(40%));
+ color: var(--color-text-medium);
padding: var(--padding-1);
font-weight: normal;
}
.AdminTable thead {
- border-bottom: var(--border-size) var(--border-style) var(--border-color);
+ border-bottom: var(--border-size) var(--border-style) var(--color-border);
}
.AdminTable tbody tr:first-child td {
diff --git a/frontend/src/metabase/css/card.css b/frontend/src/metabase/css/card.css
index efd7c5faa0340ab500a4d64105eb03b2d278631d..305d7219aa175be1746b735566efb4628cd080f9 100644
--- a/frontend/src/metabase/css/card.css
+++ b/frontend/src/metabase/css/card.css
@@ -1,6 +1,6 @@
:root {
- --card-border-color: #d9d9d9;
- --card-text-color: #777;
+ --card-border-color: var(--color-border);
+ --card-text-color: var(--color-text-medium);
--card-border-radius: 4px;
--card-scalar-text-lg: 2.4em;
@@ -13,16 +13,16 @@
.Card-footing {
font-size: 0.8rem;
- color: #999;
+ color: var(--color-text-medium);
}
.Card-title {
- color: #3f3a3a;
+ color: var(--color-text-dark);
font-size: 0.8em;
}
.Card-dataSource {
- color: #999;
+ color: var(--color-text-medium);
padding-top: 0.5em;
}
@@ -57,28 +57,28 @@
}
.CardSettings-group {
- border-bottom: 1px solid #ddd;
+ border-bottom: 1px solid var(--color-border);
}
.CardSettings-groupTitle {
padding: 0.5em;
- border-bottom: 1px solid #ddd;
+ border-bottom: 1px solid var(--color-border);
}
.CardSettings-content {
padding: 2em;
- background-color: #fafafa;
+ background-color: var(--color-bg-white);
}
.CardSettings {
- border-top: 1px solid #ddd;
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.12);
+ border-top: 1px solid var(--color-border);
+ box-shadow: inset 0 1px 1px var(--color-shadow);
}
.CardSettings-label {
font-size: 1.15em;
margin-left: 0.5em;
- color: #666;
+ color: var(--color-text-dark);
}
.CardSettings-colorBlock {
diff --git a/frontend/src/metabase/css/components/buttons.css b/frontend/src/metabase/css/components/buttons.css
index 08c9aeb65804be0bf331fdc6e8ce9bbf6a40d1ac..68b23a44e333e253fd30be4ba990237485d7447d 100644
--- a/frontend/src/metabase/css/components/buttons.css
+++ b/frontend/src/metabase/css/components/buttons.css
@@ -1,16 +1,5 @@
:root {
--default-button-border-radius: 4px;
- --default-button-border-color: #b9b9b9;
- --default-button-background-color: #fff;
-
- --primary-button-border-color: #509ee3;
- --primary-button-bg-color: #509ee3;
- --warning-button-border-color: #ef8c8c;
- --warning-button-bg-color: #ef8c8c;
- --danger-button-bg-color: #ef8c8c;
- --selected-button-bg-color: #f4f6f8;
-
- --success-button-color: var(--success-color);
}
.Button {
@@ -18,9 +7,9 @@
box-sizing: border-box;
text-decoration: none;
padding: 0.5rem 0.75rem;
- background: #fbfcfd;
- border: 1px solid #ddd;
- color: var(--default-font-color);
+ background: var(--color-bg-light);
+ border: 1px solid var(--color-border);
+ color: var(--color-text-dark);
cursor: pointer;
text-decoration: none;
font-weight: bold;
@@ -28,7 +17,7 @@
border-radius: var(--default-button-border-radius);
}
.Button:hover {
- color: var(--brand-color);
+ color: var(--color-brand);
}
@media screen and (--breakpoint-min-lg) {
@@ -67,27 +56,27 @@
}
.Button--primary {
- color: #fff;
- background: var(--primary-button-bg-color);
- border: 1px solid var(--primary-button-border-color);
+ color: var(--color-text-white);
+ background: var(--color-brand);
+ border: 1px solid var(--color-brand);
}
.Button--primary:hover {
- color: #fff;
- border-color: color(var(--primary-button-border-color) shade(10%));
- background-color: color(var(--primary-button-bg-color) shade(10%));
+ color: var(--color-text-white);
+ border-color: var(--color-brand);
+ background-color: var(--color-brand);
}
.Button--warning {
- color: #fff;
- background: var(--warning-button-bg-color);
- border: 1px solid var(--warning-button-border-color);
+ color: var(--color-text-white);
+ background: var(--color-error);
+ border: 1px solid var(--color-error);
}
.Button--warning:hover {
- color: #fff;
- border-color: color(var(--warning-button-border-color) shade(10%));
- background-color: color(var(--warning-button-bg-color) shade(10%));
+ color: var(--color-text-white);
+ border-color: var(--color-error);
+ background-color: var(--color-error);
}
.Button--cancel {
@@ -96,42 +85,42 @@
.Button--white {
background-color: white;
- color: color(var(--base-grey) shade(30%));
- border-color: color(var(--base-grey) shade(30%));
+ color: var(--color-text-medium);
+ border-color: var(--color-border);
}
.Button--purple {
color: white;
- background-color: #a989c5;
- border: 1px solid #a989c5;
+ background-color: var(--color-accent2);
+ border: 1px solid var(--color-accent2);
}
.Button--purple:hover {
color: white;
- background-color: #885ab1;
- border-color: #885ab1;
+ background-color: var(--color-accent2);
+ border-color: var(--color-accent2);
}
.Button--borderless {
border: none;
background: transparent;
- color: color(var(--base-grey) shade(40%));
+ color: var(--color-text-medium);
}
.Button--borderless:hover {
- color: color(var(--base-grey) shade(50%));
+ color: var(--color-text-medium);
}
.Button--onlyIcon {
border: none;
background: transparent;
- color: var(--default-font-color);
+ color: var(--color-text-dark);
padding: 0;
}
.Button-group {
display: inline-block;
border-radius: var(--default-button-border-radius);
- border: 1px solid var(--default-button-border-color);
+ border: 1px solid var(--color-border);
overflow: hidden;
clear: both;
}
@@ -147,8 +136,8 @@
}
.Button-group .Button--active {
- background-color: var(--success-color);
- color: #fff;
+ background-color: var(--color-success);
+ color: var(--color-text-white);
}
.Button-group .Button:first-child {
@@ -156,16 +145,16 @@
}
.Button-group--blue {
- border-color: rgb(194, 216, 242);
+ border-color: var(--color-border);
}
.Button-group--blue .Button {
- color: rgb(147, 155, 178);
+ color: var(--color-text-medium);
}
.Button-group--blue .Button--active {
- background-color: rgb(227, 238, 250);
- color: rgb(74, 144, 226);
+ background-color: var(--color-bg-medium);
+ color: var(--color-brand);
}
.Button-group--brand {
@@ -174,12 +163,12 @@
.Button-group--brand .Button {
border-color: white;
- color: var(--brand-color);
- background-color: #e5e5e5;
+ color: var(--color-brand);
+ background-color: var(--color-bg-medium);
}
.Button-group--brand .Button--active {
- background-color: var(--brand-color);
+ background-color: var(--color-brand);
color: white;
}
@@ -190,67 +179,31 @@
.Button--selected,
.Button--selected:hover {
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.12);
- background-color: var(--selected-button-bg-color);
+ box-shadow: inset 0 1px 1px var(--color-shadow);
+ background-color: var(--color-bg-light);
}
.Button--danger {
- background-color: var(--danger-button-bg-color);
- border-color: var(--danger-button-bg-color);
- color: #fff;
+ background-color: var(--color-error);
+ border-color: var(--color-error);
+ color: var(--color-text-white);
}
.Button--danger:hover {
color: white;
- background-color: color(var(--danger-button-bg-color) shade(10%));
- border-color: color(var(--danger-button-bg-color) shade(10%));
+ background-color: var(--color-error);
+ border-color: var(--color-error);
}
.Button--success {
- background-color: var(--success-button-color);
- border-color: var(--success-button-color);
- color: #fff;
+ background-color: var(--color-success);
+ border-color: var(--color-success);
+ color: var(--color-text-white);
}
.Button--success:hover {
- background-color: var(--green-saturated-color);
- border-color: var(--green-saturated-color);
- color: #fff;
-}
-
-/* toggle button */
-.Button-toggle {
- color: var(--grey-text-color);
- display: flex;
- line-height: 1;
- border: 1px solid #ddd;
- border-radius: 40px;
- width: 3rem;
- transition: background 0.2s linear 0.2s, border 0.2s linear 0.2s;
-}
-
-.Button-toggleIndicator {
- margin-left: 0;
- display: flex;
- align-items: center;
- justify-content: center;
- padding: 0.25rem;
- border: 1px solid #ddd;
- border-radius: 99px;
- box-shadow: 0 1px 3px rgba(0, 0, 0, 0.02);
- transition: margin 0.3s linear;
- background-color: #fff;
-}
-
-.Button-toggle.Button--toggled .Button-toggleIndicator {
- margin-left: 50%;
- transition: margin 0.3s linear;
-}
-
-.Button-toggle.Button--toggled {
- color: var(--brand-color);
- background-color: var(--brand-color);
- border-color: var(--brand-color);
- transition: background 0.2s linear 0.2s, border 0.2s linear 0.2s;
+ background-color: var(--color-success);
+ border-color: var(--color-success);
+ color: var(--color-text-white);
}
.Button--withIcon {
diff --git a/frontend/src/metabase/css/components/dropdown.css b/frontend/src/metabase/css/components/dropdown.css
index 826aa5dd1498115c0d4c38d2e409e0ca9645515d..4916a722f1935db67cd2d64fe1eacc96bbf97818 100644
--- a/frontend/src/metabase/css/components/dropdown.css
+++ b/frontend/src/metabase/css/components/dropdown.css
@@ -1,5 +1,5 @@
:root {
- --dropdown-border-color: rgba(0, 0, 0, 0.064);
+ --dropdown-border-color: color(var(--color-accent2) alpha(-94%));
}
.Dropdown {
@@ -14,10 +14,10 @@
top: 40px;
min-width: 200px;
margin-top: 18px;
- border: 1px solid var(--dropdown-border-color);
- background-color: #fff;
+ border: 1px solid color(var(--color-accent2) alpha(-94%));
+ background-color: var(--color-bg-white);
border-radius: 4px;
- box-shadow: 0 0 2px rgba(0, 0, 0, 0.12);
+ box-shadow: 0 0 2px var(--color-shadow);
background-clip: padding-box;
padding-top: 1em;
padding-bottom: 1em;
@@ -56,8 +56,8 @@
}
.Dropdown-item:hover {
- color: #fff;
- background-color: var(--brand-color);
+ color: var(--color-text-white);
+ background-color: var(--color-brand);
}
.Dropdown .Dropdown-item:hover {
diff --git a/frontend/src/metabase/css/components/form.css b/frontend/src/metabase/css/components/form.css
index 9881938d2bb7862cedf6d8941cb209184d8b81c1..d00305b95651c1ad354c7ef36e5fa47d320f6879 100644
--- a/frontend/src/metabase/css/components/form.css
+++ b/frontend/src/metabase/css/components/form.css
@@ -1,12 +1,12 @@
:root {
--form-padding: 1em;
- --form-input-placeholder-color: #c0c0c0;
+ --form-input-placeholder-color: var(--color-text-light);
--form-input-size: 1rem;
--form-input-size-medium: 1.25rem;
--form-input-size-large: 1.571rem;
- --form-label-color: #949494;
+ --form-label-color: var(--color-text-medium);
--form-offset: 2.4rem;
}
@@ -17,13 +17,13 @@
/* TODO: combine this and the scoped version */
.Form-label {
display: block;
- color: var(--form-label-color);
+ color: var(--color-text-medium);
font-size: 1.2rem;
}
.Form-field {
position: relative;
- color: #6c6c6c;
+ color: var(--color-text-medium);
margin-bottom: 1.5rem;
}
@@ -37,7 +37,7 @@
}
.Form-field.Form--fieldError {
- color: var(--error-color);
+ color: var(--color-error);
}
.Form-input {
@@ -92,7 +92,7 @@
left: 0;
width: 0.15em;
height: 3em;
- background-color: #ddd;
+ background-color: var(--color-bg-medium);
box-sizing: border-box;
opacity: 0;
transition: background-color 0.3s linear;
@@ -100,24 +100,24 @@
}
.Form-field.Form--fieldError .Form-charm {
- background-color: var(--error-color);
+ background-color: var(--color-error);
opacity: 1;
}
.Form-input:focus + .Form-charm {
- background-color: var(--brand-color);
+ background-color: var(--color-brand);
opacity: 1;
}
.Form-field:hover .Form-input {
- color: #ddd;
- background: rgba(0, 0, 0, 0.02);
+ color: var(--color-text-light);
+ background: color(var(--color-bg-black) alpha(-98%));
}
/* ewww */
.Form-field:hover .Form-input.ng-dirty {
- color: #222;
- background-color: #fff;
+ color: var(--color-text-dark);
+ background-color: var(--color-bg-white);
}
.Form-field:hover .Form-charm {
@@ -126,7 +126,7 @@
.Form-field:hover .Form-input:focus {
transition: color 0.3s linear;
- color: #444;
+ color: var(--color-text-dark);
background-color: transparent;
transition: background 0.3s linear;
}
@@ -144,13 +144,13 @@
width: 8px;
height: 8px;
border: 2px solid white;
- box-shadow: 0 0 0 2px var(--grey-3);
+ box-shadow: 0 0 0 2px var(--color-shadow);
border-radius: 8px;
}
.Form-radio:checked + label {
- box-shadow: 0 0 0 2px var(--brand-color);
- background-color: var(--brand-color);
+ box-shadow: 0 0 0 2px var(--color-shadow);
+ background-color: var(--color-brand);
}
/* TODO: replace instances of Form-group with Form-field */
@@ -174,44 +174,44 @@
.FormTitleSeparator {
position: relative;
- border-bottom: 1px solid #e8e8e8;
+ border-bottom: 1px solid var(--color-border);
}
::-webkit-input-placeholder {
/* WebKit browsers */
- color: var(--form-input-placeholder-color);
+ color: var(--color-text-light);
}
:-moz-placeholder {
/* Mozilla Firefox 4 to 18 */
- color: var(--form-input-placeholder-color);
+ color: var(--color-text-light);
opacity: 1;
}
::-moz-placeholder {
/* Mozilla Firefox 19+ */
- color: var(--form-input-placeholder-color);
+ color: var(--color-text-light);
opacity: 1;
}
:-ms-input-placeholder {
/* Internet Explorer 10+ */
- color: var(--form-input-placeholder-color);
+ color: var(--color-text-light);
}
.NewForm .Form-label {
text-transform: uppercase;
- color: color(var(--base-grey) shade(30%));
+ color: var(--color-text-medium);
margin-bottom: 0.5em;
}
.NewForm .Form-input {
font-size: 16px;
- color: var(--default-font-color);
+ color: var(--color-text-dark);
padding: 0.5em;
- background-color: #fcfcfc;
- border: 1px solid #eaeaea;
+ background-color: var(--color-bg-white);
+ border: 1px solid var(--color-border);
border-radius: 4px;
}
.NewForm .Form-input:focus {
- border-color: var(--brand-color);
+ border-color: var(--color-brand);
box-shadow: none;
outline: 0;
}
diff --git a/frontend/src/metabase/css/components/header.css b/frontend/src/metabase/css/components/header.css
index ed096260547d6e12a19d90133152a4cf2ad0612e..d974b98b75c0dfe0ff935b50fec288d1dbd6503e 100644
--- a/frontend/src/metabase/css/components/header.css
+++ b/frontend/src/metabase/css/components/header.css
@@ -4,19 +4,19 @@
.Header-title-name {
font-size: 1.24em;
- color: var(--grey-text-color);
+ color: var(--color-text-dark);
}
.Header-attribution {
display: none; /* disabled */
- color: #adadad;
+ color: var(--color-text-medium);
margin-bottom: 0.5em;
}
.Header-buttonSection {
padding-right: 1em;
margin-right: 1em;
- border-right: 1px solid rgba(0, 0, 0, 0.2);
+ border-right: 1px solid color(var(--color-accent2) alpha(-80%));
}
.Header-buttonSection:last-child {
@@ -34,11 +34,24 @@
}
.EditHeader {
- background-color: #6cafed;
+ background-color: color(var(--color-bg-white) alpha(-85%));
+ position: relative;
}
-.EditHeader.EditHeader--admin {
- background-color: var(--admin-nav-bg-color-tint);
+/* a bit of a hack to fade out the edit header */
+.EditHeader:after {
+ content: "";
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ z-index: -1;
+ background-color: var(--color-brand);
+}
+
+.EditHeader.EditHeader--admin:after {
+ background-color: var(--color-bg-dark);
}
.EditHeader-title {
@@ -47,7 +60,7 @@
}
.EditHeader-subtitle {
- color: rgba(255, 255, 255, 0.5);
+ color: color(var(--color-text-white) alpha(-50%));
}
.EditHeader .Button {
@@ -55,25 +68,25 @@
border: none;
font-size: 1em;
text-transform: capitalize;
- background-color: rgba(255, 255, 255, 0.1);
+ background-color: color(var(--color-bg-white) alpha(-90%));
margin-left: 0.75em;
}
.EditHeader .Button--primary {
background-color: white;
- color: var(--brand-color);
+ color: var(--color-brand);
}
.EditHeader.EditHeader--admin .Button--primary {
background-color: white;
- color: var(--70-percent-black);
+ color: var(--color-text-dark);
}
.EditHeader .Button:hover {
color: white;
- background-color: var(--brand-color);
+ background-color: var(--color-brand);
}
.EditHeader.EditHeader--admin .Button:hover {
- background-color: var(--admin-nav-bg-color);
+ background-color: var(--color-bg-dark);
}
diff --git a/frontend/src/metabase/css/components/icons.css b/frontend/src/metabase/css/components/icons.css
index 77b7a4419f24e226dd160364264cab2263f29ab8..cf8a15f86dee8ef41cd48588e6f13664da861536 100644
--- a/frontend/src/metabase/css/components/icons.css
+++ b/frontend/src/metabase/css/components/icons.css
@@ -1,5 +1,5 @@
:root {
- --icon-color: #bfc4d1;
+ --icon-color: var(--color-text-light);
}
.IconWrapper {
@@ -13,19 +13,19 @@
@keyframes icon-pulse {
0% {
- box-shadow: 0 0 5px rgba(80, 158, 227, 1);
+ box-shadow: 0 0 5px var(--color-shadow);
}
50% {
- box-shadow: 0 0 5px rgba(80, 158, 227, 0.25);
+ box-shadow: 0 0 5px var(--color-shadow);
}
100% {
- box-shadow: 0 0 5px rgba(80, 158, 227, 1);
+ box-shadow: 0 0 5px var(--color-shadow);
}
}
.Icon--pulse {
border-radius: 99px;
- box-shadow: 0 0 5px #509ee3;
+ box-shadow: 0 0 5px var(--color-shadow);
padding: 0.75em;
animation-name: icon-pulse;
animation-duration: 2s;
diff --git a/frontend/src/metabase/css/components/list.css b/frontend/src/metabase/css/components/list.css
index 32fb3866fd98bffd67a8e3b991726762c4fe51a6..fc63ab720ffed0c3d1a6dafa330eed96a9f2aeb9 100644
--- a/frontend/src/metabase/css/components/list.css
+++ b/frontend/src/metabase/css/components/list.css
@@ -4,15 +4,15 @@
.List-section-header .Icon,
.List-item .List-item-arrow .Icon {
- color: var(--default-font-color);
+ color: var(--color-text-dark);
}
.List-item .Icon {
- color: var(--slate-light-color);
+ color: var(--color-text-light);
}
.List-section-header {
- color: var(--default-font-color);
+ color: var(--color-text-dark);
border: 2px solid transparent; /* so that spacing matches .List-item */
}
@@ -26,7 +26,7 @@
}
.List-section--expanded .List-section-header .List-section-title {
- color: var(--default-font-color);
+ color: var(--color-text-dark);
}
.List-section-title {
@@ -42,18 +42,18 @@
}
.List-item--disabled .List-item-title {
- color: var(--grey-3);
+ color: var(--color-text-medium);
}
.List-item:not(.List-item--disabled):hover,
.List-item--selected {
background-color: currentColor;
- border-color: rgba(0, 0, 0, 0.2);
+ border-color: color(var(--color-accent2) alpha(-80%));
/*color: white;*/
}
.List-item-title {
- color: var(--default-font-color);
+ color: var(--color-text-dark);
}
.List-item:not(.List-item--disabled):hover .List-item-title,
diff --git a/frontend/src/metabase/css/components/modal.css b/frontend/src/metabase/css/components/modal.css
index a2b4898c199828b0938a210b2a218ad02b8a8aab..c99fe5334c950dc0c357c3a62ef65548ae0e857e 100644
--- a/frontend/src/metabase/css/components/modal.css
+++ b/frontend/src/metabase/css/components/modal.css
@@ -1,6 +1,6 @@
:root {
- --modal-background-color: rgba(46, 53, 59, 0.6);
- --modal-background-color-transition: rgba(46, 53, 59, 0.01);
+ --modal-background-color: color(var(--color-bg-black) alpha(-40%));
+ --modal-background-color-transition: color(var(--color-bg-black) alpha(-99%));
}
.ModalContainer {
@@ -10,7 +10,7 @@
.Modal {
margin: auto;
width: 640px;
- box-shadow: 0 0 6px rgba(0, 0, 0, 0.12);
+ box-shadow: 0 0 6px var(--color-shadow);
max-height: 90%;
overflow-y: auto;
}
@@ -48,7 +48,7 @@
}
.Modal-backdrop {
- background-color: var(--modal-background-color);
+ background-color: color(var(--color-bg-black) alpha(-40%));
}
/* TRANSITIONS */
@@ -58,21 +58,21 @@
.Modal-backdrop.Modal-appear,
.Modal-backdrop.Modal-enter {
transition: background-color 200ms ease-in-out;
- background-color: var(--modal-background-color-transition);
+ background-color: color(var(--color-bg-black) alpha(-99%));
}
.Modal-backdrop.Modal-appear-active,
.Modal-backdrop.Modal-enter-active {
- background-color: var(--modal-background-color);
+ background-color: color(var(--color-bg-black) alpha(-40%));
}
.Modal-backdrop.Modal-leave {
transition: background-color 200ms ease-in-out 100ms;
- background-color: var(--modal-background-color);
+ background-color: color(var(--color-bg-black) alpha(-40%));
}
.Modal-backdrop.Modal-leave-active {
- background-color: var(--modal-background-color-transition);
+ background-color: color(var(--color-bg-black) alpha(-99%));
}
/* modal */
diff --git a/frontend/src/metabase/css/components/select.css b/frontend/src/metabase/css/components/select.css
index bc2fbc53446b5442db2beb47b215f2442dcfbbac..d24d32c293941fab75783419cf6e61c5f7cbc05d 100644
--- a/frontend/src/metabase/css/components/select.css
+++ b/frontend/src/metabase/css/components/select.css
@@ -1,15 +1,15 @@
:root {
- --select-arrow-bg-color: #cacaca;
- --select-border-color: #d9d9d9;
- --select-bg-color: #fff;
- --select-text-color: #777;
+ --select-arrow-bg-color: var(--color-bg-medium);
+ --select-border-color: var(--color-border);
+ --select-bg-color: var(--color-bg-white);
+ --select-text-color: var(--color-text-medium);
--select-border-radius: 4px;
}
.Select {
position: relative;
display: inline-block;
- color: var(--select-text-color);
+ color: var(--color-text-medium);
}
/* custom arrows */
@@ -29,7 +29,7 @@
margin-top: -0.25rem;
border-left: 0.3rem solid transparent;
border-right: 0.3rem solid transparent;
- border-bottom: 0.3rem solid var(--select-arrow-bg-color);
+ border-bottom: 0.3rem solid var(--color-border);
}
/* arrow pointing down */
@@ -37,7 +37,7 @@
margin-top: 0.2rem;
border-left: 0.3rem solid transparent;
border-right: 0.3rem solid transparent;
- border-top: 0.3rem solid var(--select-arrow-bg-color);
+ border-top: 0.3rem solid var(--color-border);
}
.Select select {
@@ -46,40 +46,40 @@
padding: 1rem 3rem 1rem 1rem;
font-size: 0.8em;
line-height: 1;
- color: var(--select-text-color);
+ color: var(--color-text-medium);
- border: 1px solid var(--select-border-color);
- background: var(--select-bg-color);
+ border: 1px solid var(--color-border);
+ background: var(--color-bg-white);
border-radius: var(--select-border-radius);
-webkit-appearance: none;
-moz-appearance: none;
- box-shadow: 0 1px 2px rgba(0, 0, 0, 0.12);
+ box-shadow: 0 1px 2px var(--color-shadow);
}
.Select--blue select {
- color: rgb(78, 146, 223);
- border-color: rgb(195, 216, 241);
- background-color: rgb(227, 238, 249);
+ color: var(--color-brand);
+ border-color: var(--color-border);
+ background-color: var(--color-bg-medium);
}
.Select--blue:after {
- border-top: 0.3rem solid rgb(78, 146, 223);
+ border-top: 0.3rem solid var(--color-brand);
}
.Select--blue:before {
- border-bottom: 0.3rem solid rgb(78, 146, 223);
+ border-bottom: 0.3rem solid var(--color-brand);
}
.Select--purple select {
- color: rgb(168, 138, 195);
- border-color: rgb(203, 186, 219);
- background-color: rgb(231, 223, 239);
+ color: var(--color-accent2);
+ border-color: var(--color-accent2);
+ background-color: var(--color-bg-medium);
}
.Select--purple:after {
- border-top: 0.3rem solid rgb(168, 138, 195);
+ border-top: 0.3rem solid var(--color-accent2);
}
.Select--purple:before {
- border-bottom: 0.3rem solid rgb(168, 138, 195);
+ border-bottom: 0.3rem solid var(--color-accent2);
}
.Select--small select {
diff --git a/frontend/src/metabase/css/components/table.css b/frontend/src/metabase/css/components/table.css
index d995ae0b45f6d77b6f564838ca78c9368166ff59..98ba247fcac025f306ee5342291cc9f489c28a76 100644
--- a/frontend/src/metabase/css/components/table.css
+++ b/frontend/src/metabase/css/components/table.css
@@ -1,6 +1,6 @@
:root {
- --table-border-color: rgba(213, 213, 213, 0.3);
- --table-alt-bg-color: rgba(0, 0, 0, 0.02);
+ --table-border-color: color(var(--color-border) alpha(-70%));
+ --table-alt-bg-color: color(var(--color-bg-black) alpha(-98%));
--entity-image-small-size: 24px;
--entity-image-large-size: 64px;
@@ -29,21 +29,21 @@ th {
}
.Table--bordered {
- border: 1px solid var(--table-border-color);
+ border: 1px solid color(var(--color-border) alpha(-70%));
}
.Table tr {
- border-bottom: 1px solid var(--table-border-color);
+ border-bottom: 1px solid color(var(--color-border) alpha(-70%));
}
.Table tr:nth-child(even) {
- background-color: var(--table-alt-bg-color);
+ background-color: color(var(--color-bg-black) alpha(-98%));
}
.Table th,
.Table td {
padding: 1em;
- border: 1px solid var(--table-border-color);
+ border: 1px solid color(var(--color-border) alpha(-70%));
}
.ComparisonTable {
@@ -53,5 +53,5 @@ th {
.ComparisonTable th,
.ComparisonTable td {
- border-bottom: 1px solid var(--border-color);
+ border-bottom: 1px solid var(--color-border);
}
diff --git a/frontend/src/metabase/css/core/arrow.css b/frontend/src/metabase/css/core/arrow.css
index f39e075313474487e7ceb1f68ce9d7ea78104857..a4f94e5dfeddee79e05a92d199e747a093926e0a 100644
--- a/frontend/src/metabase/css/core/arrow.css
+++ b/frontend/src/metabase/css/core/arrow.css
@@ -20,13 +20,13 @@
/* create a slightly larger arrow on the right for border purposes */
.arrow-right:before {
right: -20px;
- border-left-color: #ddd;
+ border-left-color: var(--color-border);
}
/* create a smaller inset arrow on the right */
.arrow-right:after {
right: -19px;
- border-left-color: #fff;
+ border-left-color: var(--color-white);
}
/* move our arrows to the center */
diff --git a/frontend/src/metabase/css/core/base.css b/frontend/src/metabase/css/core/base.css
index 0b08e103c2bd19e26cefc42a42879c7613bf2d87..e6dc72edd37d5d55f386631376d5f905faee68b6 100644
--- a/frontend/src/metabase/css/core/base.css
+++ b/frontend/src/metabase/css/core/base.css
@@ -1,8 +1,8 @@
:root {
--default-font-family: "Lato";
--default-font-size: 0.875em;
- --default-font-color: #2e353b;
- --default-bg-color: #f9fbfc;
+ --default-font-color: var(--color-text-dark);
+ --default-bg-color: var(--color-bg-light);
}
html {
@@ -15,12 +15,12 @@ body {
font-size: var(--default-font-size);
font-weight: 400;
font-style: normal;
- color: var(--default-font-color);
+ color: var(--color-text-dark);
margin: 0;
height: 100%; /* ensure the entire page will fill the window */
display: flex;
flex-direction: column;
- background-color: var(--default-bg-color);
+ background-color: var(--color-bg-light);
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
@@ -76,7 +76,7 @@ textarea {
}
.MB-lightBG {
- background-color: #f9fbfc;
+ background-color: var(--color-bg-light);
}
.circle {
diff --git a/frontend/src/metabase/css/core/bordered.css b/frontend/src/metabase/css/core/bordered.css
index 4cc9ca9b4fa6876be8d851e9162d9b85db6e6c91..674e7a034985306dcbd48d065e14b04dac3f7fbe 100644
--- a/frontend/src/metabase/css/core/bordered.css
+++ b/frontend/src/metabase/css/core/bordered.css
@@ -2,17 +2,17 @@
--border-size: 1px;
--border-size-med: 2px;
--border-style: solid;
- --border-color: #f0f0f0;
+ --border-color: var(--color-border);
}
.bordered,
:local(.bordered) {
- border: var(--border-size) var(--border-style) var(--border-color);
+ border: var(--border-size) var(--border-style) var(--color-border);
}
.border-bottom,
:local(.border-bottom) {
- border-bottom: var(--border-size) var(--border-style) var(--border-color);
+ border-bottom: var(--border-size) var(--border-style) var(--color-border);
}
/* ensure that a border-top item inside of a bordred element won't double up */
@@ -22,7 +22,7 @@
.border-top,
:local(.border-top) {
- border-top: var(--border-size) var(--border-style) var(--border-color);
+ border-top: var(--border-size) var(--border-style) var(--color-border);
}
/* ensure that a border-top item inside of a bordred element won't double up */
@@ -31,7 +31,7 @@
}
.border-column-divider {
- border-right: var(--border-size) var(--border-style) var(--border-color);
+ border-right: var(--border-size) var(--border-style) var(--color-border);
}
.border-column-divider:last-child {
@@ -39,7 +39,7 @@
}
.border-row-divider {
- border-bottom: var(--border-size) var(--border-style) var(--border-color);
+ border-bottom: var(--border-size) var(--border-style) var(--color-border);
}
.border-row-divider:last-child {
@@ -47,53 +47,42 @@
}
.border-right {
- border-right: var(--border-size) var(--border-style) var(--border-color);
+ border-right: var(--border-size) var(--border-style) var(--color-border);
}
.border-left {
- border-left: var(--border-size) var(--border-style) var(--border-color);
+ border-left: var(--border-size) var(--border-style) var(--color-border);
}
.border-light {
- border-color: rgba(255, 255, 255, 0.2) !important;
+ border-color: color(var(--color-border) alpha(-80%)) !important;
}
.border-dark,
.border-dark-hover:hover {
- border-color: rgba(0, 0, 0, 0.2) !important;
-}
-
-.border-grey-1 {
- border-color: var(--grey-1) !important;
-}
-.border-grey-2 {
- border-color: var(--grey-2) !important;
-}
-
-.border-green {
- border-color: var(--green-color) !important;
+ border-color: color(var(--color-accent2) alpha(-80%)) !important;
}
.border-purple {
- border-color: var(--purple-color) !important;
+ border-color: var(--color-accent2) !important;
}
.border-error,
:local(.border-error) {
- border-color: var(--error-color) !important;
+ border-color: var(--color-error) !important;
}
.border-gold {
- border-color: var(--gold-color) !important;
+ border-color: var(--color-warning) !important;
}
.border-success {
- border-color: var(--success-color) !important;
+ border-color: var(--color-success) !important;
}
.border-brand,
:local(.border-brand) {
- border-color: var(--brand-color) !important;
+ border-color: var(--color-brand) !important;
}
.border-transparent {
@@ -101,11 +90,11 @@
}
.border-brand-hover:hover {
- border-color: var(--brand-color);
+ border-color: var(--color-brand);
}
.border-hover:hover {
- border-color: color(var(--border-color) shade(20%));
+ border-color: var(--color-border);
}
/* BORDERLESS IS THE DEFAULT */
diff --git a/frontend/src/metabase/css/core/colors.css b/frontend/src/metabase/css/core/colors.css
index 0aefc04656b8f2ef91b58b6f605f21a9cb47be96..2cb4a7fc5b72660fb33063f477b5cd9d92e8acbf 100644
--- a/frontend/src/metabase/css/core/colors.css
+++ b/frontend/src/metabase/css/core/colors.css
@@ -1,52 +1,83 @@
+/* NOTE: DO NOT ADD COLORS WITHOUT EXTREMELY GOOD REASON AND DESIGN REVIEW
+ * NOTE: KEEP SYNCRONIZED WITH COLORS.JS
+ */
:root {
- --brand-color: #509ee3;
- --brand-light-color: #cde3f8;
- --brand-saturated-color: #2d86d4;
-
- --base-grey: #f8f9fa;
- --grey-5percent: color(var(--base-grey) shade(5%));
- --grey-1: color(var(--base-grey) shade(10%));
- --grey-2: color(var(--base-grey) shade(20%));
- --grey-3: color(var(--base-grey) shade(30%));
- --grey-4: color(var(--base-grey) shade(40%));
- --grey-5: color(var(--base-grey) shade(50%));
-
- --grey-text-color: #797979;
- --alt-color: #f5f7f9;
- --alt-bg-color: #f4f6f8;
-
- --success-color: #9cc177;
- --headsup-color: #f5a623;
-
- --gold-color: #f9d45c;
- --orange-color: #f9a354;
- --purple-color: #a989c5;
- --green-color: #9cc177;
- --green-saturated-color: #90bd64;
- --dark-color: #4c545b;
- --slate-color: #9ba5b1;
- --slate-light-color: #dfe8ea;
- --slate-almost-extra-light-color: #edf2f5;
- --slate-extra-light-color: #f9fbfc;
-
- --error-color: #e35050;
-
- /* type colors */
- --metric-color: #9cc177;
- --segment-color: #7172ad;
- --pulse-color: #f9d45c;
- --dashboard-color: #509ee3;
- --data-color: "#9cc177";
- --question-color: #93b3c9;
-}
+ --color-brand: #509ee3;
+ --color-accent1: #9cc177;
+ --color-accent2: #a989c5;
+ --color-accent3: #ef8c8c;
+ --color-accent4: #f9d45c;
+ --color-accent5: #f1b556;
+ --color-accent6: #a6e7f3;
+ --color-accent7: #7172ad;
+ --color-white: #ffffff;
+ --color-black: #2e353b;
+ --color-success: #84bb4c;
+ --color-error: #ed6e6e;
+ --color-warning: #f9cf48;
+ --color-text-dark: #2e353b;
+ --color-text-medium: #74838f;
+ --color-text-light: #c7cfd4;
+ --color-text-white: #ffffff;
+ --color-bg-black: #2e353b;
+ --color-bg-dark: #93a1ab;
+ --color-bg-medium: #edf2f5;
+ --color-bg-light: #f9fbfc;
+ --color-bg-white: #ffffff;
+ --color-shadow: rgba(0, 0, 0, 0.08);
+ --color-border: #d7dbde;
+}
+
+/* NOTE: DEPRECATED, replaced with colors above
+:root {
+ --brand-color: var(--color-brand);
+ --brand-light-color: var(--color-text-light);
+ --brand-saturated-color: var(--color-brand);
+
+ --base-grey: var(--color-bg-light);
+ --grey-5percent: var(--color-bg-medium);
+ --grey-1: var(--color-text-light);
+ --grey-2: var(--color-text-light);
+ --grey-3: var(--color-text-medium);
+ --grey-4: var(--color-text-medium);
+ --grey-5: var(--color-text-medium);
+
+ --grey-text-color: var(--color-text-medium);
+ --alt-color: var(--color-bg-light);
+ --alt-bg-color: var(--color-bg-light);
+
+ --success-color: var(--color-accent1);
+ --headsup-color: var(--color-warning);
+
+ --gold-color: var(--color-accent4);
+ --orange-color: var(--color-warning);
+ --purple-color: var(--color-accent2);
+ --green-color: var(--color-accent1);
+ --green-saturated-color: var(--color-accent1);
+ --dark-color: var(--color-text-dark);
+ --slate-color: var(--color-text-medium);
+ --slate-light-color: var(--color-text-light);
+ --slate-almost-extra-light-color: var(--color-bg-medium);
+ --slate-extra-light-color: var(--color-bg-light);
+
+ --error-color: var(--color-error);
+
+ --metric-color: var(--color-accent1);
+ --segment-color: var(--color-accent2);
+ --pulse-color: var(--color-accent4);
+ --dashboard-color: var(--color-brand);
+ --data-color: var(--color-accent1);
+ --question-color: var(--color-text-medium);
+}
+*/
.text-default,
:local(.text-default) {
- color: var(--default-font-color);
+ color: var(--color-text-dark);
}
.text-default-hover:hover {
- color: var(--default-font-color);
+ color: var(--color-text-dark);
}
/* brand */
@@ -54,40 +85,40 @@
:local(.text-brand),
.text-brand-hover:hover,
:local(.text-brand-hover):hover {
- color: var(--brand-color);
+ color: var(--color-brand);
}
.text-brand-darken,
.text-brand-darken-hover:hover {
- color: color(var(--brand-color) shade(20%));
+ color: var(--color-brand);
}
.text-brand-light,
:local(.text-brand-light),
.text-brand-light-hover:hover,
:local(.text-brand-light-hover):hover {
- color: var(--brand-light-color);
+ color: var(--color-text-light);
}
.bg-brand,
.bg-brand-hover:hover,
.bg-brand-active:active {
- background-color: var(--brand-color);
+ background-color: var(--color-brand);
}
@media screen and (--breakpoint-min-md) {
.md-bg-brand {
- background-color: var(--brand-color) !important;
+ background-color: var(--color-brand) !important;
}
}
/* success */
.text-success {
- color: var(--success-color);
+ color: var(--color-accent1);
}
.bg-success {
- background-color: var(--success-color);
+ background-color: var(--color-accent1);
}
/* error */
@@ -95,191 +126,191 @@
.text-error,
:local(.text-error),
.text-error-hover:hover {
- color: var(--error-color);
+ color: var(--color-error);
}
.bg-error,
.bg-error-hover:hover {
- background-color: var(--error-color);
+ background-color: var(--color-error);
}
.bg-error-input {
- background-color: #fce8e8;
+ background-color: var(--color-bg-white);
}
/* favorite */
.text-gold,
.text-gold-hover:hover {
- color: var(--gold-color);
+ color: var(--color-accent4);
}
.text-purple,
.text-purple-hover:hover {
- color: var(--purple-color);
+ color: var(--color-accent2);
}
.text-green,
.text-green-hover:hover {
- color: var(--green-color);
+ color: var(--color-accent1);
}
.text-green-saturated,
.text-green-saturated-hover:hover {
- color: var(--green-saturated-color);
+ color: var(--color-accent1);
}
.text-orange,
.text-orange-hover:hover {
- color: var(--orange-color);
+ color: var(--color-warning);
}
.text-slate {
- color: var(--slate-color);
+ color: var(--color-text-medium);
}
.text-slate-light {
- color: var(--slate-light-color);
+ color: var(--color-text-light);
}
.text-slate-extra-light {
- background-color: var(--slate-extra-light-color);
+ background-color: var(--color-bg-light);
}
.bg-gold {
- background-color: var(--gold-color);
+ background-color: var(--color-accent4);
}
.bg-purple,
.bg-purple-hover:hover {
- background-color: var(--purple-color);
+ background-color: var(--color-accent2);
}
.bg-green {
- background-color: var(--green-color);
+ background-color: var(--color-accent1);
}
.bg-green-saturated,
.bg-green-saturated-hover:hover {
- background-color: var(--green-saturated-color);
+ background-color: var(--color-accent1);
}
/* alt */
.bg-alt,
.bg-alt-hover:hover {
- background-color: var(--alt-color);
+ background-color: var(--color-bg-light);
}
/* grey */
.text-grey-1,
:local(.text-grey-1),
.text-grey-1-hover:hover {
- color: var(--grey-1);
+ color: var(--color-text-light);
}
.text-grey-2,
:local(.text-grey-2),
.text-grey-2-hover:hover {
- color: var(--grey-2);
+ color: var(--color-text-light);
}
.text-grey-3,
:local(.text-grey-3),
.text-grey-3-hover:hover {
- color: var(--grey-3);
+ color: var(--color-text-medium);
}
.text-grey-4,
.text-grey-4-hover:hover {
- color: var(--grey-4);
+ color: var(--color-text-medium);
}
.text-grey-5,
.text-grey-5-hover:hover {
- color: var(--grey-5);
+ color: var(--color-text-medium);
}
.bg-grey-0,
.bg-grey-0-hover:hover {
- background-color: var(--base-grey);
+ background-color: var(--color-bg-light);
}
.bg-grey-05 {
- background-color: var(--grey-5percent);
+ background-color: var(--color-bg-medium);
}
.bg-grey-1 {
- background-color: var(--grey-1);
+ background-color: var(--color-bg-medium);
}
.bg-grey-2 {
- background-color: var(--grey-2);
+ background-color: var(--color-bg-medium);
}
.bg-grey-3 {
- background-color: var(--grey-3);
+ background-color: var(--color-bg-dark);
}
.bg-grey-4 {
- background-color: var(--grey-4);
+ background-color: var(--color-bg-dark);
}
.bg-grey-5 {
- background-color: var(--grey-5);
+ background-color: var(--color-bg-dark);
}
.bg-slate {
- background-color: var(--slate-color);
+ background-color: var(--color-bg-dark);
}
.bg-slate-light {
- background-color: var(--slate-light-color);
+ background-color: var(--color-bg-medium);
}
.bg-slate-almost-extra-light {
- background-color: var(--slate-almost-extra-light-color);
+ background-color: var(--color-bg-medium);
}
.bg-slate-extra-light {
- background-color: var(--slate-extra-light-color);
+ background-color: var(--color-bg-light);
}
.bg-slate-extra-light-hover:hover {
- background-color: var(--slate-extra-light-color);
+ background-color: var(--color-bg-light);
}
.text-dark,
:local(.text-dark) {
- color: var(--dark-color);
+ color: var(--color-text-dark);
}
/* white - move to bottom for specificity since its often used on hovers, etc */
.text-white,
:local(.text-white),
.text-white-hover:hover {
- color: #fff;
+ color: var(--color-text-white);
}
@media screen and (--breakpoint-min-md) {
.md-text-white {
- color: #fff;
+ color: var(--color-text-white);
}
}
/* common pattern, background brand, text white when hovering or selected */
.brand-hover:hover {
- color: #fff;
- background-color: var(--brand-color);
+ color: var(--color-text-white);
+ background-color: var(--color-brand);
}
.brand-hover:hover * {
- color: #fff;
+ color: var(--color-text-white);
}
.bg-white,
:local(.bg-white),
.bg-white-hover:hover {
- background-color: #fff;
+ background-color: var(--color-bg-white);
}
.bg-light-blue {
- background-color: #f5fafc;
+ background-color: var(--color-bg-light);
}
.bg-light-blue-hover:hover {
- background-color: #e4f0fa;
+ background-color: var(--color-bg-medium);
}
.text-light-blue,
.text-light-blue-hover:hover {
- color: #cfe4f5;
+ color: var(--color-text-light);
}
.text-slate {
- color: #606e7b;
+ color: var(--color-text-medium);
}
.bg-transparent {
@@ -289,43 +320,43 @@
/* entity colors */
.bg-metric {
- background-color: var(--metric-color);
+ background-color: var(--color-accent1);
}
.text-metric {
- color: var(--metric-color);
+ color: var(--color-accent1);
}
.bg-data {
- background-color: var(--data-color);
+ background-color: var(--color-accent1);
}
.text-data {
- color: var(--data-color);
+ color: var(--color-accent1);
}
.bg-segment {
- background-color: var(--segment-color);
+ background-color: var(--color-accent2);
}
.text-segment {
- color: var(--segment-color);
+ color: var(--color-accent2);
}
.bg-dashboard {
- background-color: var(--dashboard-color);
+ background-color: var(--color-brand);
}
.text-dashboard {
- color: var(--dashboard-color);
+ color: var(--color-brand);
}
.bg-pulse {
- background-color: var(--pulse-color);
+ background-color: var(--color-accent4);
}
.text-pulse {
- color: var(--pulse-color);
+ color: var(--color-accent4);
}
.bg-question {
- background-color: var(--question-color);
+ background-color: var(--color-bg-dark);
}
.text-question {
- color: var(--question-color);
+ color: var(--color-text-medium);
}
diff --git a/frontend/src/metabase/css/core/inputs.css b/frontend/src/metabase/css/core/inputs.css
index db6c5b3b1939a16c96c1b5d12236b5455b043c17..48e1c665ec3fb02f4887100b580a95356842c928 100644
--- a/frontend/src/metabase/css/core/inputs.css
+++ b/frontend/src/metabase/css/core/inputs.css
@@ -1,15 +1,15 @@
:root {
- --input-border-color: #d9d9d9;
- --input-border-active-color: #4e82c0;
+ --input-border-color: var(--color-border);
+ --input-border-active-color: var(--color-brand);
--input-border-radius: 4px;
}
.input,
:local(.input) {
- color: var(--dark-color);
+ color: var(--color-text-dark);
font-size: 1.12em;
padding: 0.75rem 0.75rem;
- border: 1px solid var(--input-border-color);
+ border: 1px solid var(--color-border);
border-radius: var(--input-border-radius);
transition: border 0.3s linear;
}
@@ -29,9 +29,9 @@
.input:focus,
:local(.input):focus {
outline: none;
- border: 1px solid var(--input-border-active-color);
+ border: 1px solid var(--color-brand);
transition: border 0.3s linear;
- color: #222;
+ color: var(--color-text-dark);
}
.input--borderless,
diff --git a/frontend/src/metabase/css/core/link.css b/frontend/src/metabase/css/core/link.css
index e3e272244fc98bebe0873e8c93ee4d8d7c8ba34e..db9d956cedc2fe2d975ec439dd5a84888173be3d 100644
--- a/frontend/src/metabase/css/core/link.css
+++ b/frontend/src/metabase/css/core/link.css
@@ -1,5 +1,5 @@
:root {
- --default-link-color: #4a90e2;
+ --default-link-color: var(--color-brand);
}
.no-decoration,
@@ -10,7 +10,7 @@
.link {
cursor: pointer;
text-decoration: none;
- color: var(--default-link-color);
+ color: var(--color-brand);
}
.link:hover {
text-decoration: underline;
diff --git a/frontend/src/metabase/css/core/scroll.css b/frontend/src/metabase/css/core/scroll.css
index dee6d79171864284c498c76baf37f16b89c7f0b1..ef4af0fd5c1f50df78c4d1d0694974a6c67ddf36 100644
--- a/frontend/src/metabase/css/core/scroll.css
+++ b/frontend/src/metabase/css/core/scroll.css
@@ -22,7 +22,7 @@
border: 4px solid transparent;
border-radius: 7px;
background-clip: padding-box;
- background-color: #c2c2c2;
+ background-color: var(--color-bg-medium);
}
.scroll-show::-webkit-scrollbar-button {
@@ -35,28 +35,28 @@
}
.scroll-show:hover::-webkit-scrollbar-thumb {
- background-color: #7d7d7d;
+ background-color: var(--color-bg-dark);
}
.scroll-show::-webkit-scrollbar-thumb:horizontal:hover,
.scroll-show::-webkit-scrollbar-thumb:vertical:hover {
- background-color: #7d7d7d;
+ background-color: var(--color-bg-dark);
}
.scroll-show::-webkit-scrollbar-thumb:horizontal:active,
.scroll-show::-webkit-scrollbar-thumb:vertical:active {
- background-color: #7d7d7d;
+ background-color: var(--color-bg-dark);
}
/* scroll light */
.scroll-show.scroll--light::-webkit-scrollbar-thumb {
border-radius: 0;
- background-color: #cfe4f5;
+ background-color: var(--color-bg-medium);
}
.scroll-show.scroll--light::-webkit-scrollbar-thumb:horizontal:hover,
.scroll-show.scroll--light::-webkit-scrollbar-thumb:vertical:hover,
.scroll-show.scroll--light::-webkit-scrollbar-thumb:horizontal:active,
.scroll-show.scroll--light::-webkit-scrollbar-thumb:vertical:active {
- background-color: #c7d9e4;
+ background-color: var(--color-bg-medium);
}
.scroll-hide {
diff --git a/frontend/src/metabase/css/core/shadow.css b/frontend/src/metabase/css/core/shadow.css
index 23f04090f49652791d347d65d6e3d3e489d69af4..77772844a23b68be73c896c50eb03b4be0fa8427 100644
--- a/frontend/src/metabase/css/core/shadow.css
+++ b/frontend/src/metabase/css/core/shadow.css
@@ -1,13 +1,13 @@
:root {
- --shadow-color: rgba(0, 0, 0, 0.08);
- --shadow-hover-color: rgba(0, 0, 0, 0.12);
+ --shadow-color: var(--color-shadow);
+ --shadow-hover-color: var(--color-shadow);
}
.shadowed,
:local(.shadowed) {
- box-shadow: 0 2px 2px var(--shadow-color);
+ box-shadow: 0 2px 2px var(--color-shadow);
}
.shadow-hover:hover {
- box-shadow: 0 2px 2px var(--shadow-hover-color);
+ box-shadow: 0 2px 2px color(var(--color-shadow) alpha(20%));
transition: box-shadow 300ms linear;
}
diff --git a/frontend/src/metabase/css/core/text.css b/frontend/src/metabase/css/core/text.css
index 2cdd2b7eb1c1a088c7e05535068758840b008428..d4fc21679781f7dd3c8eaf80d5f0acc9ec9e6934 100644
--- a/frontend/src/metabase/css/core/text.css
+++ b/frontend/src/metabase/css/core/text.css
@@ -1,6 +1,6 @@
:root {
- --body-text-color: #8e9ba9;
- --70-percent-black: #444444;
+ --body-text-color: var(--color-text-medium);
+ --70-percent-black: var(--color-text-dark);
}
/* center */
@@ -131,7 +131,7 @@
:local(.text-body) {
font-size: 1.286em;
line-height: 1.457em;
- color: var(--body-text-color); /* TODO - is this bad? */
+ color: var(--color-text-medium); /* TODO - is this bad? */
}
.text-paragraph,
@@ -170,8 +170,8 @@
.text-code {
font-family: monospace;
- color: #8691ac;
- background-color: #e9f2f5;
+ color: var(--color-text-medium);
+ background-color: var(--color-bg-medium);
border-radius: 2px;
padding: 0.2em 0.4em;
line-height: 1.4em;
diff --git a/frontend/src/metabase/css/dashboard.css b/frontend/src/metabase/css/dashboard.css
index 94657d12f12c1ac2dffdae60a53d5206242cd164..7a5b9ae35e363fc649a5e6f737c7dd9f9a73d76f 100644
--- a/frontend/src/metabase/css/dashboard.css
+++ b/frontend/src/metabase/css/dashboard.css
@@ -1,14 +1,14 @@
:root {
- --night-mode-color: rgba(255, 255, 255, 0.86);
+ --night-mode-color: color(var(--color-text-white) alpha(-14%));
}
.Dashboard {
- background-color: #f9fbfc;
+ background-color: var(--color-bg-light);
min-height: 100vh;
}
.DashboardHeader {
background-color: white;
- border-bottom: var(--border-size) var(--border-style) var(--border-color);
+ border-bottom: var(--border-size) var(--border-style) var(--color-border);
}
.Dash-wrapper {
@@ -35,7 +35,7 @@
/* Fullscreen mode */
.Dashboard.Dashboard--fullscreen .Header-button {
- color: #d2dbe4;
+ color: var(--color-text-light);
}
.Dashboard.Dashboard--fullscreen .DashboardHeader {
@@ -48,35 +48,35 @@
/* Night mode */
.Dashboard.Dashboard--night {
- background-color: rgb(34, 37, 39);
+ background-color: var(--color-bg-black);
}
.Dashboard.Dashboard--night .Card {
- color: #fff;
+ color: var(--color-text-white);
}
.Dashboard.Dashboard--night .Header-button,
.Dashboard.Dashboard--night .Header-button svg {
- color: rgba(151, 151, 151, 0.3);
+ color: color(var(--color-text-medium) alpha(-70%));
}
.Dashboard.Dashboard--fullscreen .fullscreen-normal-text {
- color: #3f3a3a;
+ color: var(--color-text-dark);
transition: color 1s linear;
}
.Dashboard.Dashboard--night.Dashboard--fullscreen .fullscreen-night-text {
- color: var(--night-mode-color);
+ color: color(var(--color-text-white) alpha(-14%));
transition: color 1s linear;
}
.Dashboard.Dashboard--night .DashCard .Card svg text {
- fill: rgba(255, 255, 255, 0.86) !important;
+ fill: color(var(--color-text-white) alpha(-14%)) !important;
}
.Dashboard.Dashboard--night .DashCard .Card {
- background-color: rgb(54, 58, 61);
- border: 1px solid rgb(46, 49, 52);
+ background-color: var(--color-bg-black);
+ border: 1px solid var(--color-accent2);
}
.Dashboard.Dashboard--night .enable-dots-onhover .dc-tooltip circle.dot:hover,
@@ -107,11 +107,11 @@
right: 0;
overflow: hidden;
background-color: white;
- border: 1px solid rgb(219, 219, 219);
+ border: 1px solid var(--color-border);
}
.DashCard .Card.Card--slow {
- border-color: var(--gold-color);
+ border-color: var(--color-accent4);
}
.Dash--editing .DashCard .Card {
@@ -124,10 +124,10 @@
@keyframes fade-out-yellow {
from {
- background-color: rgba(255, 250, 243, 1);
+ background-color: var(--color-bg-white);
}
to {
- background-color: rgba(255, 255, 255, 1);
+ background-color: var(--color-bg-white);
}
}
@@ -162,7 +162,7 @@
.PinMapUpdateButton--disabled {
pointer-events: none;
- color: color(var(--base-grey) shade(10%));
+ color: var(--color-text-light);
}
.Dash--editing .DashCard .Card {
@@ -170,11 +170,11 @@
}
.DashCard .Card {
- box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.08);
+ box-shadow: 0px 1px 3px var(--color-shadow);
}
.Dash--editing .DashCard.dragging .Card {
- box-shadow: 3px 3px 8px rgba(0, 0, 0, 0.1);
+ box-shadow: 3px 3px 8px var(--color-shadow);
}
.Dash--editing .DashCard.dragging,
@@ -184,8 +184,8 @@
.Dash--editing .DashCard.dragging .Card,
.Dash--editing .DashCard.resizing .Card {
- background-color: #e5f1fb !important;
- border: 1px solid var(--brand-color);
+ background-color: var(--color-bg-medium) !important;
+ border: 1px solid var(--color-brand);
}
.DashCard .DashCard-actions {
@@ -250,15 +250,15 @@
height: 8px;
bottom: 10px;
right: 10px;
- border-bottom: 2px solid color(var(--base-grey) shade(20%));
- border-right: 2px solid color(var(--base-grey) shade(20%));
+ border-bottom: 2px solid var(--color-border);
+ border-right: 2px solid var(--color-border);
border-bottom-right-radius: 2px;
transition: opacity 0.2s;
opacity: 0.01;
}
.Dash--editing .DashCard .react-resizable-handle:hover:after {
- border-color: color(var(--base-grey) shade(40%));
+ border-color: var(--color-border);
}
.Dash--editing .DashCard:hover .react-resizable-handle:after {
@@ -272,7 +272,7 @@
.Dash--editing .react-grid-placeholder {
z-index: 0;
- background-color: #f2f2f2;
+ background-color: var(--color-bg-light);
transition: all 0.15s linear;
}
@@ -330,13 +330,13 @@
}
.DashCard .Card {
box-shadow: none;
- border-color: #a1a1a1;
+ border-color: var(--color-border);
}
/* improve label contrast */
.dc-chart .axis .tick text,
.dc-chart .x-axis-label,
.dc-chart .y-axis-label {
- fill: #222222;
+ fill: var(--color-text-dark);
}
}
@@ -362,5 +362,5 @@
/* when in night mode code snippets should have a more readable background-color */
.Dashboard--night pre code {
- background-color: rgba(255, 255, 255, 0.14);
+ background-color: color(var(--color-bg-white) alpha(-86%));
}
diff --git a/frontend/src/metabase/css/home.css b/frontend/src/metabase/css/home.css
index fde098b191d80dd31268fa164bc171ff87976e29..169f6bb7b81cd4061db797fc06bc0085169c01ba 100644
--- a/frontend/src/metabase/css/home.css
+++ b/frontend/src/metabase/css/home.css
@@ -1,7 +1,7 @@
:root {
- --search-bar-color: #60a6e4;
- --search-bar-active-color: #7bb7ec;
- --search-bar-active-border-color: #4894d8;
+ --search-bar-color: var(--color-brand);
+ --search-bar-active-color: var(--color-brand);
+ --search-bar-active-border-color: var(--color-brand);
}
.Nav {
@@ -10,22 +10,18 @@
/* temporary css for the navbar and search */
.search-bar {
- background-color: var(--search-bar-color);
+ background-color: color(var(--color-bg-white) alpha(-90%));
border-color: transparent;
color: white;
}
-.nav-light {
- background-color: var(--search-bar-color);
-}
-
.search-bar--active {
- background-color: var(--search-bar-active-color);
- border-color: var(--search-bar-active-border-color);
+ background-color: color(var(--color-bg-white) alpha(-75%));
+ border-color: var(--color-brand);
}
.NavItem.NavItem--selected {
- background-color: rgba(0, 0, 0, 0.2);
+ background-color: color(var(--color-bg-black) alpha(-80%));
}
.NavItem {
@@ -45,16 +41,16 @@
}
.NavItem:hover,
.NavItem.NavItem--selected {
- background-color: rgba(255, 255, 255, 0.08);
+ background-color: color(var(--color-bg-white) alpha(-92%));
}
}
.NavNewQuestion {
- box-shadow: 0px 2px 2px 0px rgba(77, 136, 189, 0.69);
+ box-shadow: 0px 2px 2px 0px var(--color-shadow);
}
.NavNewQuestion:hover {
- box-shadow: 0px 3px 2px 2px rgba(77, 136, 189, 0.75);
- color: #3875ac;
+ box-shadow: 0px 3px 2px 2px var(--color-shadow);
+ color: var(--color-brand);
}
.Greeting {
@@ -75,7 +71,7 @@
}
.bullet:before {
content: "\2022";
- color: #6fb0eb;
+ color: var(--color-brand);
position: absolute;
top: 0;
margin-top: 16px;
@@ -117,7 +113,7 @@
left: 0;
width: 100%;
height: 100%;
- box-shadow: 0 0 4px rgba(0, 0, 0, 0.12);
+ box-shadow: 0 0 4px var(--color-shadow);
background-clip: padding-box;
}
@@ -145,7 +141,7 @@
.NavDropdown.open .NavDropdown-button,
.NavDropdown .NavDropdown-content-layer {
- background-color: #6fb0eb;
+ background-color: var(--color-brand);
}
.NavDropdown .NavDropdown-content-layer {
@@ -206,10 +202,10 @@
.tooltip {
position: absolute;
- background-color: #fff;
+ background-color: var(--color-bg-white);
border-radius: 2px;
- box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.12);
- color: #ddd;
+ box-shadow: 1px 1px 1px var(--color-shadow);
+ color: var(--color-text-light);
}
.TableDescription {
@@ -220,8 +216,8 @@
.Layout-sidebar {
min-height: 100vh;
width: 346px;
- background-color: #f9fbfc;
- border-left: 2px solid var(--border-color);
+ background-color: var(--color-bg-light);
+ border-left: 2px solid var(--color-border);
}
.Layout-mainColumn {
max-width: 700px;
diff --git a/frontend/src/metabase/css/index.css b/frontend/src/metabase/css/index.css
index f3cfe5e7ca6a542c19437509ed7b3e4153985c39..81c606efa54a99fb1338ef6f90488f4b2c8b28b2 100644
--- a/frontend/src/metabase/css/index.css
+++ b/frontend/src/metabase/css/index.css
@@ -3,7 +3,6 @@
@import "./core/index.css";
@import "./components/buttons.css";
-@import "./components/dropdown.css";
@import "./components/form.css";
@import "./components/header.css";
@import "./components/icons.css";
diff --git a/frontend/src/metabase/css/login.css b/frontend/src/metabase/css/login.css
index e30bee15dda3293b65e6ce227bf9435a8dc3e28a..540edf16482f88c9d2819fffa68a0c4a42f5f417 100644
--- a/frontend/src/metabase/css/login.css
+++ b/frontend/src/metabase/css/login.css
@@ -10,7 +10,7 @@
}
.Login-header {
- color: #6a6a6a;
+ color: var(--color-text-dark);
}
.brand-scene {
@@ -121,16 +121,16 @@
display: flex;
flex-direction: column;
align-items: center;
- color: var(--success-color);
+ color: var(--color-accent1);
padding: 4em;
}
.SuccessMark {
display: flex;
padding: 1em;
- border: 3px solid var(--success-color);
+ border: 3px solid var(--color-accent1);
border-radius: 99px;
- color: var(--success-color);
+ color: var(--color-accent1);
line-height: 1;
}
diff --git a/frontend/src/metabase/css/pulse.css b/frontend/src/metabase/css/pulse.css
index 29bd27b47ac9575f3cf260fb2b1964bffd72927f..aff2e4fd7f24bf73e22c73b759de462b4d8d664b 100644
--- a/frontend/src/metabase/css/pulse.css
+++ b/frontend/src/metabase/css/pulse.css
@@ -12,10 +12,10 @@
}
.PulseButton {
- color: rgb(121, 130, 127);
+ color: var(--color-text-medium);
font-weight: 700;
border-width: 2px;
- border-color: rgb(222, 228, 226);
+ border-color: var(--color-border);
}
.PulseEdit .input,
@@ -24,7 +24,7 @@
.PulseEdit .border-row-divider,
.PulseEdit .AdminSelect {
border-width: 2px;
- border-color: rgb(222, 228, 226);
+ border-color: var(--color-border);
}
.PulseEdit .AdminSelect {
@@ -34,7 +34,7 @@
.PulseEdit .input:focus,
.PulseEdit .input--focus {
border-width: 2px;
- border-color: rgb(97, 167, 229) !important;
+ border-color: var(--color-brand) !important;
}
.PulseListItem button {
@@ -42,7 +42,7 @@
}
.bg-grey-0 {
- background-color: rgb(252, 252, 253);
+ background-color: var(--color-bg-white);
}
.PulseEditButton {
@@ -59,27 +59,27 @@
}
.PulseListItem.PulseListItem--focused {
- border-color: #509ee3;
- box-shadow: 0 0 3px #509ee3;
+ border-color: var(--color-brand);
+ box-shadow: 0 0 3px var(--color-shadow);
}
.DangerZone:hover {
- border-color: var(--error-color);
+ border-color: var(--color-accent3);
transition: border 0.3s ease-in;
}
.DangerZone .Button--danger {
opacity: 0.4;
- background: #fbfcfd;
- border: 1px solid #ddd;
- color: #444;
+ background: var(--color-bg-light);
+ border: 1px solid var(--color-border);
+ color: var(--color-text-dark);
}
.DangerZone:hover .Button--danger {
opacity: 1;
- background-color: var(--danger-button-bg-color);
- border-color: var(--danger-button-bg-color);
- color: #fff;
+ background-color: var(--color-accent3);
+ border-color: var(--color-accent3);
+ color: var(--color-text-white);
}
.Modal.WhatsAPulseModal {
diff --git a/frontend/src/metabase/css/query_builder.css b/frontend/src/metabase/css/query_builder.css
index 59e51e595da5604ced3f9a22d392c0208cc2c03c..5154accf96e743b9afaa11fab043c4eee4d485f5 100644
--- a/frontend/src/metabase/css/query_builder.css
+++ b/frontend/src/metabase/css/query_builder.css
@@ -1,5 +1,5 @@
:root {
- --selection-color: #ccdff6;
+ --selection-color: var(--color-text-light);
}
#react_qb_viz {
@@ -23,7 +23,7 @@
.QueryHeader-section {
padding-right: 1em;
margin-right: 1em;
- border-right: 1px solid rgba(0, 0, 0, 0.2);
+ border-right: 1px solid color(var(--color-accent2) alpha(-80%));
}
.QueryHeader-section:last-child {
@@ -33,13 +33,13 @@
/*
.Icon-download,
.Icon-addToDash {
- fill: #919191;
+ fill: var(--color-text-medium);
transition: fill .3s linear;
}
.Icon-download:hover,
.Icon-addToDash:hover {
- fill: var(--brand-color);
+ fill: var(--color-brand);
transition: fill .3s linear;
}
*/
@@ -65,7 +65,7 @@
text-transform: uppercase;
font-size: 10px;
font-weight: 700;
- color: color(var(--base-grey) shade(30%));
+ color: var(--color-text-medium);
}
.Query-filters {
@@ -88,7 +88,7 @@
}
.Query-filter.selected {
- border-color: var(--purple-color);
+ border-color: var(--color-accent2);
}
.Filter-section {
@@ -123,7 +123,7 @@
@selectionmodule
*/
.SelectionModule {
- color: var(--brand-color);
+ color: var(--color-brand);
}
.SelectionList {
@@ -151,7 +151,7 @@
align-items: center;
cursor: pointer;
padding: 0.75rem 1.5rem 0.75rem 0.75rem;
- background-color: #fff;
+ background-color: var(--color-bg-white);
}
.SelectionItem:hover {
@@ -173,15 +173,15 @@
}
.SelectionItem:hover .Icon {
- color: #fff !important;
+ color: var(--color-text-white) !important;
}
.SelectionItem:hover .SelectionModule-display {
- color: #fff;
+ color: var(--color-text-white);
}
.SelectionItem:hover .SelectionModule-description {
- color: #fff;
+ color: var(--color-text-white);
}
.SelectionItem.SelectionItem--selected .Icon-check {
@@ -194,7 +194,7 @@
}
.SelectionModule-description {
- color: color(var(--base-grey) shade(40%));
+ color: var(--color-text-medium);
font-size: 0.8rem;
}
@@ -217,7 +217,7 @@
}
.Loading {
- background-color: rgba(255, 255, 255, 0.82);
+ background-color: color(var(--color-bg-white) alpha(-18%));
}
/* query errors */
@@ -232,7 +232,7 @@
.QueryError-iconWrapper {
padding: 2em;
margin-bottom: 2em;
- border: 4px solid var(--error-color);
+ border: 4px solid var(--color-accent3);
border-radius: 99px;
}
@@ -279,7 +279,7 @@
position: relative;
display: inline-block;
border-radius: var(--default-border-radius);
- border: 1px solid rgb(197, 197, 197);
+ border: 1px solid var(--color-border);
margin-top: var(--margin-2);
padding: var(--padding-1) var(--padding-4) var(--padding-1) var(--padding-4);
}
@@ -310,7 +310,7 @@
}
.QueryError2-detailBody {
- background-color: #f8f8f8;
+ background-color: var(--color-bg-light);
max-height: 15rem;
overflow: auto;
}
@@ -323,9 +323,9 @@
flex-direction: column;
font-size: 0.9em;
z-index: 2;
- background-color: #fff;
+ background-color: var(--color-bg-white);
- border: 1px solid #e0e0e0;
+ border: 1px solid var(--color-border);
}
/* for medium breakpoint only expand if data reference is not shown */
@@ -337,22 +337,22 @@
/* un-expanded (default) */
.GuiBuilder-row {
- border-bottom: 1px solid #e0e0e0;
+ border-bottom: 1px solid var(--color-border);
}
.GuiBuilder-row:last-child {
border-bottom-color: transparent;
}
.GuiBuilder-data {
- border-right: 1px solid #e0e0e0;
+ border-right: 1px solid var(--color-border);
}
.GuiBuilder-filtered-by {
border-right: 1px solid transparent;
}
.GuiBuilder-view {
- border-right: 1px solid #e0e0e0;
+ border-right: 1px solid var(--color-border);
}
.GuiBuilder-sort-limit {
- border-left: 1px solid #e0e0e0;
+ border-left: 1px solid var(--color-border);
}
/* expanded */
@@ -361,10 +361,10 @@
}
.GuiBuilder.GuiBuilder--expand .GuiBuilder-row:last-child {
border-right-color: transparent;
- border-bottom-color: #e0e0e0;
+ border-bottom-color: var(--color-border);
}
.GuiBuilder.GuiBuilder--expand .GuiBuilder-filtered-by {
- border-right-color: #e0e0e0;
+ border-right-color: var(--color-border);
}
.GuiBuilder-section {
@@ -407,19 +407,19 @@
.Filter-section-field,
.Filter-section-operator {
- color: var(--purple-color);
+ color: var(--color-accent2);
}
.Filter-section-field .QueryOption {
- color: var(--purple-color);
+ color: var(--color-accent2);
}
.Filter-section-operator .QueryOption {
- color: var(--purple-color);
+ color: var(--color-accent2);
}
.Filter-section-value .QueryOption {
color: white;
- background-color: var(--purple-color);
- border: 1px solid color(var(--purple-color) shade(30%));
+ background-color: var(--color-accent2);
+ border: 1px solid var(--color-accent2);
border-radius: 6px;
padding: 0.5em;
padding-top: 0.3em;
@@ -439,10 +439,10 @@
.FilterPopover .ColumnarSelector-row--selected,
.FilterPopover .PopoverHeader-item.selected {
- color: var(--purple-color) !important;
+ color: var(--color-accent2) !important;
}
.FilterPopover .ColumnarSelector-row:hover {
- background-color: var(--purple-color) !important;
+ background-color: var(--color-accent2) !important;
}
/* VIEW SECTION */
@@ -450,13 +450,13 @@
.View-section-aggregation,
.View-section-aggregation-target,
.View-section-breakout {
- color: var(--green-color);
+ color: var(--color-accent1);
}
.View-section-aggregation.selected .QueryOption,
.View-section-aggregation-target.selected .QueryOption,
.View-section-breakout.selected .QueryOption {
- color: var(--green-color);
+ color: var(--color-accent1);
}
/* SORT/LIMIT SECTION */
@@ -488,7 +488,7 @@
height: 38px;
border-radius: 38px;
background-color: white;
- border: 1px solid #ccdff6;
+ border: 1px solid var(--color-border);
}
.ChartType-popover {
@@ -497,7 +497,7 @@
.ChartType--selected {
color: white;
- background-color: rgb(74, 144, 226);
+ background-color: var(--color-brand);
}
.ChartType--notSensible {
@@ -514,7 +514,7 @@
.RunButton {
z-index: 1;
opacity: 1;
- box-shadow: 0 1px 2px rgba(0, 0, 0, 0.22);
+ box-shadow: 0 1px 2px var(--color-shadow);
transition: transform 0.5s, opacity 0.5s;
min-width: 8em;
position: relative;
@@ -534,7 +534,7 @@
right: 0;
width: 300px;
height: 100%;
- background-color: var(--slate-extra-light-color);
+ background-color: var(--color-bg-light);
overflow: hidden;
}
@@ -559,7 +559,7 @@
width: 100%;
margin: 0 auto;
margin-bottom: 2rem;
- border: 1px solid #dedede;
+ border: 1px solid var(--color-border);
}
@media screen and (--breakpoint-min-xl) {
@@ -570,11 +570,11 @@
}
.ObjectDetail-headingGroup {
- border-bottom: 1px solid #dedede;
+ border-bottom: 1px solid var(--color-border);
}
.ObjectDetail-infoMain {
- border-right: 1px solid #dedede;
+ border-right: 1px solid var(--color-border);
margin-left: 2.4rem;
font-size: 1rem;
}
@@ -583,8 +583,8 @@
max-height: 200px;
overflow: scroll;
padding: 1em;
- background-color: #f8f8f8;
- border: 1px solid #dedede;
+ background-color: var(--color-bg-light);
+ border: 1px solid var(--color-border);
border-radius: 2px;
}
@@ -599,23 +599,23 @@
.List-item--segment .Icon,
.List-item--segment .List-item-title {
- color: var(--purple-color);
+ color: var(--color-accent2);
}
.List-item--customfield .Icon,
.List-item--customfield .List-item-title {
- color: var(--brand-color);
+ color: var(--color-brand);
}
.List-item:not(.List-item--disabled):hover .FieldList-grouping-trigger,
.List-item--selected .FieldList-grouping-trigger {
visibility: visible;
- border-left: 2px solid rgba(0, 0, 0, 0.1);
- color: rgba(255, 255, 255, 0.5);
+ border-left: 2px solid color(var(--color-accent2) alpha(-90%));
+ color: color(var(--color-text-white) alpha(-50%));
}
.QuestionTooltipTarget {
- color: rgb(225, 225, 225);
+ color: var(--color-text-light);
display: inline-block;
border: 2px solid currentColor;
border-radius: 99px;
@@ -644,8 +644,8 @@
display: flex;
align-items: center;
justify-content: center;
- background-color: var(--purple-color);
- border: 1px solid var(--purple-color);
+ background-color: var(--color-accent2);
+ border: 1px solid var(--color-accent2);
transition: opacity 0.3s ease-out;
}
@@ -666,27 +666,27 @@
white-space: pre-wrap;
white-space: -moz-pre-wrap;
white-space: -o-pre-wrap;
- background-color: #f9fbfc;
- border: 1px solid #d5dbe3;
+ background-color: var(--color-bg-light);
+ border: 1px solid var(--color-border);
border-radius: 4px;
}
.ParameterValuePickerNoPopover input {
font-size: 16px;
- color: var(--default-font-color);
+ color: var(--color-text-dark);
border: none;
}
.ParameterValuePickerNoPopover--selected input {
font-weight: bold;
- color: var(--brand-color);
+ color: var(--color-brand);
}
.ParameterValuePickerNoPopover input:focus {
outline: none;
- color: var(--default-font-color);
+ color: var(--color-text-dark);
}
.ParameterValuePickerNoPopover input::-webkit-input-placeholder {
- color: var(--grey-4);
+ color: var(--color-text-medium);
}
diff --git a/frontend/src/metabase/css/setup.css b/frontend/src/metabase/css/setup.css
index c18df9720cda0589695040a0771091070f1c197e..2971e08d801d205ee3f7b3e23cdb146c652be232 100644
--- a/frontend/src/metabase/css/setup.css
+++ b/frontend/src/metabase/css/setup.css
@@ -1,7 +1,7 @@
:root {
--indicator-size: 3em; /* ~ 42 px */
--indicator-border-radius: 99px;
- --setup-border-color: #d7d7d7;
+ --setup-border-color: var(--color-border);
}
.SetupSteps {
@@ -9,7 +9,7 @@
}
.SetupNav {
- border-bottom: 1px solid #f5f5f5;
+ border-bottom: 1px solid var(--color-border);
}
.Setup-brandWordMark {
@@ -18,21 +18,21 @@
.SetupStep {
margin-bottom: 1.714rem;
- border: 1px solid var(--setup-border-color);
+ border: 1px solid var(--color-border);
flex: 1;
}
.SetupStep.SetupStep--active {
- color: var(--brand-color);
+ color: var(--color-brand);
}
.SetupStep.SetupStep--completed {
- color: var(--success-color);
+ color: var(--color-accent1);
}
.SetupStep.SetupStep--todo {
- color: var(--brand-color);
- background-color: #edf2f8;
+ color: var(--color-brand);
+ background-color: var(--color-bg-medium);
border-style: dashed;
}
@@ -41,15 +41,15 @@
width: var(--indicator-size);
height: var(--indicator-size);
border-radius: var(--indicator-border-radius);
- border-color: color(var(--base-grey) shade(20%));
+ border-color: var(--color-border);
font-weight: bold;
line-height: 1;
- background-color: #fff;
+ background-color: var(--color-bg-white);
margin-top: -3px;
}
.SetupStep-check {
- color: #fff;
+ color: var(--color-text-white);
display: none;
}
@@ -58,12 +58,12 @@
}
.SetupStep.SetupStep--active .SetupStep-indicator {
- color: var(--brand-color);
+ color: var(--color-brand);
}
.SetupStep.SetupStep--completed .SetupStep-indicator {
- border-color: #9cc177;
- background-color: #c8e1b0;
+ border-color: var(--color-accent1);
+ background-color: var(--color-accent1);
}
.SetupStep.SetupStep--completed .SetupStep-check {
@@ -84,5 +84,5 @@
}
.SetupHelp {
- color: var(--body-text-color);
+ color: var(--color-text-medium);
}
diff --git a/frontend/src/metabase/dashboard/components/AddSeriesModal.jsx b/frontend/src/metabase/dashboard/components/AddSeriesModal.jsx
index e7de3a340cf2f6b8fc05a11a8758c6f6316d87b2..1dc6c4b08148f3b39bb14d5296dd4fb0c22fe50b 100644
--- a/frontend/src/metabase/dashboard/components/AddSeriesModal.jsx
+++ b/frontend/src/metabase/dashboard/components/AddSeriesModal.jsx
@@ -1,14 +1,15 @@
import React, { Component } from "react";
import PropTypes from "prop-types";
+import { t } from "c-3po";
import Visualization from "metabase/visualizations/components/Visualization.jsx";
import LoadingAndErrorWrapper from "metabase/components/LoadingAndErrorWrapper.jsx";
import Icon from "metabase/components/Icon.jsx";
import Tooltip from "metabase/components/Tooltip.jsx";
import CheckBox from "metabase/components/CheckBox.jsx";
-import { t } from "c-3po";
import MetabaseAnalytics from "metabase/lib/analytics";
import Query from "metabase/lib/query";
+import colors from "metabase/lib/colors";
import { getVisualizationRaw } from "metabase/visualizations";
@@ -262,7 +263,7 @@ export default class AddSeriesModal extends Component {
{this.state.state && (
<div
className="spred flex layout-centered"
- style={{ backgroundColor: "rgba(255,255,255,0.80)" }}
+ style={{ backgroundColor: colors["bg-white"] }}
>
{this.state.state === "loading" ? (
<div className="h3 rounded bordered p3 bg-white shadowed">
@@ -293,13 +294,13 @@ export default class AddSeriesModal extends Component {
className="border-left flex flex-column"
style={{
width: 370,
- backgroundColor: "#F8FAFA",
- borderColor: "#DBE1DF",
+ backgroundColor: colors["bg-light"],
+ borderColor: colors["border"],
}}
>
<div
className="flex-no-shrink border-bottom flex flex-row align-center"
- style={{ borderColor: "#DBE1DF" }}
+ style={{ borderColor: colors["border"] }}
>
<Icon className="ml2" name="search" size={16} />
<input
diff --git a/frontend/src/metabase/dashboard/components/DashCard.jsx b/frontend/src/metabase/dashboard/components/DashCard.jsx
index 51f5e1e7d548c65959c72c46c5d94458ccca1456..ca7fbd0fa8c2728d30eb1ad7bc9302db72bd6a61 100644
--- a/frontend/src/metabase/dashboard/components/DashCard.jsx
+++ b/frontend/src/metabase/dashboard/components/DashCard.jsx
@@ -7,6 +7,7 @@ import Visualization, {
ERROR_MESSAGE_GENERIC,
ERROR_MESSAGE_PERMISSION,
} from "metabase/visualizations/components/Visualization.jsx";
+import QueryDownloadWidget from "metabase/query_builder/components/QueryDownloadWidget";
import ModalWithTrigger from "metabase/components/ModalWithTrigger.jsx";
import ChartSettings from "metabase/visualizations/components/ChartSettings.jsx";
@@ -20,6 +21,8 @@ import { IS_EMBED_PREVIEW } from "metabase/lib/embed";
import cx from "classnames";
import _ from "underscore";
import { getIn } from "icepick";
+import { getParametersBySlug } from "metabase/meta/Parameter";
+import Utils from "metabase/lib/utils";
const DATASET_USUALLY_FAST_THRESHOLD = 15 * 1000;
@@ -65,6 +68,8 @@ export default class DashCard extends Component {
onRemove,
navigateToNewCardFromDashboard,
metadata,
+ dashboard,
+ parameterValues,
} = this.props;
const mainCard = {
@@ -75,6 +80,8 @@ export default class DashCard extends Component {
},
};
const cards = [mainCard].concat(dashcard.series || []);
+ const dashboardId = dashcard.dashboard_id;
+ const isEmbed = Utils.isJWT(dashboardId);
const series = cards.map(card => ({
...getIn(dashcardData, [dashcard.id, card.id]),
card: card,
@@ -108,6 +115,8 @@ export default class DashCard extends Component {
errorIcon = "warning";
}
+ const params = getParametersBySlug(dashboard.parameters, parameterValues);
+
const hideBackground =
!isEditing &&
mainCard.visualization_settings["dashcard.background"] === false;
@@ -129,6 +138,7 @@ export default class DashCard extends Component {
>
<Visualization
className="flex-full"
+ classNameWidgets={isEmbed && "text-grey-2 text-grey-4-hover"}
error={errorMessage}
errorIcon={errorIcon}
isSlow={isSlow}
@@ -152,6 +162,16 @@ export default class DashCard extends Component {
this.props.onReplaceAllVisualizationSettings
}
/>
+ ) : isEmbed ? (
+ <QueryDownloadWidget
+ className="m1 text-brand-hover text-grey-2"
+ classNameClose="hover-child"
+ card={dashcard.card}
+ params={params}
+ dashcardId={dashcard.id}
+ token={dashcard.dashboard_id}
+ icon="download"
+ />
) : (
undefined
)
diff --git a/frontend/src/metabase/dashboard/components/DashCardParameterMapper.jsx b/frontend/src/metabase/dashboard/components/DashCardParameterMapper.jsx
index 465df150065b380bdb11f71a7821542b45cc4d0f..d0cfe60c589b0134b133f24c080d11396d6f622a 100644
--- a/frontend/src/metabase/dashboard/components/DashCardParameterMapper.jsx
+++ b/frontend/src/metabase/dashboard/components/DashCardParameterMapper.jsx
@@ -1,7 +1,10 @@
import React from "react";
import { t } from "c-3po";
+
import DashCardCardParameterMapper from "../containers/DashCardCardParameterMapper.jsx";
+import colors from "metabase/lib/colors";
+
const DashCardParameterMapper = ({ dashcard }) => (
<div className="relative flex-full flex flex-column layout-centered">
{dashcard.series &&
@@ -9,8 +12,8 @@ const DashCardParameterMapper = ({ dashcard }) => (
<div
className="mx4 my1 p1 rounded"
style={{
- backgroundColor: "#F5F5F5",
- color: "#8691AC",
+ backgroundColor: colors["bg-light"],
+ color: colors["text-medium"],
marginTop: -10,
}}
>
diff --git a/frontend/src/metabase/dashboard/components/DashboardGrid.jsx b/frontend/src/metabase/dashboard/components/DashboardGrid.jsx
index 4690afc6a166f1ea643e6811cf0561ff381bc6e2..38e45d66c3637fe09ac99fc913e32a8abd49217b 100644
--- a/frontend/src/metabase/dashboard/components/DashboardGrid.jsx
+++ b/frontend/src/metabase/dashboard/components/DashboardGrid.jsx
@@ -227,6 +227,7 @@ export default class DashboardGrid extends Component {
this.props.navigateToNewCardFromDashboard
}
metadata={this.props.metadata}
+ dashboard={this.props.dashboard}
/>
);
}
diff --git a/frontend/src/metabase/dashboard/components/RefreshWidget.css b/frontend/src/metabase/dashboard/components/RefreshWidget.css
index a312808825005daebf74ce5f867ecf3b976b9980..6ba30b9ff3a89dddb0807e983e366c40a3eb60f7 100644
--- a/frontend/src/metabase/dashboard/components/RefreshWidget.css
+++ b/frontend/src/metabase/dashboard/components/RefreshWidget.css
@@ -4,7 +4,7 @@
}
:local .title {
- color: color(var(--base-grey) shade(40%));
+ color: var(--color-text-medium);
font-weight: bold;
font-size: 0.75em;
text-transform: uppercase;
@@ -15,18 +15,18 @@
:local .option {
composes: cursor-pointer from "style";
- color: var(--default-font-color);
+ color: var(--color-text-dark);
font-weight: bold;
padding-top: 0.5em;
padding-bottom: 0.5em;
}
:local .option:hover,
:local .option:hover .valueLabel {
- color: var(--brand-color) !important;
+ color: var(--color-brand) !important;
}
:local .option.on.selected,
:local .option.on.selected .valueLabel {
- color: var(--green-color);
+ color: var(--color-accent1);
}
:local .option :global(.Icon) {
@@ -41,5 +41,5 @@
}
:local .option .valueLabel {
- color: color(var(--base-grey) shade(40%));
+ color: var(--color-text-medium);
}
diff --git a/frontend/src/metabase/dashboard/components/grid/GridLayout.jsx b/frontend/src/metabase/dashboard/components/grid/GridLayout.jsx
index f8689a5170e23d35beb99a2f986953c3832a17f6..92e6426cbad4a8976333f7b81698caf83db92909 100644
--- a/frontend/src/metabase/dashboard/components/grid/GridLayout.jsx
+++ b/frontend/src/metabase/dashboard/components/grid/GridLayout.jsx
@@ -4,6 +4,7 @@ import ReactDOM from "react-dom";
import GridItem from "./GridItem.jsx";
import _ from "underscore";
+import colors from "metabase/lib/colors";
export default class GridLayout extends Component {
constructor(props, context) {
@@ -236,7 +237,9 @@ export default class GridLayout extends Component {
_(cols)
.times(
i =>
- `<rect stroke='rgba(0, 0, 0, 0.117647)' stroke-width='1' fill='none' x='${Math.round(
+ `<rect stroke='${
+ colors["border"]
+ }' stroke-width='1' fill='none' x='${Math.round(
margin / 2 + i * cellSize.width,
) + 1.5}' y='${margin / 2 + 1.5}' width='${Math.round(
cellSize.width - margin - 3,
diff --git a/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp.jsx b/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp.jsx
index 5c5ffa89f93561f8993faf7a1dc1b5e166df241e..d447ddcb3410bc036b5b6fac3cb0a46f84fde9d4 100644
--- a/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp.jsx
+++ b/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp.jsx
@@ -14,7 +14,6 @@ import Filter from "metabase/query_builder/components/Filter";
import cxs from "cxs";
import { t } from "c-3po";
-import _ from "underscore";
import { Dashboard } from "metabase/dashboard/containers/Dashboard";
import DashboardData from "metabase/dashboard/hoc/DashboardData";
@@ -29,6 +28,7 @@ import MetabaseAnalytics from "metabase/lib/analytics";
import * as Q from "metabase/lib/query/query";
import Dimension from "metabase-lib/lib/Dimension";
+import colors from "metabase/lib/colors";
import { dissoc } from "icepick";
@@ -63,7 +63,12 @@ class AutomaticDashboardApp extends React.Component {
const newDashboard = await DashboardApi.save(dissoc(dashboard, "id"));
triggerToast(
<div className="flex align-center">
- <Icon name="dashboard" size={22} className="mr2" color="#93A1AB" />
+ <Icon
+ name="dashboard"
+ size={22}
+ className="mr2"
+ color={colors["text-medium"]}
+ />
{t`Your dashboard was saved`}
<Link
className="link text-bold ml1"
@@ -91,7 +96,7 @@ class AutomaticDashboardApp extends React.Component {
// pull out "more" related items for displaying as a button at the bottom of the dashboard
const more = dashboard && dashboard.more;
const related = dashboard && dashboard.related;
- const hasSidebar = _.any(related || {}, list => list.length > 0);
+ const hasSidebar = related && related.length > 0;
return (
<div className="relative">
@@ -202,10 +207,10 @@ const getIconForFilter = (filter, metadata) => {
const suggestionClasses = cxs({
":hover h3": {
- color: "#509ee3",
+ color: colors["brand"],
},
":hover .Icon": {
- color: "#F9D45C",
+ color: colors["warning"],
},
});
@@ -245,9 +250,7 @@ const SuggestionsSidebar = ({ related }) => (
<div className="py2 text-centered my3">
<h3 className="text-grey-3">More X-rays</h3>
</div>
- {Object.entries(related).map(([section, suggestions]) => (
- <SuggestionsList section={section} suggestions={suggestions} />
- ))}
+ <SuggestionsList section="related" suggestions={related} />
</div>
);
diff --git a/frontend/src/metabase/dashboard/containers/DashCardCardParameterMapper.css b/frontend/src/metabase/dashboard/containers/DashCardCardParameterMapper.css
index bba6c6bc54dac14259edf53c1335bfade0f45110..59ba15b1068ec9fc4df205a22f7e46ce000da84f 100644
--- a/frontend/src/metabase/dashboard/containers/DashCardCardParameterMapper.css
+++ b/frontend/src/metabase/dashboard/containers/DashCardCardParameterMapper.css
@@ -1,22 +1,22 @@
:local(.button) {
composes: flex align-center bg-white text-bold cursor-pointer from "style";
font-size: 16px;
- border: 2px solid var(--brand-color);
+ border: 2px solid var(--color-brand);
border-radius: 4px;
min-height: 30px;
min-width: 100px;
padding: 0.25em 0.5em 0.25em 0.5em;
- color: var(--default-font-color);
+ color: var(--color-text-dark);
}
:local(.mapped) {
- border-color: var(--green-color);
- color: var(--green-color);
+ border-color: var(--color-accent1);
+ color: var(--color-accent1);
}
:local(.warn) {
- border-color: var(--error-color) !important;
- color: var(--error-color) !important;
+ border-color: var(--color-accent3) !important;
+ color: var(--color-error) !important;
}
:local(.disabled) {
diff --git a/frontend/src/metabase/entities/collections.js b/frontend/src/metabase/entities/collections.js
index 9362ef87b7e28bd8ab0f1a5b6cc43ce04b68ae11..d2139a0956a0388738d69a07d036ecedd19b2946 100644
--- a/frontend/src/metabase/entities/collections.js
+++ b/frontend/src/metabase/entities/collections.js
@@ -90,7 +90,7 @@ export const canonicalCollectionId = collectionId =>
export const ROOT_COLLECTION = {
id: "root",
- name: "Saved items",
+ name: "Our analytics",
location: "",
path: [],
};
diff --git a/frontend/src/metabase/entities/metrics.js b/frontend/src/metabase/entities/metrics.js
index e09e78879fa621c7d93e84d74460689ef81b74c1..73fd7795eb25b25e2a5942ca2571fe55798ef203 100644
--- a/frontend/src/metabase/entities/metrics.js
+++ b/frontend/src/metabase/entities/metrics.js
@@ -1,6 +1,7 @@
import { createEntity } from "metabase/lib/entities";
import { MetricSchema } from "metabase/schema";
+import colors from "metabase/lib/colors";
export default createEntity({
name: "metrics",
@@ -10,7 +11,7 @@ export default createEntity({
objectSelectors: {
getName: segment => segment && segment.name,
getUrl: segment => null,
- getColor: () => "#93B3C9",
+ getColor: () => colors["text-medium"],
getIcon: question => "metric",
},
});
diff --git a/frontend/src/metabase/entities/questions.js b/frontend/src/metabase/entities/questions.js
index 93596181d90fb6baf25d1f52320b06c4ed77077a..4e4403539fd71d07bf26f352fba242e3b4b13d67 100644
--- a/frontend/src/metabase/entities/questions.js
+++ b/frontend/src/metabase/entities/questions.js
@@ -1,10 +1,11 @@
/* @flow */
import React from "react";
+import { assocIn } from "icepick";
import { createEntity, undo } from "metabase/lib/entities";
import * as Urls from "metabase/lib/urls";
-import { assocIn } from "icepick";
+import colors from "metabase/lib/colors";
import CollectionSelect from "metabase/containers/CollectionSelect";
import { canonicalCollectionId } from "metabase/entities/collections";
@@ -62,7 +63,7 @@ const Questions = createEntity({
objectSelectors: {
getName: question => question && question.name,
getUrl: question => question && Urls.question(question.id),
- getColor: () => "#93B3C9",
+ getColor: () => colors["text-medium"],
getIcon: question => "beaker",
},
diff --git a/frontend/src/metabase/entities/segments.js b/frontend/src/metabase/entities/segments.js
index 058e4d520e7d37b95055a793a6a504edc1d070d5..5ad8e34c405e606fa8ecd3f23e8551cf3d4a49ec 100644
--- a/frontend/src/metabase/entities/segments.js
+++ b/frontend/src/metabase/entities/segments.js
@@ -3,6 +3,7 @@
import { createEntity } from "metabase/lib/entities";
import { SegmentSchema } from "metabase/schema";
+import colors from "metabase/lib/colors";
export default createEntity({
name: "segments",
@@ -12,7 +13,7 @@ export default createEntity({
objectSelectors: {
getName: segment => segment && segment.name,
getUrl: segment => null,
- getColor: () => "#93B3C9",
+ getColor: () => colors["text-medium"],
getIcon: question => "segment",
},
});
diff --git a/frontend/src/metabase/home/components/Activity.jsx b/frontend/src/metabase/home/components/Activity.jsx
index 22ae894fea0d37f8df77506ce66d43da2eb605b5..c4fc62ccd71c2711bcd6ffc09fcb5b5328b4f0d9 100644
--- a/frontend/src/metabase/home/components/Activity.jsx
+++ b/frontend/src/metabase/home/components/Activity.jsx
@@ -225,13 +225,6 @@ export default class Activity extends Component {
}
break;
case "database-sync":
- // NOTE: this is a relic from the very early days of the activity feed when we accidentally didn't
- // capture the name/description/engine of a Database properly in the details and so it was
- // possible for a database to be deleted and we'd lose any way of knowing what it's name was :(
- const oldName =
- item.database && "name" in item.database
- ? item.database.name
- : t`Unknown`;
if (item.details.name) {
description.summary = (
<span>
@@ -243,7 +236,13 @@ export default class Activity extends Component {
description.summary = (
<span>
{t`received the latest data from`}{" "}
- <span className="text-dark">{oldName}</span>
+ <span className="text-dark">
+ {/* NOTE: this is a relic from the very early days of the activity feed when we accidentally didn't
+ * capture the name/description/engine of a Database properly in the details and so it was
+ * possible for a database to be deleted and we'd lose any way of knowing what it's name was :(
+ */}
+ {(item.database && item.database.name) || t`Unknown`}
+ </span>
</span>
);
}
diff --git a/frontend/src/metabase/home/components/ActivityItem.jsx b/frontend/src/metabase/home/components/ActivityItem.jsx
index 53af487187923da4eb53e214df5a724ea878463a..194cc4039d15c29f6812f81d06ceb8ce27b5ccd8 100644
--- a/frontend/src/metabase/home/components/ActivityItem.jsx
+++ b/frontend/src/metabase/home/components/ActivityItem.jsx
@@ -3,6 +3,7 @@ import PropTypes from "prop-types";
import Icon from "metabase/components/Icon.jsx";
import IconBorder from "metabase/components/IconBorder.jsx";
import UserAvatar from "metabase/components/UserAvatar.jsx";
+import colors from "metabase/lib/colors";
export default class ActivityItem extends Component {
static propTypes = {
@@ -21,10 +22,10 @@ export default class ActivityItem extends Component {
<UserAvatar
user={item.user}
background={userColors}
- style={{ color: "#fff", borderWidth: "0" }}
+ style={{ color: colors["text-white"], borderWidth: 0 }}
/>
) : (
- <IconBorder style={{ color: "#B8C0C8" }}>
+ <IconBorder style={{ color: colors["text-light"] }}>
<Icon name="sync" size={16} />
</IconBorder>
)}
diff --git a/frontend/src/metabase/home/components/ActivityStory.jsx b/frontend/src/metabase/home/components/ActivityStory.jsx
index 6b3eecdbfcb748726079ba5ee633ce7aa9b7a273..0e378fd2414ce25b8d398d5e8ac5095ae274449c 100644
--- a/frontend/src/metabase/home/components/ActivityStory.jsx
+++ b/frontend/src/metabase/home/components/ActivityStory.jsx
@@ -1,6 +1,7 @@
import React, { Component } from "react";
import PropTypes from "prop-types";
import { Link } from "react-router";
+import colors from "metabase/lib/colors";
export default class ActivityStory extends Component {
constructor(props, context) {
@@ -8,7 +9,7 @@ export default class ActivityStory extends Component {
this.styles = {
borderWidth: "2px",
- borderColor: "#DFE8EA",
+ borderColor: colors["border"],
};
}
@@ -29,7 +30,7 @@ export default class ActivityStory extends Component {
style={{
borderWidth: "3px",
marginLeft: "22px",
- borderColor: "#F2F5F6",
+ borderColor: colors["border"],
}}
>
<div className="flex full ml4 bordered rounded p2" style={this.styles}>
diff --git a/frontend/src/metabase/home/components/NewUserOnboardingModal.jsx b/frontend/src/metabase/home/components/NewUserOnboardingModal.jsx
index 6867bb0b14388a68d06dd0657223f2a68411898a..bb064a97cf9851d193b0dcb2a361843069e0493d 100644
--- a/frontend/src/metabase/home/components/NewUserOnboardingModal.jsx
+++ b/frontend/src/metabase/home/components/NewUserOnboardingModal.jsx
@@ -4,6 +4,7 @@ import StepIndicators from "metabase/components/StepIndicators";
import RetinaImage from "react-retina-image";
import { t } from "c-3po";
import MetabaseSettings from "metabase/lib/settings";
+import colors from "metabase/lib/colors";
type Props = {
onClose: () => void,
@@ -106,8 +107,8 @@ const OnboardingImages = ({ currentStep }, { currentStep: object }) => (
<div
style={{
position: "relative",
- backgroundColor: "#F5F9FE",
- borderBottom: "1px solid #DCE1E4",
+ backgroundColor: colors["bg-medium"],
+ borderBottom: `1px solid ${colors["border"]}`,
height: 254,
paddingTop: "3em",
paddingBottom: "3em",
diff --git a/frontend/src/metabase/home/components/SidebarSection.jsx b/frontend/src/metabase/home/components/SidebarSection.jsx
index 2816ac1887252d6a0625b80c54efbf2c8e012145..64de827720c4dbe2eef75a261a3f13c8fd1ae185 100644
--- a/frontend/src/metabase/home/components/SidebarSection.jsx
+++ b/frontend/src/metabase/home/components/SidebarSection.jsx
@@ -1,6 +1,7 @@
import React from "react";
import Icon from "metabase/components/Icon.jsx";
+import colors from "metabase/lib/colors";
const SidebarSection = ({ title, icon, extra, children }) => (
<div className="px2 pt1">
@@ -9,7 +10,10 @@ const SidebarSection = ({ title, icon, extra, children }) => (
<span className="pl1 Sidebar-header">{title}</span>
{extra && <span className="float-right">{extra}</span>}
</div>
- <div className="rounded bg-white" style={{ border: "1px solid #E5E5E5" }}>
+ <div
+ className="rounded bg-white"
+ style={{ border: `1px solid ${colors["border"]}` }}
+ >
{children}
</div>
</div>
diff --git a/frontend/src/metabase/home/containers/SearchApp.jsx b/frontend/src/metabase/home/containers/SearchApp.jsx
index e535386df6c8d9e27f79cee9ff063535d6890f7c..475c7a7c54d8d281d54b20c21282c8f920f645d3 100644
--- a/frontend/src/metabase/home/containers/SearchApp.jsx
+++ b/frontend/src/metabase/home/containers/SearchApp.jsx
@@ -12,8 +12,6 @@ import Card from "metabase/components/Card";
import EntityItem from "metabase/components/EntityItem";
import Subhead from "metabase/components/Subhead";
-import { entityTypeForModel } from "metabase/schema";
-
export default class SearchApp extends React.Component {
render() {
return (
@@ -36,36 +34,89 @@ export default class SearchApp extends React.Component {
</Box>
<Box mt={4}>
<Subhead>{t`It's quiet around here...`}</Subhead>
- <Text
- >{t`Metabase couldn't find any results for this.`}</Text>
+ <p>{t`Metabase couldn't find any results for this.`}</p>
</Box>
</Flex>
);
}
+ const types = _.chain(list)
+ .groupBy("model")
+ .value();
+
return (
<Box>
- {_.chain(list)
- .groupBy("model")
- .pairs()
- .value()
- .map(([model, items]) => (
- <Box mt={2} mb={3}>
- <div className="text-uppercase text-grey-4 text-small text-bold my1">
- {entityTypeForModel(model)}
- </div>
- <Card>
- {items.map(item => (
- <Link to={item.getUrl()}>
- <EntityItem
- name={item.getName()}
- iconName={item.getIcon()}
- iconColor={item.getColor()}
- />
- </Link>
- ))}
- </Card>
- </Box>
- ))}
+ {types.dashboard && (
+ <Box mt={2} mb={3}>
+ <div className="text-uppercase text-grey-4 text-small text-bold my1">
+ {t`Dashboards`}
+ </div>
+ <Card px={2}>
+ {types.dashboard.map(item => (
+ <Link to={item.getUrl()}>
+ <EntityItem
+ name={item.getName()}
+ iconName={item.getIcon()}
+ iconColor={item.getColor()}
+ />
+ </Link>
+ ))}
+ </Card>
+ </Box>
+ )}
+ {types.collection && (
+ <Box mt={2} mb={3}>
+ <div className="text-uppercase text-grey-4 text-small text-bold my1">
+ {t`Collections`}
+ </div>
+ <Card px={2}>
+ {types.collection.map(item => (
+ <Link to={item.getUrl()}>
+ <EntityItem
+ name={item.getName()}
+ iconName={item.getIcon()}
+ iconColor={item.getColor()}
+ />
+ </Link>
+ ))}
+ </Card>
+ </Box>
+ )}
+ {types.card && (
+ <Box mt={2} mb={3}>
+ <div className="text-uppercase text-grey-4 text-small text-bold my1">
+ {t`Questions`}
+ </div>
+ <Card px={2}>
+ {types.card.map(item => (
+ <Link to={item.getUrl()}>
+ <EntityItem
+ name={item.getName()}
+ iconName={item.getIcon()}
+ iconColor={item.getColor()}
+ />
+ </Link>
+ ))}
+ </Card>
+ </Box>
+ )}
+ {types.pulse && (
+ <Box mt={2} mb={3}>
+ <div className="text-uppercase text-grey-4 text-small text-bold my1">
+ {t`Pulse`}
+ </div>
+ <Card px={2}>
+ {types.pulse.map(item => (
+ <Link to={item.getUrl()}>
+ <EntityItem
+ name={item.getName()}
+ iconName={item.getIcon()}
+ iconColor={item.getColor()}
+ />
+ </Link>
+ ))}
+ </Card>
+ </Box>
+ )}
</Box>
);
}}
diff --git a/frontend/src/metabase/icon_paths.js b/frontend/src/metabase/icon_paths.js
index d3b5c6d8b0df32b1825d23de5b3b2394b1f3876d..ec21e42f56f66b7d1a5de3bb3c85176019f148fa 100644
--- a/frontend/src/metabase/icon_paths.js
+++ b/frontend/src/metabase/icon_paths.js
@@ -1,4 +1,5 @@
/* @flow weak */
+/* eslint-disable no-color-literals */
/*
Metabase Icon Paths
@@ -45,6 +46,8 @@ export const ICON_PATHS = {
"M2 23.467h6.4V32H2v-8.533zm10.667-12.8h6.4V32h-6.4V10.667zM23.333 0h6.4v32h-6.4V0z",
beaker:
"M4.31736354,31.1631075 C3.93810558,30.6054137 3.89343681,29.6635358 4.20559962,29.0817181 L11.806982,14.9140486 L11.8069821,10.5816524 L10.7015144,10.4653256 C10.0309495,10.394763 9.48734928,9.78799739 9.48734928,9.12166999 L9.48734928,7.34972895 C9.48734928,6.67821106 10.0368737,6.13383825 10.7172248,6.13383825 L21.8462005,6.13383825 C22.525442,6.13383825 23.0760761,6.68340155 23.0760761,7.34972895 L23.0760761,9.12166999 C23.0760761,9.79318788 22.5250158,10.3375607 21.856025,10.3375607 L20.9787023,10.3375607 L20.9787024,14.9281806 L28.77277,29.0827118 C29.0983515,29.6739888 29.0709073,30.6193105 28.7174156,31.1846409 L28.852457,30.9686726 C28.4963041,31.538259 27.6541076,32 26.9865771,32 L6.10749779,32 C5.43315365,32 4.58248747,31.5529687 4.19978245,30.9902061 L4.31736354,31.1631075 Z M15.5771418,17.6040443 C16.5170398,17.6040443 17.2789777,16.8377777 17.2789777,15.89254 C17.2789777,14.9473023 16.5170398,14.1810358 15.5771418,14.1810358 C14.6372438,14.1810358 13.8753059,14.9473023 13.8753059,15.89254 C13.8753059,16.8377777 14.6372438,17.6040443 15.5771418,17.6040443 Z M16.5496195,12.8974079 C17.8587633,12.8974079 18.9200339,11.830108 18.9200339,10.5135268 C18.9200339,9.1969457 17.8587633,8.1296458 16.5496195,8.1296458 C15.2404758,8.1296458 14.1792052,9.1969457 14.1792052,10.5135268 C14.1792052,11.830108 15.2404758,12.8974079 16.5496195,12.8974079 Z M5.71098553,30.2209651 L10.9595331,20.5151267 C10.9595331,20.5151267 12.6834557,21.2672852 14.3734184,21.2672852 C16.0633811,21.2672852 16.8198616,19.2872624 17.588452,18.6901539 C18.3570425,18.0930453 19.9467191,17.1113296 19.9467191,17.1113296 L27.0506095,30.1110325 L5.71098553,30.2209651 Z M13.6608671,4.37817079 C14.4114211,4.37817079 15.0198654,3.78121712 15.0198654,3.04483745 C15.0198654,2.30845779 14.4114211,1.71150412 13.6608671,1.71150412 C12.9103132,1.71150412 12.3018689,2.30845779 12.3018689,3.04483745 C12.3018689,3.78121712 12.9103132,4.37817079 13.6608671,4.37817079 Z M17.9214578,2.45333328 C18.6119674,2.45333328 19.1717361,1.90413592 19.1717361,1.22666664 C19.1717361,0.549197362 18.6119674,0 17.9214578,0 C17.2309481,0 16.6711794,0.549197362 16.6711794,1.22666664 C16.6711794,1.90413592 17.2309481,2.45333328 17.9214578,2.45333328 Z",
+ bell:
+ "M14.254 5.105c-7.422.874-8.136 7.388-8.136 11.12 0 4.007 0 5.61-.824 6.411-.549.535-1.647.802-3.294.802v4.006h28v-4.006c-1.647 0-2.47 0-3.294-.802-.55-.534-.824-3.205-.824-8.013-.493-5.763-3.205-8.936-8.136-9.518a2.365 2.365 0 0 0 .725-1.701C18.47 2.076 17.364 1 16 1s-2.47 1.076-2.47 2.404c0 .664.276 1.266.724 1.7zM11.849 29c.383 1.556 1.793 2.333 4.229 2.333s3.845-.777 4.229-2.333h-8.458z",
bolt: "M21.697 0L8 16.809l7.549 2.538L11.687 32l12.652-16.6-7.695-2.317z",
breakout:
"M24.47 1H32v7.53h-7.53V1zm0 11.294H32v7.53h-7.53v-7.53zm0 11.294H32v7.53h-7.53v-7.53zM0 1h9.412v30.118H0V1zm11.731 13.714c.166-.183.452-.177.452-.177h6.475s-1.601-2.053-2.07-2.806c-.469-.753-.604-1.368 0-1.905.603-.536 1.226-.281 1.878.497.652.779 2.772 3.485 3.355 4.214.583.73.65 1.965 0 2.835-.65.87-2.65 4.043-3.163 4.65-.514.607-1.123.713-1.732.295-.609-.419-.838-1.187-.338-1.872.5-.684 2.07-3.073 2.07-3.073h-6.475s-.27 0-.46-.312-.151-.612-.151-.612l.007-1.246s-.014-.306.152-.488z",
@@ -246,7 +249,7 @@ export const ICON_PATHS = {
permissionsLimited:
"M0,16 C0,7.163444 7.163444,0 16,0 C24.836556,0 32,7.163444 32,16 C32,24.836556 24.836556,32 16,32 C7.163444,32 0,24.836556 0,16 Z M29,16 C29,8.82029825 23.1797017,3 16,3 C8.82029825,3 3,8.82029825 3,16 C3,23.1797017 8.82029825,29 16,29 C23.1797017,29 29,23.1797017 29,16 Z M16,5 C11.0100706,5.11743299 5.14533409,7.90852303 5,15.5 C4.85466591,23.091477 11.0100706,26.882567 16,27 L16,5 Z",
person:
- "M16.12 20.392c-4.38 0-7.932-4.117-7.932-9.196S11.739 2 16.12 2c4.38 0 7.932 4.117 7.932 9.196 0 5.08-3.551 9.196-7.932 9.196zm14.644 10.51H1.476c0-4.218 2.608-7.932 6.563-10.1 2.088 2.185 4.938 3.532 8.081 3.532s5.993-1.347 8.081-3.533c3.955 2.169 6.563 5.883 6.563 10.101z",
+ "M16.068.005c5.181-.185 7.295 4.545 7.295 7.258s-1.34 6.71-3.607 8.77c-.5.456-.408 3.34.686 3.808 2.294.982 8.57 2.97 8.808 7.065.265 4.558-7.968 5.022-13.043 5.022-5.075 0-13.207-.62-13.207-4.45 0-1.776.178-2.944 3.106-4.92 2.927-1.978 5.16-2.462 5.645-2.763.486-.3 1.384-1.861.8-3.606 0 0-3.518-3.842-3.518-8.074 0-4.232 1.853-7.925 7.035-8.11z",
pie:
"M15.181 15.435V.021a15.94 15.94 0 0 1 11.42 3.995l-11.42 11.42zm1.131 1.384H31.98a15.941 15.941 0 0 0-4.114-11.553L16.312 16.819zm15.438 2.013H13.168V.25C5.682 1.587 0 8.13 0 16c0 8.837 7.163 16 16 16 7.87 0 14.413-5.682 15.75-13.168z",
pin:
diff --git a/frontend/src/metabase/lib/ace/sql_behaviour.js b/frontend/src/metabase/lib/ace/sql_behaviour.js
index 8435b1bb846b1b13d836f289365a842770c3c52c..fb85fb71b95560a1db2c774f826b3d47e47a4401 100644
--- a/frontend/src/metabase/lib/ace/sql_behaviour.js
+++ b/frontend/src/metabase/lib/ace/sql_behaviour.js
@@ -55,10 +55,13 @@ ace.require(
let id = -1;
if (editor.multiSelect) {
id = editor.selection.index;
- if (contextCache.rangeCount != editor.multiSelect.rangeCount)
+ if (contextCache.rangeCount != editor.multiSelect.rangeCount) {
contextCache = { rangeCount: editor.multiSelect.rangeCount };
+ }
+ }
+ if (contextCache[id]) {
+ return (context = contextCache[id]);
}
- if (contextCache[id]) return (context = contextCache[id]);
context = contextCache[id] = {
autoInsertedBrackets: 0,
autoInsertedRow: -1,
@@ -167,8 +170,9 @@ ace.require(
if (
this.lineCommentStart &&
this.lineCommentStart.indexOf(text) != -1
- )
+ ) {
return;
+ }
initContext(editor);
let quote = text;
let selection = editor.getSelectionRange();
@@ -189,8 +193,9 @@ ace.require(
let token = session.getTokenAt(cursor.row, cursor.column);
let rightToken = session.getTokenAt(cursor.row, cursor.column + 1);
// We're escaped.
- if (leftChar == "\\" && token && /escape/.test(token.type))
+ if (leftChar == "\\" && token && /escape/.test(token.type)) {
return null;
+ }
let stringBefore = token && /string|escape/.test(token.type);
let stringAfter =
@@ -199,17 +204,27 @@ ace.require(
let pair;
if (rightChar == quote) {
pair = stringBefore !== stringAfter;
- if (pair && /string\.end/.test(rightToken.type)) pair = false;
+ if (pair && /string\.end/.test(rightToken.type)) {
+ pair = false;
+ }
} else {
- if (stringBefore && !stringAfter) return null; // wrap string with different quote
- if (stringBefore && stringAfter) return null; // do not pair quotes inside strings
+ if (stringBefore && !stringAfter) {
+ return null;
+ } // wrap string with different quote
+ if (stringBefore && stringAfter) {
+ return null;
+ } // do not pair quotes inside strings
let wordRe = session.$mode.tokenRe;
wordRe.lastIndex = 0;
let isWordBefore = wordRe.test(leftChar);
wordRe.lastIndex = 0;
let isWordAfter = wordRe.test(leftChar);
- if (isWordBefore || isWordAfter) return null; // before or after alphanumeric
- if (rightChar && !/[\s;,.})\]\\]/.test(rightChar)) return null; // there is rightChar and it isn't closing
+ if (isWordBefore || isWordAfter) {
+ return null;
+ } // before or after alphanumeric
+ if (rightChar && !/[\s;,.})\]\\]/.test(rightChar)) {
+ return null;
+ } // there is rightChar and it isn't closing
pair = true;
}
return {
@@ -265,8 +280,9 @@ ace.require(
iterator2.getCurrentToken() || "text",
SAFE_INSERT_IN_TOKENS,
)
- )
+ ) {
return false;
+ }
}
// Only insert in front of whitespace/comments
@@ -294,8 +310,9 @@ ace.require(
line,
context.autoInsertedLineEnd[0],
)
- )
+ ) {
context.autoInsertedBrackets = 0;
+ }
context.autoInsertedRow = cursor.row;
context.autoInsertedLineEnd = bracket + line.substr(cursor.column);
context.autoInsertedBrackets++;
@@ -304,8 +321,9 @@ ace.require(
SQLBehaviour.recordMaybeInsert = function(editor, session, bracket) {
let cursor = editor.getCursorPosition();
let line = session.doc.getLine(cursor.row);
- if (!this.isMaybeInsertedClosing(cursor, line))
+ if (!this.isMaybeInsertedClosing(cursor, line)) {
context.maybeInsertedBrackets = 0;
+ }
context.maybeInsertedRow = cursor.row;
context.maybeInsertedLineStart = line.substr(0, cursor.column) + bracket;
context.maybeInsertedLineEnd = line.substr(cursor.column);
diff --git a/frontend/src/metabase/lib/ace/theme-metabase.js b/frontend/src/metabase/lib/ace/theme-metabase.js
index 64b52410d885cb0476c1e7d5223312965c66f95b..d54a51d97116a40710072032e306573c712171a4 100644
--- a/frontend/src/metabase/lib/ace/theme-metabase.js
+++ b/frontend/src/metabase/lib/ace/theme-metabase.js
@@ -1,5 +1,6 @@
/*global ace*/
-/* eslint "import/no-commonjs": 0 */
+/* eslint-disable import/no-commonjs */
+/* eslint-disable no-color-literals */
ace.define(
"ace/theme/metabase",
["require", "exports", "module", "ace/lib/dom"],
diff --git a/frontend/src/metabase/lib/auth.js b/frontend/src/metabase/lib/auth.js
index 92f1d263ab6ed24f85f7d43c679a6632da793178..63c3300347e51ccbc82487c70f42dddb0fe73869 100644
--- a/frontend/src/metabase/lib/auth.js
+++ b/frontend/src/metabase/lib/auth.js
@@ -6,7 +6,9 @@ export function clearGoogleAuthCredentials() {
typeof gapi !== "undefined" && gapi && gapi.auth2
? gapi.auth2.getAuthInstance()
: undefined;
- if (!googleAuth) return;
+ if (!googleAuth) {
+ return;
+ }
try {
googleAuth.signOut().then(function() {
diff --git a/frontend/src/metabase/lib/colors.js b/frontend/src/metabase/lib/colors.js
index 93807810d9fb93798c78eb42f41f5c3c21112ea9..09fa1a88d8e38521c557fcd35c074a1200e2cf8d 100644
--- a/frontend/src/metabase/lib/colors.js
+++ b/frontend/src/metabase/lib/colors.js
@@ -1,82 +1,117 @@
// @flow
import d3 from "d3";
+import Color from "color";
+import { Harmonizer } from "color-harmony";
type ColorName = string;
-type Color = string;
-type ColorFamily = { [name: ColorName]: Color };
+type ColorString = string;
+type ColorFamily = { [name: ColorName]: ColorString };
-export const normal = {
- blue: "#509EE3",
- green: "#9CC177",
- purple: "#A989C5",
- red: "#EF8C8C",
- yellow: "#f9d45c",
- orange: "#F1B556",
- teal: "#A6E7F3",
- indigo: "#7172AD",
- gray: "#7B8797",
- grey1: "#DCE1E4",
- grey2: "#93A1AB",
- grey3: "#2E353B",
- text: "#2E353B",
+// NOTE: DO NOT ADD COLORS WITHOUT EXTREMELY GOOD REASON AND DESIGN REVIEW
+// NOTE: KEEP SYNCRONIZED WITH COLORS.CSS
+/* eslint-disable no-color-literals */
+const colors = {
+ brand: "#509EE3",
+ accent1: "#9CC177",
+ accent2: "#A989C5",
+ accent3: "#EF8C8C",
+ accent4: "#F9D45C",
+ accent5: "#F1B556",
+ accent6: "#A6E7F3",
+ accent7: "#7172AD",
+ white: "#FFFFFF",
+ black: "#2E353B",
+ success: "#84BB4C",
+ error: "#ED6E6E",
+ warning: "#F9CF48",
+ "text-dark": "#2E353B",
+ "text-medium": "#74838F",
+ "text-light": "#C7CFD4",
+ "text-white": "#FFFFFF",
+ "bg-black": "#2E353B",
+ "bg-dark": "#93A1AB",
+ "bg-medium": "#EDF2F5",
+ "bg-light": "#F9FBFC",
+ "bg-white": "#FFFFFF",
+ shadow: "rgba(0,0,0,0.08)",
+ border: "#D7DBDE",
};
+/* eslint-enable no-color-literals */
+export default colors;
-export const saturated = {
- blue: "#2D86D4",
- green: "#84BB4C",
- purple: "#885AB1",
- red: "#ED6E6E",
- yellow: "#F9CF48",
-};
+export const harmony = [];
-export const desaturated = {
- blue: "#72AFE5",
- green: "#A8C987",
- purple: "#B8A2CC",
- red: "#EEA5A5",
- yellow: "#F7D97B",
-};
+// DEPRECATED: we should remove these and use `colors` directly
+// compute satured/desaturated variants using "color" lib if absolutely required
+export const normal = {};
+export const saturated = {};
+export const desaturated = {};
+
+// make sure to do the initial "sync"
+syncColors();
+
+export function syncColors() {
+ syncHarmony();
+ syncDeprecatedColorFamilies();
+}
-export const harmony = [
- "#509ee3",
- "#9cc177",
- "#a989c5",
- "#ef8c8c",
- "#f9d45c",
- "#F1B556",
- "#A6E7F3",
- "#7172AD",
- "#7B8797",
- "#6450e3",
- "#55e350",
- "#e35850",
- "#77c183",
- "#7d77c1",
- "#c589b9",
- "#bec589",
- "#89c3c5",
- "#c17777",
- "#899bc5",
- "#efce8c",
- "#50e3ae",
- "#be8cef",
- "#8cefc6",
- "#ef8cde",
- "#b5f95c",
- "#5cc2f9",
- "#f95cd0",
- "#c1a877",
- "#f95c67",
-];
+function syncHarmony() {
+ const harmonizer = new Harmonizer();
+ const initialColors = [
+ colors["brand"],
+ colors["accent1"],
+ colors["accent2"],
+ colors["accent3"],
+ colors["accent4"],
+ colors["accent5"],
+ colors["accent6"],
+ colors["accent7"],
+ ];
+ harmony.splice(0, harmony.length);
+ // round 0 includes brand and all accents
+ harmony.push(...initialColors);
+ // rounds 1-4 generated harmony
+ // only harmonize brand and accents 1 through 4
+ const initialColorHarmonies = initialColors
+ .slice(0, 5)
+ .map(color => harmonizer.harmonize(color, "fiveToneD"));
+ for (let roundIndex = 1; roundIndex < 5; roundIndex++) {
+ for (
+ let colorIndex = 0;
+ colorIndex < initialColorHarmonies.length;
+ colorIndex++
+ ) {
+ harmony.push(initialColorHarmonies[colorIndex][roundIndex]);
+ }
+ }
+}
-export const getRandomColor = (family: ColorFamily): Color => {
+// syncs deprecated color families for legacy code
+function syncDeprecatedColorFamilies() {
+ // normal + saturated + desaturated
+ normal.blue = saturated.blue = desaturated.blue = colors["brand"];
+ normal.green = saturated.green = desaturated.green = colors["accent1"];
+ normal.purple = saturated.purple = desaturated.purple = colors["accent2"];
+ normal.red = saturated.red = desaturated.red = colors["accent3"];
+ normal.yellow = saturated.yellow = desaturated.yellow = colors["accent4"];
+ normal.orange = colors["accent5"];
+ normal.teal = colors["accent6"];
+ normal.indigo = colors["accent7"];
+ normal.gray = colors["text-medium"];
+ normal.grey1 = colors["text-light"];
+ normal.grey2 = colors["text-medium"];
+ normal.grey3 = colors["text-dark"];
+ normal.text = colors["text-dark"];
+}
+
+export const getRandomColor = (family: ColorFamily): ColorString => {
// $FlowFixMe: Object.values doesn't preserve the type :-/
- const colors: Color[] = Object.values(family);
+ const colors: ColorString[] = Object.values(family);
return colors[Math.floor(Math.random() * colors.length)];
};
-type ColorScale = (input: number) => Color;
+type ColorScale = (input: number) => ColorString;
export const getColorScale = (
extent: [number, number],
@@ -92,3 +127,13 @@ export const getColorScale = (
)
.range(colors);
};
+
+export const alpha = (color: ColorString, alpha: number): ColorString =>
+ Color(color)
+ .alpha(alpha)
+ .string();
+
+export const darken = (color: ColorString, factor: number): ColorString =>
+ Color(color)
+ .darken(factor)
+ .string();
diff --git a/frontend/src/metabase/lib/pulse.js b/frontend/src/metabase/lib/pulse.js
index 175253f5c69e15a3f2be4d1278c0b44e0a2d6a3a..c405bbc01b450e4aae356de138913e0274bb2a33 100644
--- a/frontend/src/metabase/lib/pulse.js
+++ b/frontend/src/metabase/lib/pulse.js
@@ -8,14 +8,17 @@ export function channelIsValid(channel, channelSpec) {
return true;
}
// these cases intentionally fall though
+ // eslint-disable-next-line no-fallthrough
case "weekly":
if (channel.schedule_day == null) {
return false;
}
+ // eslint-disable-next-line no-fallthrough
case "daily":
if (channel.schedule_hour == null) {
return false;
}
+ // eslint-disable-next-line no-fallthrough
case "hourly":
break;
default:
diff --git a/frontend/src/metabase/lib/query.js b/frontend/src/metabase/lib/query.js
index cdfb23a347e695a4297bffa58d03cd3b78a9be40..04814a59d0d0299ae9a7780dfd725be0bb22d9a3 100644
--- a/frontend/src/metabase/lib/query.js
+++ b/frontend/src/metabase/lib/query.js
@@ -205,7 +205,9 @@ const Query = {
delete query.limit;
}
- if (query.expressions) delete query.expressions[""]; // delete any empty expressions
+ if (query.expressions) {
+ delete query.expressions[""];
+ } // delete any empty expressions
return query;
},
@@ -315,11 +317,15 @@ const Query = {
// remove an expression with NAME. Returns scrubbed QUERY with all references to expression removed.
removeExpression(query, name) {
- if (!query.expressions) return query;
+ if (!query.expressions) {
+ return query;
+ }
delete query.expressions[name];
- if (_.isEmpty(query.expressions)) delete query.expressions;
+ if (_.isEmpty(query.expressions)) {
+ delete query.expressions;
+ }
// ok, now "scrub" the query to remove any references to the expression
function isExpressionReference(obj) {
diff --git a/frontend/src/metabase/lib/query/util.js b/frontend/src/metabase/lib/query/util.js
index f858f63b47ae6e3471da76880fd33aae8be10c6a..2fb6040e91cdb18be620b6e1a9e1b723a211e686 100644
--- a/frontend/src/metabase/lib/query/util.js
+++ b/frontend/src/metabase/lib/query/util.js
@@ -11,11 +11,17 @@ export const mbqlEq = (a: string, b: string): boolean => mbql(a) === mbql(b);
// doing a simple comparison because field IDs are not guaranteed to be numeric:
// the might be FieldLiterals, e.g. [field-literal <name> <unit>], instead.
export const fieldIdsEq = (a: any, b: any): boolean => {
- if (typeof a !== typeof b) return false;
+ if (typeof a !== typeof b) {
+ return false;
+ }
- if (typeof a === "number") return a === b;
+ if (typeof a === "number") {
+ return a === b;
+ }
- if (a == null && b == null) return true;
+ if (a == null && b == null) {
+ return true;
+ }
// field literals
if (
diff --git a/frontend/src/metabase/lib/query_time.js b/frontend/src/metabase/lib/query_time.js
index d9baad1e73c313ddb5a23f5e85c6f84a633f1c93..31aad3bb9a62c8190ec2550567fca0528e548334 100644
--- a/frontend/src/metabase/lib/query_time.js
+++ b/frontend/src/metabase/lib/query_time.js
@@ -119,7 +119,9 @@ export function generateTimeIntervalDescription(n, unit) {
}
}
- if (!unit && n === 0) return "Today"; // ['relative-datetime', 'current'] is a legal MBQL form but has no unit
+ if (!unit && n === 0) {
+ return "Today";
+ } // ['relative-datetime', 'current'] is a legal MBQL form but has no unit
unit = inflection.capitalize(unit);
if (typeof n === "string") {
@@ -227,13 +229,23 @@ export function parseFieldTarget(field) {
}
export function parseFieldTargetId(field) {
- if (Number.isInteger(field)) return field;
+ if (Number.isInteger(field)) {
+ return field;
+ }
if (Array.isArray(field)) {
- if (mbqlEq(field[0], "field-id")) return field[1];
- if (mbqlEq(field[0], "fk->")) return field[1];
- if (mbqlEq(field[0], "datetime-field")) return parseFieldTargetId(field[1]);
- if (mbqlEq(field[0], "field-literal")) return field;
+ if (mbqlEq(field[0], "field-id")) {
+ return field[1];
+ }
+ if (mbqlEq(field[0], "fk->")) {
+ return field[1];
+ }
+ if (mbqlEq(field[0], "datetime-field")) {
+ return parseFieldTargetId(field[1]);
+ }
+ if (mbqlEq(field[0], "field-literal")) {
+ return field;
+ }
}
console.warn("Unknown field format", field);
diff --git a/frontend/src/metabase/lib/schema_metadata.js b/frontend/src/metabase/lib/schema_metadata.js
index 0fdb77f1cf3703366f40ec9afcc6ca108d349ddf..a97776048ff7300caa389d6fa4f37e4bd1a155a2 100644
--- a/frontend/src/metabase/lib/schema_metadata.js
+++ b/frontend/src/metabase/lib/schema_metadata.js
@@ -74,28 +74,38 @@ const TYPES = {
};
export function isFieldType(type, field) {
- if (!field) return false;
+ if (!field) {
+ return false;
+ }
const typeDefinition = TYPES[type];
// check to see if it belongs to any of the field types:
for (const prop of ["base", "special"]) {
const allowedTypes = typeDefinition[prop];
- if (!allowedTypes) continue;
+ if (!allowedTypes) {
+ continue;
+ }
const fieldType = field[prop + "_type"];
for (const allowedType of allowedTypes) {
- if (isa(fieldType, allowedType)) return true;
+ if (isa(fieldType, allowedType)) {
+ return true;
+ }
}
}
// recursively check to see if it's NOT another field type:
for (const excludedType of typeDefinition.exclude || []) {
- if (isFieldType(excludedType, field)) return false;
+ if (isFieldType(excludedType, field)) {
+ return false;
+ }
}
// recursively check to see if it's another field type:
for (const includedType of typeDefinition.include || []) {
- if (isFieldType(includedType, field)) return true;
+ if (isFieldType(includedType, field)) {
+ return true;
+ }
}
return false;
}
@@ -112,7 +122,9 @@ export function getFieldType(field) {
STRING_LIKE,
BOOLEAN,
]) {
- if (isFieldType(type, field)) return type;
+ if (isFieldType(type, field)) {
+ return type;
+ }
}
}
diff --git a/frontend/src/metabase/lib/settings.js b/frontend/src/metabase/lib/settings.js
index 32d974ecd84589cfda2d01e2056c72148680a2fc..b4ce8ba18b232ae7bb0afc4288a7573e4c8dd6e9 100644
--- a/frontend/src/metabase/lib/settings.js
+++ b/frontend/src/metabase/lib/settings.js
@@ -67,7 +67,9 @@ const MetabaseSettings = {
let versionInfo = _.findWhere(settings, { key: "version-info" }),
currentVersion = MetabaseSettings.get("version").tag;
- if (versionInfo) versionInfo = versionInfo.value;
+ if (versionInfo) {
+ versionInfo = versionInfo.value;
+ }
return (
versionInfo &&
diff --git a/frontend/src/metabase/lib/types.js b/frontend/src/metabase/lib/types.js
index f9bc4bfbd88d6da315af989c52affd1cdf393894..2158c9766ddcbbead6feec81b763715f8cccc008 100644
--- a/frontend/src/metabase/lib/types.js
+++ b/frontend/src/metabase/lib/types.js
@@ -9,18 +9,26 @@ const PARENTS = MetabaseSettings.get("types");
/// isa(TYPE.BigInteger, TYPE.Number) -> true
/// isa(TYPE.Text, TYPE.Boolean) -> false
export function isa(child, ancestor) {
- if (!child || !ancestor) return false;
+ if (!child || !ancestor) {
+ return false;
+ }
- if (child === ancestor) return true;
+ if (child === ancestor) {
+ return true;
+ }
const parents = PARENTS[child];
if (!parents) {
- if (child !== "type/*") console.error("Invalid type:", child); // the base type is the only type with no parents, so anything else that gets here is invalid
+ if (child !== "type/*") {
+ console.error("Invalid type:", child);
+ } // the base type is the only type with no parents, so anything else that gets here is invalid
return false;
}
for (const parent of parents) {
- if (isa(parent, ancestor)) return true;
+ if (isa(parent, ancestor)) {
+ return true;
+ }
}
return false;
diff --git a/frontend/src/metabase/lib/urls.js b/frontend/src/metabase/lib/urls.js
index bf64dfeabc7f0fff73983c480c036ce4195421b8..76d675bc8326ae8ea679ee287607db2fd7d94e10 100644
--- a/frontend/src/metabase/lib/urls.js
+++ b/frontend/src/metabase/lib/urls.js
@@ -22,16 +22,8 @@ export function question(cardId, hash = "", query = "") {
hash = serializeCardForUrl(hash);
}
if (query && typeof query === "object") {
- query = Object.entries(query)
- .map(kv => {
- if (Array.isArray(kv[1])) {
- return kv[1]
- .map(v => `${encodeURIComponent(kv[0])}=${encodeURIComponent(v)}`)
- .join("&");
- } else {
- return kv.map(encodeURIComponent).join("=");
- }
- })
+ query = extractQueryParams(query)
+ .map(kv => kv.map(encodeURIComponent).join("="))
.join("&");
}
if (hash && hash.charAt(0) !== "#") {
@@ -46,13 +38,26 @@ export function question(cardId, hash = "", query = "") {
: `/question${query}${hash}`;
}
+export const extractQueryParams = (query: Object): Array => {
+ return [].concat(...Object.entries(query).map(flattenParam));
+};
+
+const flattenParam = ([key, value]) => {
+ if (value instanceof Array) {
+ return value.map(p => [key, p]);
+ }
+ return [[key, value]];
+};
+
export function plainQuestion() {
return Question.create({ metadata: null }).getUrl();
}
export function dashboard(dashboardId, { addCardWithId } = {}) {
return addCardWithId != null
- ? `/dashboard/${dashboardId}#add=${addCardWithId}`
+ ? // NOTE: no-color-literals rule thinks #add is a color, oops
+ // eslint-disable-next-line no-color-literals
+ `/dashboard/${dashboardId}#add=${addCardWithId}`
: `/dashboard/${dashboardId}`;
}
@@ -120,3 +125,7 @@ export function embedDashboard(token) {
export function userCollection(userCollectionId) {
return `/collection/${userCollectionId}/`;
}
+
+export function accountSettings() {
+ return `/user/edit_current`;
+}
diff --git a/frontend/src/metabase/lib/utils.js b/frontend/src/metabase/lib/utils.js
index 7a72fe7fcdb895f8347cb5bfc6f5270ddadccbdd..a1077a37bffb2bf78e8ad408cb34bf5163d9fa37 100644
--- a/frontend/src/metabase/lib/utils.js
+++ b/frontend/src/metabase/lib/utils.js
@@ -44,7 +44,9 @@ let MetabaseUtils = {
},
isEmpty: function(str) {
- if (str != null) str = String(str); // make sure 'str' is actually a string
+ if (str != null) {
+ str = String(str);
+ } // make sure 'str' is actually a string
return str == null || 0 === str.length || str.match(/^\s+$/) != null;
},
diff --git a/frontend/src/metabase/nav/components/ProfileLink.jsx b/frontend/src/metabase/nav/components/ProfileLink.jsx
index 951875fab9a63c1ce4783b1d92fef0444f57db55..00bc2f86af16f0f964135991e402cc573abc3341 100644
--- a/frontend/src/metabase/nav/components/ProfileLink.jsx
+++ b/frontend/src/metabase/nav/components/ProfileLink.jsx
@@ -1,20 +1,18 @@
import React, { Component } from "react";
import PropTypes from "prop-types";
-import { Link } from "react-router";
+import { Box } from "grid-styled";
-import OnClickOutsideWrapper from "metabase/components/OnClickOutsideWrapper";
import { t } from "c-3po";
-import cx from "classnames";
import _ from "underscore";
import { capitalize } from "metabase/lib/formatting";
import MetabaseSettings from "metabase/lib/settings";
-import Modal from "metabase/components/Modal.jsx";
-import Logs from "metabase/components/Logs.jsx";
+import * as Urls from "metabase/lib/urls";
+import Modal from "metabase/components/Modal";
+import Logs from "metabase/components/Logs";
-import UserAvatar from "metabase/components/UserAvatar.jsx";
-import Icon from "metabase/components/Icon.jsx";
-import LogoIcon from "metabase/components/LogoIcon.jsx";
+import LogoIcon from "metabase/components/LogoIcon";
+import EntityMenu from "metabase/components/EntityMenu";
export default class ProfileLink extends Component {
constructor(props, context) {
@@ -56,141 +54,45 @@ export default class ProfileLink extends Component {
}
render() {
- const { user, context } = this.props;
- const { modalOpen, dropdownOpen } = this.state;
+ const { context } = this.props;
+ const { modalOpen } = this.state;
const { tag, date, ...versionExtra } = MetabaseSettings.get("version");
-
- let dropDownClasses = cx({
- NavDropdown: true,
- "inline-block": true,
- "cursor-pointer": true,
- open: dropdownOpen,
- });
-
+ const admin = context === "admin";
return (
- <div className={dropDownClasses}>
- <a
- data-metabase-event={"Navbar;Profile Dropdown;Toggle"}
- className="NavDropdown-button NavItem flex align-center p2 transition-background"
- onClick={this.toggleDropdown}
- >
- <div className="NavDropdown-button-layer">
- <div className="flex align-center">
- <UserAvatar user={user} />
- <Icon
- name="chevrondown"
- className="Dropdown-chevron ml1"
- size={8}
- />
- </div>
- </div>
- </a>
-
- {dropdownOpen ? (
- <OnClickOutsideWrapper handleDismissal={this.closeDropdown}>
- <div className="NavDropdown-content right">
- <ul className="NavDropdown-content-layer">
- {!user.google_auth && !user.ldap_auth ? (
- <li>
- <Link
- to="/user/edit_current"
- data-metabase-event={
- "Navbar;Profile Dropdown;Edit Profile"
- }
- onClick={this.closeDropdown}
- className="Dropdown-item block text-white no-decoration"
- >
- {t`Account Settings`}
- </Link>
- </li>
- ) : null}
-
- {user.is_superuser && context !== "admin" ? (
- <li>
- <Link
- to="/admin"
- data-metabase-event={
- "Navbar;Profile Dropdown;Enter Admin"
- }
- onClick={this.closeDropdown}
- className="Dropdown-item block text-white no-decoration"
- >
- {t`Admin Panel`}
- </Link>
- </li>
- ) : null}
-
- {user.is_superuser && context === "admin" ? (
- <li>
- <Link
- to="/"
- data-metabase-event={"Navbar;Profile Dropdown;Exit Admin"}
- onClick={this.closeDropdown}
- className="Dropdown-item block text-white no-decoration"
- >
- {t`Exit Admin`}
- </Link>
- </li>
- ) : null}
-
- <li>
- <a
- data-metabase-event={"Navbar;Profile Dropdown;Help " + tag}
- className="Dropdown-item block text-white no-decoration"
- href={"http://www.metabase.com/docs/" + tag}
- target="_blank"
- >
- {t`Help`}
- </a>
- </li>
-
- {user.is_superuser && (
- <li>
- <a
- data-metabase-event={
- "Navbar;Profile Dropdown;Debugging " + tag
- }
- onClick={this.openModal.bind(this, "logs")}
- className="Dropdown-item block text-white no-decoration"
- >
- {t`Logs`}
- </a>
- </li>
- )}
-
- <li>
- <a
- data-metabase-event={"Navbar;Profile Dropdown;About " + tag}
- onClick={this.openModal.bind(this, "about")}
- className="Dropdown-item block text-white no-decoration"
- >
- {t`About Metabase`}
- </a>
- </li>
-
- <li className="border-top border-light">
- <Link
- to="/auth/logout"
- data-metabase-event={"Navbar;Profile Dropdown;Logout"}
- className="Dropdown-item block text-white no-decoration"
- >
- {t`Sign out`}
- </Link>
- </li>
- </ul>
- </div>
- </OnClickOutsideWrapper>
- ) : null}
-
+ <Box>
+ <EntityMenu
+ items={[
+ {
+ title: t`Account settings`,
+ icon: null,
+ link: Urls.accountSettings(),
+ },
+ {
+ title: admin ? t`Exit admin` : t`Admin`,
+ icon: null,
+ link: admin ? "/" : "/admin",
+ },
+ {
+ title: t`Logs`,
+ icon: null,
+ action: () => this.openModal("logs"),
+ },
+ {
+ title: t`About Metabase`,
+ icon: null,
+ action: () => this.openModal("about"),
+ },
+ {
+ title: t`Sign out`,
+ icon: null,
+ link: "auth/logout",
+ },
+ ]}
+ triggerIcon="person"
+ />
{modalOpen === "about" ? (
<Modal small onClose={this.closeModal}>
<div className="px4 pt4 pb2 text-centered relative">
- <span
- className="absolute top right p4 text-normal text-grey-3 cursor-pointer"
- onClick={this.closeModal}
- >
- <Icon name={"close"} size={16} />
- </span>
<div className="text-brand pb2">
<LogoIcon width={48} height={48} />
</div>
@@ -231,7 +133,7 @@ export default class ProfileLink extends Component {
<Logs onClose={this.closeModal} />
</Modal>
) : null}
- </div>
+ </Box>
);
}
}
diff --git a/frontend/src/metabase/nav/containers/Navbar.jsx b/frontend/src/metabase/nav/containers/Navbar.jsx
index 494ae1fc87a7c35301ca8a65c15e4dfa43ab05af..0a06e8ce43a7739c607058ae4f861e41005ff4e5 100644
--- a/frontend/src/metabase/nav/containers/Navbar.jsx
+++ b/frontend/src/metabase/nav/containers/Navbar.jsx
@@ -5,17 +5,26 @@ import { t } from "c-3po";
import { Box, Flex } from "grid-styled";
import styled from "styled-components";
import { space, width } from "styled-system";
+import colors from "metabase/lib/colors";
+import color from "color";
import { connect } from "react-redux";
import { push } from "react-router-redux";
+import * as Urls from "metabase/lib/urls";
+
import Button from "metabase/components/Button.jsx";
import Icon from "metabase/components/Icon.jsx";
import Link from "metabase/components/Link";
import LogoIcon from "metabase/components/LogoIcon.jsx";
import Tooltip from "metabase/components/Tooltip";
+import EntityMenu from "metabase/components/EntityMenu";
import OnClickOutsideWrapper from "metabase/components/OnClickOutsideWrapper";
+import Modal from "metabase/components/Modal";
+
+import CreateDashboardModal from "metabase/components/CreateDashboardModal";
+
import ProfileLink from "metabase/nav/components/ProfileLink.jsx";
import { getPath, getContext, getUser } from "../selectors";
@@ -44,11 +53,23 @@ const AdminNavItem = ({ name, path, currentPath }) => (
</li>
);
+const DefaultSearchColor = color(colors.brand)
+ .lighten(0.07)
+ .string();
+const ActiveSearchColor = color(colors.brand)
+ .lighten(0.1)
+ .string();
+
const SearchWrapper = Flex.extend`
- ${width} border-radius: 6px;
+ ${width} background-color: ${props =>
+ props.active ? ActiveSearchColor : DefaultSearchColor};
+ border-radius: 6px;
align-items: center;
- border: 1px solid transparent;
+ color: white;
transition: background 300ms ease-in;
+ &:hover {
+ background-color: ${ActiveSearchColor};
+ }
`;
const SearchInput = styled.input`
@@ -61,7 +82,7 @@ const SearchInput = styled.input`
outline: none;
}
&::placeholder {
- color: rgba(255, 255, 255, 0.85);
+ color: ${colors["text-white"]};
}
`;
@@ -94,16 +115,15 @@ class SearchBar extends React.Component {
handleDismissal={() => this.setState({ active: false })}
>
<SearchWrapper
- className={cx("search-bar", {
- "search-bar--active": this.state.active,
- })}
onClick={() => this.setState({ active: true })}
active={this.state.active}
>
<Icon name="search" ml={2} />
<SearchInput
w={1}
- p={2}
+ py={2}
+ pr={2}
+ pl={1}
value={this.state.searchText}
placeholder="Search for anything..."
onClick={() => this.setState({ active: true })}
@@ -123,6 +143,8 @@ class SearchBar extends React.Component {
}
}
+const MODAL_NEW_DASHBOARD = "MODAL_NEW_DASHBOARD";
+
@connect(mapStateToProps, mapDispatchToProps)
export default class Navbar extends Component {
state = {
@@ -194,6 +216,7 @@ export default class Navbar extends Component {
<ProfileLink {...this.props} />
</div>
+ {this.renderModal()}
</nav>
);
}
@@ -212,13 +235,19 @@ export default class Navbar extends Component {
</Link>
</li>
</ul>
+ {this.renderModal()}
</nav>
);
}
renderMainNav() {
return (
- <Flex className="Nav relative bg-brand text-white z4" align="center">
+ <Flex
+ className="relative bg-brand text-white z3"
+ align="center"
+ py={1}
+ pr={2}
+ >
<Box>
<Link
to="/"
@@ -240,37 +269,66 @@ export default class Navbar extends Component {
/>
</Box>
</Flex>
- <Flex align="center" ml="auto" className="z4">
- <Link to="question/new" mx={1}>
- <Button medium color="#509ee3">
- New question
- </Button>
- </Link>
- <Link to="collection/root" mx={1}>
- <Box p={1} bg="#69ABE6" className="text-bold rounded">
- Saved items
- </Box>
+ <Flex ml="auto" align="center" className="relative z2">
+ <Link to={Urls.newQuestion()} mx={2}>
+ <Button medium>{t`Ask a question`}</Button>
</Link>
+ <EntityMenu
+ triggerIcon="add"
+ items={[
+ {
+ title: t`New dashboard`,
+ icon: `dashboard`,
+ action: () => this.setModal(MODAL_NEW_DASHBOARD),
+ },
+ {
+ title: t`New pulse`,
+ icon: `pulse`,
+ link: Urls.newPulse(),
+ },
+ ]}
+ />
<Tooltip tooltip={t`Reference`}>
- <Link to="reference" mx={1}>
+ <Link to="reference" mx={2}>
<Icon name="reference" />
</Link>
</Tooltip>
<Tooltip tooltip={t`Activity`}>
- <Link to="activity" mx={1}>
- <Icon name="alert" />
+ <Link to="activity" mx={2}>
+ <Icon name="bell" />
</Link>
</Tooltip>
<ProfileLink {...this.props} />
</Flex>
+ {this.renderModal()}
</Flex>
);
}
+ renderModal() {
+ const { modal } = this.state;
+ if (modal) {
+ return (
+ <Modal onClose={() => this.setState({ modal: null })}>
+ {modal === MODAL_NEW_DASHBOARD ? (
+ <CreateDashboardModal
+ createDashboard={this.props.createDashboard}
+ onClose={() => this.setState({ modal: null })}
+ />
+ ) : null}
+ </Modal>
+ );
+ } else {
+ return null;
+ }
+ }
+
render() {
const { context, user } = this.props;
- if (!user) return null;
+ if (!user) {
+ return null;
+ }
switch (context) {
case "admin":
diff --git a/frontend/src/metabase/new_query/components/NewQueryOption.jsx b/frontend/src/metabase/new_query/components/NewQueryOption.jsx
index cb4c6f322e691e7a40b6333b9594139803f93bc8..bdaf4ba3e59a6853ba459c32c83d545f490f8726 100644
--- a/frontend/src/metabase/new_query/components/NewQueryOption.jsx
+++ b/frontend/src/metabase/new_query/components/NewQueryOption.jsx
@@ -1,6 +1,7 @@
import React, { Component } from "react";
import cx from "classnames";
import { Link } from "react-router";
+import colors from "metabase/lib/colors";
export default class NewQueryOption extends Component {
props: {
@@ -24,8 +25,8 @@ export default class NewQueryOption extends Component {
style={{
boxSizing: "border-box",
boxShadow: hover
- ? "0 3px 8px 0 rgba(220,220,220,0.50)"
- : "0 1px 3px 0 rgba(220,220,220,0.50)",
+ ? `0 3px 8px 0 ${colors["text-light"]}`
+ : `0 1px 3px 0 ${colors["text-light"]}`,
height: 340,
}}
onMouseOver={() => this.setState({ hover: true })}
diff --git a/frontend/src/metabase/parameters/components/ParameterValueWidget.jsx b/frontend/src/metabase/parameters/components/ParameterValueWidget.jsx
index 2587b13cd994d682b366da5a0c554414ffcba9f6..5b3b1d1eb96a095e434e162f9a91ce3042237faa 100644
--- a/frontend/src/metabase/parameters/components/ParameterValueWidget.jsx
+++ b/frontend/src/metabase/parameters/components/ParameterValueWidget.jsx
@@ -168,7 +168,9 @@ export default class ParameterValueWidget extends Component {
};
const getWidgetStatusIcon = () => {
- if (isFullscreen) return null;
+ if (isFullscreen) {
+ return null;
+ }
if (hasValue && !noReset) {
return (
diff --git a/frontend/src/metabase/parameters/components/ParameterWidget.css b/frontend/src/metabase/parameters/components/ParameterWidget.css
index 827be3d222cae0c717a78746240ce3f5ce5645ae..1c11ba5cf98f8c3ed6f2447fcf6981dd1fa0514f 100644
--- a/frontend/src/metabase/parameters/components/ParameterWidget.css
+++ b/frontend/src/metabase/parameters/components/ParameterWidget.css
@@ -1,7 +1,7 @@
:local(.container) {
composes: flex align-center from "style";
transition: opacity 500ms linear;
- border: 2px solid var(--grey-1);
+ border: 2px solid var(--color-border);
margin-right: 0.85em;
margin-bottom: 0.5em;
padding: 0.25em 1em 0.25em 1em;
@@ -28,14 +28,14 @@
font-weight: 600;
min-height: 30px;
min-width: 150px;
- color: var(--grey-4);
+ color: var(--color-text-medium);
}
:local(.nameInput) {
composes: flex align-center from "style";
min-height: 30px;
min-width: 150px;
- color: var(--grey-4);
+ color: var(--color-text-medium);
border: none;
font-size: 1em;
font-weight: 600;
@@ -58,8 +58,8 @@
:local(.parameter.selected) {
font-weight: bold;
- color: var(--brand-color);
- border-color: var(--brand-color);
+ color: var(--color-brand);
+ border-color: var(--color-brand);
}
:local(.parameter.noPopover) input {
@@ -78,25 +78,25 @@
:local(.parameter.noPopover.selected) input {
width: 127px;
font-weight: bold;
- color: var(--brand-color);
+ color: var(--color-brand);
}
:local(.parameter.noPopover) input:focus {
outline: none;
- color: var(--default-font-color);
+ color: var(--color-text-dark);
width: 127px;
}
:local(.parameter.noPopover) input::-webkit-input-placeholder {
- color: var(--grey-4);
+ color: var(--color-text-medium);
}
:local(.parameter.noPopover) input:-moz-placeholder {
- color: var(--grey-4);
+ color: var(--color-text-medium);
}
:local(.parameter.noPopover) input::-moz-placeholder {
- color: var(--grey-4);
+ color: var(--color-text-medium);
}
:local(.parameter.noPopover) input:-ms-input-placeholder {
- color: var(--grey-4);
+ color: var(--color-text-medium);
}
:local(.input) {
@@ -111,7 +111,7 @@
composes: mr1 from "style";
font-size: 16px;
font-weight: bold;
- color: var(--grey-4);
+ color: var(--color-text-medium);
}
:local(.parameterButtons) {
@@ -126,11 +126,11 @@
}
:local(.editButton:hover) {
- color: var(--brand-color);
+ color: var(--color-brand);
}
:local(.removeButton:hover) {
- color: var(--error-color);
+ color: var(--color-error);
}
:local(.editNameIconContainer) {
diff --git a/frontend/src/metabase/parameters/components/widgets/DateAllOptionsWidget.jsx b/frontend/src/metabase/parameters/components/widgets/DateAllOptionsWidget.jsx
index b65df6532d75c794412b5c59534f930e9f08e3f2..1b54552e2aa27357bdfdcdf244cac54897a1566a 100644
--- a/frontend/src/metabase/parameters/components/widgets/DateAllOptionsWidget.jsx
+++ b/frontend/src/metabase/parameters/components/widgets/DateAllOptionsWidget.jsx
@@ -102,7 +102,9 @@ export default class DateAllOptionsWidget extends Component {
static defaultProps = {};
static format = (urlEncoded: ?string) => {
- if (urlEncoded == null) return null;
+ if (urlEncoded == null) {
+ return null;
+ }
const filter = dateParameterValueToMBQL(urlEncoded, noopRef);
return filter ? getFilterTitle(filter) : null;
diff --git a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget.jsx b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget.jsx
index ee93c42b714f7890fe9b2ebd660d5da70e445ae5..272138c9743943057f06e06643737a3d05d82338 100644
--- a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget.jsx
+++ b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget.jsx
@@ -88,7 +88,9 @@ export default class ParameterFieldWidget extends Component<*, Props, State> {
: this.props.placeholder || t`Enter a value...`;
const focusChanged = isFocused => {
- if (parentFocusChanged) parentFocusChanged(isFocused);
+ if (parentFocusChanged) {
+ parentFocusChanged(isFocused);
+ }
this.setState({ isFocused });
};
diff --git a/frontend/src/metabase/parameters/components/widgets/TextWidget.jsx b/frontend/src/metabase/parameters/components/widgets/TextWidget.jsx
index 2ac542e31904c99ea3d5aaf044f330a497eae80d..4579b3ae36848edcc3a56c99d06ae11b6edebf9e 100644
--- a/frontend/src/metabase/parameters/components/widgets/TextWidget.jsx
+++ b/frontend/src/metabase/parameters/components/widgets/TextWidget.jsx
@@ -54,7 +54,9 @@ export default class TextWidget extends Component {
: this.props.placeholder || t`Enter a value...`;
const focusChanged = isFocused => {
- if (parentFocusChanged) parentFocusChanged(isFocused);
+ if (parentFocusChanged) {
+ parentFocusChanged(isFocused);
+ }
this.setState({ isFocused });
};
diff --git a/frontend/src/metabase/public/components/EmbedFrame.css b/frontend/src/metabase/public/components/EmbedFrame.css
index 091bdc5e76904b0c28bf4231317ce323f9518417..e431a2169bfbbc4b33115141f05366f6658134bc 100644
--- a/frontend/src/metabase/public/components/EmbedFrame.css
+++ b/frontend/src/metabase/public/components/EmbedFrame.css
@@ -4,34 +4,34 @@
.EmbedFrame-header,
.EmbedFrame-footer {
- color: var(--dark-color);
+ color: var(--color-text-dark);
background-color: white;
}
.Theme--night.EmbedFrame {
- background-color: rgb(54, 58, 61);
- border: 1px solid rgb(46, 49, 52);
+ background-color: var(--color-bg-black);
+ border: 1px solid var(--color-accent2);
}
.Theme--night .EmbedFrame-header,
.Theme--night .EmbedFrame-footer {
- color: var(--night-mode-color);
- background-color: rgb(54, 58, 61);
- border-color: rgb(46, 49, 52);
+ color: color(var(--color-text-white) alpha(-14%));
+ background-color: var(--color-bg-black);
+ border-color: var(--color-accent2);
}
.Theme--night.EmbedFrame .fullscreen-night-text {
- color: var(--night-mode-color);
+ color: color(var(--color-text-white) alpha(-14%));
transition: color 1s linear;
}
.Theme--night.EmbedFrame svg text {
- fill: var(--night-mode-color) !important;
+ fill: color(var(--color-text-white) alpha(-14%)) !important;
}
.Theme--night.EmbedFrame .DashCard .Card {
- background-color: rgb(54, 58, 61);
- border: 1px solid rgb(46, 49, 52);
+ background-color: var(--color-bg-black);
+ border: 1px solid var(--color-accent2);
}
.Theme--night.EmbedFrame .enable-dots-onhover .dc-tooltip circle.dot:hover,
diff --git a/frontend/src/metabase/public/components/widgets/AdvancedSettingsPane.jsx b/frontend/src/metabase/public/components/widgets/AdvancedSettingsPane.jsx
index c1eb9c26002950991fae5be9607cc70ed02a4791..783ff8bcf8f813dafa6e84ee0fa8f767ac7e6aa8 100644
--- a/frontend/src/metabase/public/components/widgets/AdvancedSettingsPane.jsx
+++ b/frontend/src/metabase/public/components/widgets/AdvancedSettingsPane.jsx
@@ -1,15 +1,17 @@
/* @flow */
import React from "react";
+import { t } from "c-3po";
+import cx from "classnames";
import Icon from "metabase/components/Icon";
import Button from "metabase/components/Button";
import Parameters from "metabase/parameters/components/Parameters";
import Select, { Option } from "metabase/components/Select";
-import { t } from "c-3po";
-import DisplayOptionsPane from "./DisplayOptionsPane";
-import cx from "classnames";
+import colors from "metabase/lib/colors";
+
+import DisplayOptionsPane from "./DisplayOptionsPane";
const getIconForParameter = parameter =>
parameter.type === "category"
@@ -88,7 +90,7 @@ const AdvancedSettingsPane = ({
<Icon
name={getIconForParameter(parameter)}
className="mr2"
- style={{ color: "#DFE8EA" }}
+ style={{ color: colors["text-light"] }}
/>
<h3>{parameter.name}</h3>
<Select
diff --git a/frontend/src/metabase/public/components/widgets/EmbedModalContent.jsx b/frontend/src/metabase/public/components/widgets/EmbedModalContent.jsx
index 0347fe3a44f919cb9734d88b7ee2e7027e0751eb..d08380aa45250c642739de9102e3373e670d2ec1 100644
--- a/frontend/src/metabase/public/components/widgets/EmbedModalContent.jsx
+++ b/frontend/src/metabase/public/components/widgets/EmbedModalContent.jsx
@@ -14,6 +14,7 @@ import {
getUnsignedPreviewUrl,
getSignedToken,
} from "metabase/public/lib/embed";
+import colors from "metabase/lib/colors";
import {
getSiteUrl,
@@ -176,7 +177,7 @@ export default class EmbedModalContent extends Component {
style={{
boxShadow:
embedType === "application"
- ? "0px 8px 15px -9px rgba(0,0,0,0.2)"
+ ? `0px 8px 15px -9px ${colors["text-dark"]}`
: undefined,
}}
>
diff --git a/frontend/src/metabase/pulse/components/PulseCardPreview.jsx b/frontend/src/metabase/pulse/components/PulseCardPreview.jsx
index 06c4fd8cd00cb125001b7c60d5697ae17e988e15..e021fbde5553c09b8b0be4866ead5d1065725014 100644
--- a/frontend/src/metabase/pulse/components/PulseCardPreview.jsx
+++ b/frontend/src/metabase/pulse/components/PulseCardPreview.jsx
@@ -9,6 +9,7 @@ import Tooltip from "metabase/components/Tooltip.jsx";
import { t } from "c-3po";
import cx from "classnames";
+import colors, { alpha } from "metabase/lib/colors";
export default class PulseCardPreview extends Component {
constructor(props, context) {
@@ -78,8 +79,10 @@ export default class PulseCardPreview extends Component {
style={{
top: 2,
right: 2,
- background:
- "linear-gradient(to right, rgba(255,255,255,0.2), white, white)",
+ background: `linear-gradient(to right, ${alpha(
+ colors["bg-white"],
+ 0.2,
+ )}, white, white)`,
paddingLeft: 100,
}}
>
@@ -177,7 +180,7 @@ const RenderedPulseCardPreviewHeader = ({ children }) => (
'Lato, "Helvetica Neue", Helvetica, Arial, sans-serif',
fontSize: 16,
fontWeight: 700,
- color: "rgb(57,67,64)",
+ color: colors["text-dark"],
textDecoration: "none",
}}
>
diff --git a/frontend/src/metabase/pulse/components/PulseEditCards.jsx b/frontend/src/metabase/pulse/components/PulseEditCards.jsx
index 5c94cb0cca20e178dff08ff780ce1f6362fc8c30..38b5ec0d5a147424ba8f2a2fb8d62ed9e9225eb9 100644
--- a/frontend/src/metabase/pulse/components/PulseEditCards.jsx
+++ b/frontend/src/metabase/pulse/components/PulseEditCards.jsx
@@ -9,6 +9,8 @@ import PulseCardPreview from "./PulseCardPreview.jsx";
import MetabaseAnalytics from "metabase/lib/analytics";
+import colors from "metabase/lib/colors";
+
const SOFT_LIMIT = 10;
const HARD_LIMIT = 25;
const TABLE_MAX_ROWS = 20;
@@ -169,7 +171,7 @@ export default class PulseEditCards extends Component {
className="my4 ml3"
style={{
width: 375,
- borderTop: "1px dashed rgb(214,214,214)",
+ borderTop: `1px dashed ${colors["border"]}`,
}}
/>
)}
diff --git a/frontend/src/metabase/pulse/components/PulseMoveModal.jsx b/frontend/src/metabase/pulse/components/PulseMoveModal.jsx
index c5a5e135ad221992cdee6fa9fbf924bdc689c94e..107264c7b981d7a9ba425184dde3ffbd358ac592 100644
--- a/frontend/src/metabase/pulse/components/PulseMoveModal.jsx
+++ b/frontend/src/metabase/pulse/components/PulseMoveModal.jsx
@@ -10,6 +10,8 @@ import Icon from "metabase/components/Icon";
import CollectionListLoader from "metabase/containers/CollectionListLoader";
+import colors from "metabase/lib/colors";
+
@withRouter
class PulseMoveModal extends React.Component {
state = {
@@ -61,7 +63,7 @@ class PulseMoveModal extends React.Component {
)}
>
<Flex align="center">
- <Icon name="all" color={"#DCE1E4"} size={32} />
+ <Icon name="all" color={colors["text-light"]} size={32} />
<h4 className="ml1">{collection.name}</h4>
</Flex>
</Box>
diff --git a/frontend/src/metabase/query_builder/actions.js b/frontend/src/metabase/query_builder/actions.js
index 4a7a0e641f188c536ad769db565769ce9cfff529..78b4490c4f8f2a3fc4dc71afc5b4cf3070ee3c1b 100644
--- a/frontend/src/metabase/query_builder/actions.js
+++ b/frontend/src/metabase/query_builder/actions.js
@@ -446,7 +446,9 @@ export const loadMetadataForCard = createThunkAction(
card => {
return async (dispatch, getState) => {
// Short-circuit if we're in a weird state where the card isn't completely loaded
- if (!card && !card.dataset_query) return;
+ if (!card && !card.dataset_query) {
+ return;
+ }
const query = card && new Question(getMetadata(getState()), card).query();
@@ -531,8 +533,9 @@ function updateVisualizationSettings(card, isEditing, display, vizSettings) {
if (
card.display === display &&
_.isEqual(card.visualization_settings, vizSettings)
- )
+ ) {
return card;
+ }
let updatedCard = Utils.copy(card);
@@ -983,7 +986,9 @@ export const setQueryDatabase = createThunkAction(
let database = databases[databaseId],
tables = database ? database.tables : [],
table = tables.length > 0 ? tables[0] : null;
- if (table) updatedCard.dataset_query.native.collection = table.name;
+ if (table) {
+ updatedCard.dataset_query.native.collection = table.name;
+ }
}
dispatch(loadMetadataForCard(updatedCard));
@@ -1324,7 +1329,9 @@ export const followForeignKey = createThunkAction(FOLLOW_FOREIGN_KEY, fk => {
const { qb: { card } } = getState();
const queryResult = getFirstQueryResult(getState());
- if (!queryResult || !fk) return false;
+ if (!queryResult || !fk) {
+ return false;
+ }
// extract the value we will use to filter our new query
let originValue;
diff --git a/frontend/src/metabase/query_builder/components/ActionsWidget.jsx b/frontend/src/metabase/query_builder/components/ActionsWidget.jsx
index 12b08ce2a64eed5dc2b21f285158132dcd725718..daec2564860d097606aae8aeec4f77010fb30647 100644
--- a/frontend/src/metabase/query_builder/components/ActionsWidget.jsx
+++ b/frontend/src/metabase/query_builder/components/ActionsWidget.jsx
@@ -6,6 +6,7 @@ import Icon from "metabase/components/Icon";
import OnClickOutsideWrapper from "metabase/components/OnClickOutsideWrapper";
import MetabaseAnalytics from "metabase/lib/analytics";
+import colors from "metabase/lib/colors";
import cx from "classnames";
import _ from "underscore";
@@ -56,7 +57,9 @@ export default class ActionsWidget extends Component {
handleMouseMoved = () => {
// Don't auto-show or auto-hide the icon if popover is open
- if (this.state.popoverIsOpen) return;
+ if (this.state.popoverIsOpen) {
+ return;
+ }
if (!this.state.iconIsVisible) {
this.setState({ iconIsVisible: true });
@@ -82,7 +85,9 @@ export default class ActionsWidget extends Component {
};
toggle = () => {
- if (this.state.isClosing) return;
+ if (this.state.isClosing) {
+ return;
+ }
if (!this.state.popoverIsOpen) {
MetabaseAnalytics.trackEvent("Actions", "Opened Action Menu");
@@ -151,7 +156,7 @@ export default class ActionsWidget extends Component {
height: CIRCLE_SIZE,
transition: "opacity 300ms ease-in-out",
opacity: popoverIsOpen || iconIsVisible ? 1 : 0,
- boxShadow: "2px 2px 4px rgba(0, 0, 0, 0.2)",
+ boxShadow: `2px 2px 4px ${colors["shadow"]}`,
}}
onClick={this.toggle}
>
diff --git a/frontend/src/metabase/query_builder/components/AlertListPopoverContent.jsx b/frontend/src/metabase/query_builder/components/AlertListPopoverContent.jsx
index 031dc330b875349400210436ed0deda4e18293d8..23ebc1abe6eaa1a2828252abb6911d5a33a6499f 100644
--- a/frontend/src/metabase/query_builder/components/AlertListPopoverContent.jsx
+++ b/frontend/src/metabase/query_builder/components/AlertListPopoverContent.jsx
@@ -58,7 +58,9 @@ export class AlertListPopoverContent extends Component {
onEndAdding = (closeMenu = false) => {
this.props.setMenuFreeze(false);
this.setState({ adding: false });
- if (closeMenu) this.props.closeMenu();
+ if (closeMenu) {
+ this.props.closeMenu();
+ }
};
isCreatedByCurrentUser = alert => {
@@ -167,7 +169,9 @@ export class AlertListItem extends Component {
onEndEditing = (shouldCloseMenu = false) => {
this.props.setMenuFreeze(false);
this.setState({ editing: false });
- if (shouldCloseMenu) this.props.closeMenu();
+ if (shouldCloseMenu) {
+ this.props.closeMenu();
+ }
};
render() {
diff --git a/frontend/src/metabase/query_builder/components/DataSelector.jsx b/frontend/src/metabase/query_builder/components/DataSelector.jsx
index e3707c57190548b93ec9c9b5d8d61bea5c5dcf1e..1c6cff6889b2e3d399b01e7a7c6d3c69896c13e3 100644
--- a/frontend/src/metabase/query_builder/components/DataSelector.jsx
+++ b/frontend/src/metabase/query_builder/components/DataSelector.jsx
@@ -482,8 +482,6 @@ export default class DataSelector extends Component {
/>
);
case TABLE_STEP:
- const canGoBack = this.hasPreviousStep();
-
return (
<TablePicker
selectedDatabase={selectedDatabase}
@@ -493,7 +491,7 @@ export default class DataSelector extends Component {
segments={segments}
disabledTableIds={disabledTableIds}
onChangeTable={this.onChangeTable}
- onBack={canGoBack && this.onBack}
+ onBack={this.hasPreviousStep() && this.onBack}
hasAdjacentStep={hasAdjacentStep}
/>
);
@@ -747,7 +745,9 @@ export const TablePicker = ({
}) => {
// In case DataSelector props get reseted
if (!selectedDatabase) {
- if (onBack) onBack();
+ if (onBack) {
+ onBack();
+ }
return null;
}
@@ -843,7 +843,9 @@ export class FieldPicker extends Component {
} = this.props;
// In case DataSelector props get reseted
if (!selectedTable) {
- if (onBack) onBack();
+ if (onBack) {
+ onBack();
+ }
return null;
}
diff --git a/frontend/src/metabase/query_builder/components/ExpandableString.jsx b/frontend/src/metabase/query_builder/components/ExpandableString.jsx
index 449859cb61b56f4ebefc47059459b00e196553cd..e28ab0cd52b91ba2cd19a1cc7ebd9f9749e6b161 100644
--- a/frontend/src/metabase/query_builder/components/ExpandableString.jsx
+++ b/frontend/src/metabase/query_builder/components/ExpandableString.jsx
@@ -30,7 +30,9 @@ export default class ExpandableString extends Component {
}
render() {
- if (!this.props.str) return false;
+ if (!this.props.str) {
+ return false;
+ }
let truncated = Humanize.truncate(this.props.str || "", 140);
diff --git a/frontend/src/metabase/query_builder/components/ExtendedOptions.jsx b/frontend/src/metabase/query_builder/components/ExtendedOptions.jsx
index 0817e2bf61afadb985cd5a6250b3cc464e109d39..b307fe65f1b83461c6ecf27a953c8ac20aaa4908 100644
--- a/frontend/src/metabase/query_builder/components/ExtendedOptions.jsx
+++ b/frontend/src/metabase/query_builder/components/ExtendedOptions.jsx
@@ -131,7 +131,9 @@ export default class ExtendedOptions extends Component {
renderExpressionWidget() {
// if we aren't editing any expression then there is nothing to do
- if (!this.state.editExpression || !this.props.tableMetadata) return null;
+ if (!this.state.editExpression || !this.props.tableMetadata) {
+ return null;
+ }
const { query } = this.props;
@@ -158,7 +160,9 @@ export default class ExtendedOptions extends Component {
}
renderPopover() {
- if (!this.state.isOpen) return null;
+ if (!this.state.isOpen) {
+ return null;
+ }
const { features, query } = this.props;
@@ -197,7 +201,9 @@ export default class ExtendedOptions extends Component {
render() {
const { features } = this.props;
- if (!features.sort && !features.limit) return null;
+ if (!features.sort && !features.limit) {
+ return null;
+ }
const onClick = this.props.tableMetadata
? () => this.setState({ isOpen: true })
diff --git a/frontend/src/metabase/query_builder/components/GuiQueryEditor.jsx b/frontend/src/metabase/query_builder/components/GuiQueryEditor.jsx
index d839f23da9ef0673e83c0f1f1020a405d358bffe..70f0e54048d20b1ac9fe80b9192f96c8b5399a69 100644
--- a/frontend/src/metabase/query_builder/components/GuiQueryEditor.jsx
+++ b/frontend/src/metabase/query_builder/components/GuiQueryEditor.jsx
@@ -120,7 +120,9 @@ export default class GuiQueryEditor extends Component {
renderFilters() {
const { query, features, setDatasetQuery } = this.props;
- if (!features.filter) return;
+ if (!features.filter) {
+ return;
+ }
let enabled;
let filterList;
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor.css b/frontend/src/metabase/query_builder/components/NativeQueryEditor.css
index a20b288fc2b8b3bc1c3c8edc8f3cdaae5c3abed6..ed5dd63ffe97d3d71065121a12ae65adfc9ec105 100644
--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor.css
+++ b/frontend/src/metabase/query_builder/components/NativeQueryEditor.css
@@ -22,7 +22,7 @@
padding-top: 2px;
font-size: 10px;
font-weight: 700;
- color: color(var(--base-grey) shade(30%));
+ color: var(--color-text-medium);
padding-left: 0;
padding-right: 0;
display: block;
@@ -30,8 +30,8 @@
}
.NativeQueryEditor .ace_editor .ace_gutter {
- background-color: #f9fbfc;
- border-right: 1px solid var(--border-color);
+ background-color: var(--color-bg-light);
+ border-right: 1px solid var(--color-border);
padding-left: 5px;
padding-right: 5px;
}
diff --git a/frontend/src/metabase/query_builder/components/QueryDownloadWidget.jsx b/frontend/src/metabase/query_builder/components/QueryDownloadWidget.jsx
index 29caa19ef248d3e23e938291ed6d8ece18ffffd8..d4e4c3859ff4db7cbbc160a7d1c2e222ef2eaa59 100644
--- a/frontend/src/metabase/query_builder/components/QueryDownloadWidget.jsx
+++ b/frontend/src/metabase/query_builder/components/QueryDownloadWidget.jsx
@@ -19,27 +19,49 @@ import cx from "classnames";
const EXPORT_FORMATS = ["csv", "xlsx", "json"];
-const QueryDownloadWidget = ({ className, card, result, uuid, token }) => (
+const QueryDownloadWidget = ({
+ className,
+ classNameClose,
+ card,
+ result,
+ uuid,
+ token,
+ dashcardId,
+ icon,
+ params,
+}) => (
<PopoverWithTrigger
triggerElement={
<Tooltip tooltip={t`Download full results`}>
- <Icon title={t`Download this data`} name="downarrow" size={16} />
+ <Icon title={t`Download this data`} name={icon} size={16} />
</Tooltip>
}
triggerClasses={cx(className, "text-brand-hover")}
+ triggerClassesClose={classNameClose}
>
<div className="p2" style={{ maxWidth: 320 }}>
<h4>{t`Download full results`}</h4>
- {result.data.rows_truncated != null && (
- <FieldSet className="my2 text-gold border-gold" legend={t`Warning`}>
- <div className="my1">{t`Your answer has a large number of rows so it could take a while to download.`}</div>
- <div>{t`The maximum download size is 1 million rows.`}</div>
- </FieldSet>
- )}
+ {result.data != null &&
+ result.data.rows_truncated != null && (
+ <FieldSet className="my2 text-gold border-gold" legend={t`Warning`}>
+ <div className="my1">{t`Your answer has a large number of rows so it could take a while to download.`}</div>
+ <div>{t`The maximum download size is 1 million rows.`}</div>
+ </FieldSet>
+ )}
<div className="flex flex-row mt2">
{EXPORT_FORMATS.map(
type =>
- uuid ? (
+ dashcardId && token ? (
+ <DashboardEmbedQueryButton
+ key={type}
+ type={type}
+ dashcardId={dashcardId}
+ token={token}
+ card={card}
+ params={params}
+ className="mr1 text-uppercase text-default"
+ />
+ ) : uuid ? (
<PublicQueryButton
key={type}
type={type}
@@ -147,11 +169,41 @@ const EmbedQueryButton = ({ className, type, token }) => {
);
};
+const DashboardEmbedQueryButton = ({
+ className,
+ type,
+ dashcardId,
+ token,
+ card,
+ params,
+}) => (
+ <DownloadButton
+ className={className}
+ method="GET"
+ url={`/api/embed/dashboard/${token}/dashcard/${dashcardId}/card/${
+ card.id
+ }/${type}`}
+ extensions={[type]}
+ params={params}
+ >
+ {type}
+ </DownloadButton>
+);
+
QueryDownloadWidget.propTypes = {
className: PropTypes.string,
+ classNameClose: PropTypes.string,
card: PropTypes.object,
result: PropTypes.object,
uuid: PropTypes.string,
+ icon: PropTypes.string,
+ params: PropTypes.object,
+};
+
+QueryDownloadWidget.defaultProps = {
+ result: {},
+ icon: "downarrow",
+ params: {},
};
export default QueryDownloadWidget;
diff --git a/frontend/src/metabase/query_builder/components/expressions/ExpressionEditorTextfield.css b/frontend/src/metabase/query_builder/components/expressions/ExpressionEditorTextfield.css
index ad1905f617e0740ab0c2905114baa47b7fb3c7f3..757b64effbeea7d329a3bfdca1738f520508783e 100644
--- a/frontend/src/metabase/query_builder/components/expressions/ExpressionEditorTextfield.css
+++ b/frontend/src/metabase/query_builder/components/expressions/ExpressionEditorTextfield.css
@@ -13,5 +13,5 @@
:local(.placeholder) {
/* match the placeholder text */
- color: rgb(192, 192, 192);
+ color: var(--color-text-light);
}
diff --git a/frontend/src/metabase/query_builder/components/expressions/ExpressionEditorTextfield.jsx b/frontend/src/metabase/query_builder/components/expressions/ExpressionEditorTextfield.jsx
index c3a216b775ae4599e8b429136a86822d99721a38..fcdcf6026e7600eb1c6397896a73195c5991573a 100644
--- a/frontend/src/metabase/query_builder/components/expressions/ExpressionEditorTextfield.jsx
+++ b/frontend/src/metabase/query_builder/components/expressions/ExpressionEditorTextfield.jsx
@@ -263,7 +263,9 @@ export default class ExpressionEditorTextfield extends Component {
render() {
let errorMessage = this.state.expressionErrorMessage;
- if (errorMessage && !errorMessage.length) errorMessage = t`unknown error`;
+ if (errorMessage && !errorMessage.length) {
+ errorMessage = t`unknown error`;
+ }
const { placeholder } = this.props;
const { suggestions, showAll } = this.state;
diff --git a/frontend/src/metabase/query_builder/components/expressions/TokenizedExpression.css b/frontend/src/metabase/query_builder/components/expressions/TokenizedExpression.css
index c85f651f2bba5b4fb6d36c2e48209c1117253610..974e77d0af365f9b5cfccdeb5043b8fdec0fd05f 100644
--- a/frontend/src/metabase/query_builder/components/expressions/TokenizedExpression.css
+++ b/frontend/src/metabase/query_builder/components/expressions/TokenizedExpression.css
@@ -25,13 +25,13 @@
.Expression-aggregation,
.Expression-metric {
- border: 1px solid #9cc177;
- background-color: #e4f7d1;
+ border: 1px solid var(--color-accent1);
+ background-color: var(--color-bg-white);
}
.Expression-field {
- border: 1px solid #509ee3;
- background-color: #c7e3fb;
+ border: 1px solid var(--color-brand);
+ background-color: var(--color-bg-medium);
}
.Expression-selected.Expression-aggregation,
@@ -39,11 +39,11 @@
.Expression-selected .Expression-aggregation,
.Expression-selected .Expression-metric {
color: white;
- background-color: #9cc177;
+ background-color: var(--color-accent1);
}
.Expression-selected.Expression-field,
.Expression-selected .Expression-field {
color: white;
- background-color: #509ee3;
+ background-color: var(--color-brand);
}
diff --git a/frontend/src/metabase/query_builder/components/expressions/TokenizedExpression.jsx b/frontend/src/metabase/query_builder/components/expressions/TokenizedExpression.jsx
index b6c4103179ee53c32595dea7795080234969fae4..e2039ebe4719bc0a802b30bd326712353b03f066 100644
--- a/frontend/src/metabase/query_builder/components/expressions/TokenizedExpression.jsx
+++ b/frontend/src/metabase/query_builder/components/expressions/TokenizedExpression.jsx
@@ -27,7 +27,9 @@ const renderSyntaxTree = (node, index) => (
);
function nextNonWhitespace(tokens, index) {
- while (index < tokens.length && /^\s+$/.test(tokens[++index])) {}
+ while (index < tokens.length && /^\s+$/.test(tokens[++index])) {
+ // this block intentionally left blank
+ }
return tokens[index];
}
diff --git a/frontend/src/metabase/questions/Questions.css b/frontend/src/metabase/questions/Questions.css
index 3403e5da1cbee3a35d40a05cd978a90820f4bbad..6671c5102020398ae7aef6fe9520e8f7ea699ea2 100644
--- a/frontend/src/metabase/questions/Questions.css
+++ b/frontend/src/metabase/questions/Questions.css
@@ -1,8 +1,8 @@
:root {
- --title-color: #606e7b;
- --subtitle-color: #aab7c3;
- --muted-color: #deeaf1;
- --blue-color: #2d86d4;
+ --title-color: var(--color-text-medium);
+ --subtitle-color: var(--color-text-medium);
+ --muted-color: var(--color-text-light);
+ --blue-color: var(--color-brand);
}
:local(.header) {
diff --git a/frontend/src/metabase/questions/components/CollectionBadge.jsx b/frontend/src/metabase/questions/components/CollectionBadge.jsx
index faa9aca34e6ac89293e2299d9c4d663701cd0b1c..0d5fae450aa042ba972d5dd1f4b3137f94e7133f 100644
--- a/frontend/src/metabase/questions/components/CollectionBadge.jsx
+++ b/frontend/src/metabase/questions/components/CollectionBadge.jsx
@@ -6,6 +6,8 @@ import * as Urls from "metabase/lib/urls";
import Color from "color";
import cx from "classnames";
+import colors from "metabase/lib/colors";
+
const CollectionBadge = ({ className, collection }) => {
const color = Color(collection.color);
const darkened = color.darken(0.1);
@@ -16,7 +18,7 @@ const CollectionBadge = ({ className, collection }) => {
className={cx(className, "flex align-center px1 rounded mx1")}
style={{
fontSize: 14,
- color: lightened.isDark() ? "#fff" : darkened,
+ color: lightened.isDark() ? colors["text-white"] : darkened,
backgroundColor: lightened,
}}
>
diff --git a/frontend/src/metabase/questions/components/CollectionButtons.jsx b/frontend/src/metabase/questions/components/CollectionButtons.jsx
index 904671c364208d82bf86037c783bf870a94542b5..d826ef70bdf9abe4774e2fee2c768e6b274b2336 100644
--- a/frontend/src/metabase/questions/components/CollectionButtons.jsx
+++ b/frontend/src/metabase/questions/components/CollectionButtons.jsx
@@ -4,6 +4,7 @@ import { Link } from "react-router";
import { t } from "c-3po";
import Icon from "metabase/components/Icon";
+import colors from "metabase/lib/colors";
const COLLECTION_ICON_SIZE = 18;
@@ -35,7 +36,7 @@ const NewCollectionButton = ({ push }) => (
<div
className="flex align-center justify-center ml-auto mr-auto mb2 mt2"
style={{
- border: "2px solid #D8E8F5",
+ border: `2px solid ${colors["border"]}`,
borderRadius: COLLECTION_ICON_SIZE,
height: COLLECTION_ICON_SIZE,
width: COLLECTION_ICON_SIZE,
diff --git a/frontend/src/metabase/questions/components/ExpandingSearchField.jsx b/frontend/src/metabase/questions/components/ExpandingSearchField.jsx
index ef351a4bf3e7b8e59ab19c5eab601b84183616b7..56c989db6b56dbac4ed7cbd5d119e8651b98db97 100644
--- a/frontend/src/metabase/questions/components/ExpandingSearchField.jsx
+++ b/frontend/src/metabase/questions/components/ExpandingSearchField.jsx
@@ -75,7 +75,7 @@ export default class ExpandingSearchField extends Component {
<div
className={cx(
className,
- "bordered border-grey-1 flex align-center pr2 transition-border",
+ "bordered flex align-center pr2 transition-border",
{ "border-brand": active },
)}
onClick={this.setActive}
diff --git a/frontend/src/metabase/questions/containers/AddToDashboard.jsx b/frontend/src/metabase/questions/containers/AddToDashboard.jsx
index 6dd15e6cacfafd0449e026447701b3ac30042415..1c7ea3b6305126fad951cbb5b2e84a8e335b7750 100644
--- a/frontend/src/metabase/questions/containers/AddToDashboard.jsx
+++ b/frontend/src/metabase/questions/containers/AddToDashboard.jsx
@@ -11,7 +11,7 @@ import QuestionListLoader from "metabase/containers/QuestionListLoader";
import ExpandingSearchField from "../components/ExpandingSearchField.jsx";
const QuestionRow = ({ question, onClick }) => (
- <div className="py2 border-top border-grey-1">
+ <div className="py2 border-top">
<div className="flex flex-full align-center">
<QuestionIcon
question={question}
diff --git a/frontend/src/metabase/redux/undo.js b/frontend/src/metabase/redux/undo.js
index ed2ad67459ed93aae5479acb9bb132bfc0a41794..6ac740b6dadb3563b84eb80275e19bec6d38eb07 100644
--- a/frontend/src/metabase/redux/undo.js
+++ b/frontend/src/metabase/redux/undo.js
@@ -41,48 +41,47 @@ export const performUndo = createThunkAction(PERFORM_UNDO, undoId => {
});
export default function(state = [], { type, payload, error }) {
- switch (type) {
- case ADD_UNDO:
- if (error) {
- console.warn("ADD_UNDO", payload);
- return state;
- }
+ if (type === ADD_UNDO) {
+ if (error) {
+ console.warn("ADD_UNDO", payload);
+ return state;
+ }
- const undo = {
- ...payload,
- // normalize "action" to "actions"
- actions: payload.action ? [payload.action] : payload.actions || [],
- action: null,
- // default "count"
- count: payload.count || 1,
- };
+ const undo = {
+ ...payload,
+ // normalize "action" to "actions"
+ actions: payload.action ? [payload.action] : payload.actions || [],
+ action: null,
+ // default "count"
+ count: payload.count || 1,
+ };
- let previous = state[state.length - 1];
- // if last undo was same verb then merge them
- if (previous && undo.verb != null && undo.verb === previous.verb) {
- return state.slice(0, -1).concat({
- // use new undo so the timeout is extended
- ...undo,
+ let previous = state[state.length - 1];
+ // if last undo was same verb then merge them
+ if (previous && undo.verb != null && undo.verb === previous.verb) {
+ return state.slice(0, -1).concat({
+ // use new undo so the timeout is extended
+ ...undo,
- // merge the verb, count, and subject appropriately
- verb: previous.verb,
- count: previous.count + undo.count,
- subject: previous.subject === undo.subject ? undo.subject : "item",
+ // merge the verb, count, and subject appropriately
+ verb: previous.verb,
+ count: previous.count + undo.count,
+ subject: previous.subject === undo.subject ? undo.subject : "item",
- // merge items
- actions: [...previous.actions, ...payload.actions],
+ // merge items
+ actions: [...previous.actions, ...payload.actions],
- _domId: previous._domId, // use original _domId so we don't get funky animations swapping for the new one
- });
- } else {
- return state.concat(undo);
- }
- case DISMISS_UNDO:
- if (error) {
- console.warn("DISMISS_UNDO", payload);
- return state;
- }
- return state.filter(undo => undo.id !== payload);
+ _domId: previous._domId, // use original _domId so we don't get funky animations swapping for the new one
+ });
+ } else {
+ return state.concat(undo);
+ }
+ } else if (type === DISMISS_UNDO) {
+ if (error) {
+ console.warn("DISMISS_UNDO", payload);
+ return state;
+ }
+ return state.filter(undo => undo.id !== payload);
}
return state;
}
diff --git a/frontend/src/metabase/reference/Reference.css b/frontend/src/metabase/reference/Reference.css
index 16bd412f9db4cd2012afe6690b8f650aa0eeb501..b5b0e57b89fcf4e44f2f7e6bb7ea299662636640 100644
--- a/frontend/src/metabase/reference/Reference.css
+++ b/frontend/src/metabase/reference/Reference.css
@@ -1,6 +1,6 @@
:root {
- --title-color: #606e7b;
- --subtitle-color: #aab7c3;
+ --title-color: var(--color-text-medium);
+ --subtitle-color: var(--color-text-medium);
--icon-width: calc(48px + 1rem);
}
@@ -103,7 +103,7 @@
:local(.guideEditHeader) {
composes: full text-body my4 from "style";
max-width: 550px;
- color: var(--dark-color);
+ color: var(--color-text-dark);
}
:local(.guideEditHeaderTitle) {
@@ -138,7 +138,7 @@
:local(.guideEditSubtitle) {
composes: text-body from "style";
- color: var(--grey-2);
+ color: var(--color-text-light);
font-size: 16px;
max-width: 700px;
}
diff --git a/frontend/src/metabase/reference/components/Detail.css b/frontend/src/metabase/reference/components/Detail.css
index 027b4273e7eb0505d8d37896e398facd651fbf7e..117833b87a2329647078a35117f8db8d92144c23 100644
--- a/frontend/src/metabase/reference/components/Detail.css
+++ b/frontend/src/metabase/reference/components/Detail.css
@@ -1,8 +1,8 @@
:root {
- --title-color: #606e7b;
- --subtitle-color: #aab7c3;
- --muted-color: #deeaf1;
- --blue-color: #2d86d4;
+ --title-color: var(--color-text-medium);
+ --subtitle-color: var(--color-text-medium);
+ --muted-color: var(--color-text-light);
+ --blue-color: var(--color-brand);
--icon-width: calc(48px + 1rem);
}
diff --git a/frontend/src/metabase/reference/components/EditButton.css b/frontend/src/metabase/reference/components/EditButton.css
index 31f8a7ebaa523f4b111519ca03c27875fe90f160..a945c7420a10b4bbc46eb9253b3112816066a86a 100644
--- a/frontend/src/metabase/reference/components/EditButton.css
+++ b/frontend/src/metabase/reference/components/EditButton.css
@@ -1,12 +1,12 @@
:local(.editButton) {
composes: flex align-center text-dark p0 mx1 from "style";
- color: var(--primary-button-bg-color);
+ color: var(--color-brand);
font-weight: normal;
font-size: 16px;
}
:local(.editButton):hover {
- color: color(var(--primary-button-border-color) shade(10%));
+ color: var(--color-brand);
transition: color 0.3s linear;
}
diff --git a/frontend/src/metabase/reference/components/EditHeader.css b/frontend/src/metabase/reference/components/EditHeader.css
index fc3ddd5cfcf8c5aa06c8fc70f2933d9d2c770051..a71c5bc8147839ea4b06a922fed0cf061b513b89 100644
--- a/frontend/src/metabase/reference/components/EditHeader.css
+++ b/frontend/src/metabase/reference/components/EditHeader.css
@@ -1,5 +1,5 @@
:root {
- --edit-header-color: #6cafed;
+ --edit-header-color: var(--color-brand);
}
:local(.editHeader) {
diff --git a/frontend/src/metabase/reference/components/EditableReferenceHeader.jsx b/frontend/src/metabase/reference/components/EditableReferenceHeader.jsx
index 723134c72f7b826d670fc380934fa0b41a1fecea..a6dced89f7e2c843e12a23908ba8b8c13623ccfc 100644
--- a/frontend/src/metabase/reference/components/EditableReferenceHeader.jsx
+++ b/frontend/src/metabase/reference/components/EditableReferenceHeader.jsx
@@ -14,6 +14,8 @@ import InputBlurChange from "metabase/components/InputBlurChange.jsx";
import Ellipsified from "metabase/components/Ellipsified.jsx";
import EditButton from "metabase/reference/components/EditButton.jsx";
+import colors from "metabase/lib/colors";
+
const EditableReferenceHeader = ({
entity = {},
table,
@@ -36,7 +38,10 @@ const EditableReferenceHeader = ({
>
<div className={L.leftIcons}>
{headerIcon && (
- <IconBorder borderWidth="0" style={{ backgroundColor: "#E9F4F8" }}>
+ <IconBorder
+ borderWidth="0"
+ style={{ backgroundColor: colors["bg-medium"] }}
+ >
<Icon
className="text-brand"
name={headerIcon}
diff --git a/frontend/src/metabase/reference/components/Field.css b/frontend/src/metabase/reference/components/Field.css
index b233ab73b53385b793748289a2294254f80d7035..f0de738eca40dc0514c342cbc27121d6880fd041 100644
--- a/frontend/src/metabase/reference/components/Field.css
+++ b/frontend/src/metabase/reference/components/Field.css
@@ -1,5 +1,5 @@
:root {
- --title-color: #606e7b;
+ --title-color: var(--color-text-medium);
}
:local(.field) {
diff --git a/frontend/src/metabase/reference/components/FieldToGroupBy.css b/frontend/src/metabase/reference/components/FieldToGroupBy.css
index 18f16afe546a63225b4484eb6d32a2ec2f8ed2c7..babb272e142e204e021cdcfb7eb3c988d62dfe32 100644
--- a/frontend/src/metabase/reference/components/FieldToGroupBy.css
+++ b/frontend/src/metabase/reference/components/FieldToGroupBy.css
@@ -1,5 +1,5 @@
:local(.fieldToGroupByText) {
composes: flex-full from "style";
font-size: 16px;
- color: #aab7c3;
+ color: var(--color-text-medium);
}
diff --git a/frontend/src/metabase/reference/components/Formula.css b/frontend/src/metabase/reference/components/Formula.css
index 2ece8eac4c48338425d96439d97e0463ca979cbc..945461add2420e1b638636e723dd019494a133ae 100644
--- a/frontend/src/metabase/reference/components/Formula.css
+++ b/frontend/src/metabase/reference/components/Formula.css
@@ -4,7 +4,7 @@
:local(.formula) {
composes: bordered rounded my2 from "style";
- background-color: #fbfcfd;
+ background-color: var(--color-bg-light);
margin-left: var(--icon-width);
max-width: 550px;
cursor: pointer;
diff --git a/frontend/src/metabase/reference/components/ReferenceHeader.css b/frontend/src/metabase/reference/components/ReferenceHeader.css
index f6ab2aa00f67b452b11a953fec97950c7a1e1074..e6ae9651d1ab231366b12d7106ab52b62f1099be 100644
--- a/frontend/src/metabase/reference/components/ReferenceHeader.css
+++ b/frontend/src/metabase/reference/components/ReferenceHeader.css
@@ -1,5 +1,5 @@
:root {
- --title-color: #606e7b;
+ --title-color: var(--color-text-medium);
--icon-width: calc(48px + 1rem);
}
@@ -7,7 +7,7 @@
composes: flex flex-full border-bottom text-dark text-bold from "style";
overflow: hidden;
align-items: center;
- border-color: #edf5fb;
+ border-color: var(--color-border);
}
:local(.headerTextInput) {
@@ -29,12 +29,12 @@
}
:local(.subheaderLink) {
- color: var(--primary-button-bg-color);
+ color: var(--color-brand);
text-decoration: none;
}
:local(.subheaderLink):hover {
- color: color(var(--primary-button-border-color) shade(10%));
+ color: var(--color-brand);
transition: color 0.3s linear;
}
diff --git a/frontend/src/metabase/reference/components/ReferenceHeader.jsx b/frontend/src/metabase/reference/components/ReferenceHeader.jsx
index 77f82e65c6986dbaebfed7cad8fa5df201284c4c..8584fad9baca506e3f9fe60de1639a81d0b46e32 100644
--- a/frontend/src/metabase/reference/components/ReferenceHeader.jsx
+++ b/frontend/src/metabase/reference/components/ReferenceHeader.jsx
@@ -12,6 +12,7 @@ import IconBorder from "metabase/components/IconBorder.jsx";
import Icon from "metabase/components/Icon.jsx";
import Ellipsified from "metabase/components/Ellipsified.jsx";
import { t } from "c-3po";
+import colors from "metabase/lib/colors";
const ReferenceHeader = ({
name,
@@ -24,7 +25,10 @@ const ReferenceHeader = ({
<div className={cx("relative", L.header)}>
<div className={L.leftIcons}>
{headerIcon && (
- <IconBorder borderWidth="0" style={{ backgroundColor: "#E9F4F8" }}>
+ <IconBorder
+ borderWidth="0"
+ style={{ backgroundColor: colors["bg-medium"] }}
+ >
<Icon
className="text-brand"
name={headerIcon}
diff --git a/frontend/src/metabase/reference/guide/BaseSidebar.jsx b/frontend/src/metabase/reference/guide/BaseSidebar.jsx
index 52add1ae1da71ad0e1c5cf566f09e8c4b5228a44..116704e06f9f46c183b4934f4f4e6e34e5e6413e 100644
--- a/frontend/src/metabase/reference/guide/BaseSidebar.jsx
+++ b/frontend/src/metabase/reference/guide/BaseSidebar.jsx
@@ -20,12 +20,6 @@ const BaseSidebar = ({ style, className }) => (
/>
</div>
<ol>
- <SidebarItem
- key="/reference/guide"
- href="/reference/guide"
- icon="reference"
- name={t`Start here`}
- />
<SidebarItem
key="/reference/metrics"
href="/reference/metrics"
diff --git a/frontend/src/metabase/reference/utils.js b/frontend/src/metabase/reference/utils.js
index 5f69a8ea600082c60768dd1b32d168a673a9f0a6..58e8122417cb1f1ea9ee3027444b29e5a70919e7 100644
--- a/frontend/src/metabase/reference/utils.js
+++ b/frontend/src/metabase/reference/utils.js
@@ -76,9 +76,12 @@ export const getQuestion = ({
)
.updateIn(["display"], display => visualization || display)
.updateIn(["dataset_query", "query", "breakout"], oldBreakout => {
- if (fieldId && metadata && metadata.fields[fieldId])
+ if (fieldId && metadata && metadata.fields[fieldId]) {
return [metadata.fields[fieldId].getDefaultBreakout()];
- if (fieldId) return [fieldId];
+ }
+ if (fieldId) {
+ return [fieldId];
+ }
return oldBreakout;
})
.value();
diff --git a/frontend/src/metabase/routes.jsx b/frontend/src/metabase/routes.jsx
index d4af90d0e877abcb7e2ffa5afd3d27d79184d47c..c78820dfc437baa55a571f812560dad6d7cba5f5 100644
--- a/frontend/src/metabase/routes.jsx
+++ b/frontend/src/metabase/routes.jsx
@@ -257,7 +257,7 @@ export const getRoutes = store => (
{/* REFERENCE */}
<Route path="/reference" title={`Data Reference`}>
- <IndexRedirect to="/reference/guide" />
+ <IndexRedirect to="/reference/databases" />
<Route
path="guide"
title={`Getting Started`}
diff --git a/frontend/src/metabase/setup/components/UserStep.jsx b/frontend/src/metabase/setup/components/UserStep.jsx
index aaef411eeb301bbcfc9814ebda31b20eff1f788d..6cdcbf42c8a8a724897afe17e2631a882502ad27 100644
--- a/frontend/src/metabase/setup/components/UserStep.jsx
+++ b/frontend/src/metabase/setup/components/UserStep.jsx
@@ -49,7 +49,9 @@ export default class UserStep extends Component {
// required: first_name, last_name, email, password
Object.keys(fieldValues).forEach(fieldName => {
- if (MetabaseUtils.isEmpty(fieldValues[fieldName])) isValid = false;
+ if (MetabaseUtils.isEmpty(fieldValues[fieldName])) {
+ isValid = false;
+ }
});
if (!validPassword) {
diff --git a/frontend/src/metabase/tutorial/PageFlag.css b/frontend/src/metabase/tutorial/PageFlag.css
index 91cbded10f50e93243516bc4383d6478a941c8bf..879ce597a47fd8c1554cf324bda9b7d36e299740 100644
--- a/frontend/src/metabase/tutorial/PageFlag.css
+++ b/frontend/src/metabase/tutorial/PageFlag.css
@@ -4,13 +4,13 @@
position: relative;
min-width: 50px;
height: 24px;
- background-color: rgb(53, 141, 248);
+ background-color: var(--color-brand);
box-sizing: content-box;
border-top-right-radius: 8px;
border-bottom-right-radius: 8px;
border: 3px solid white;
border-left: 1px solid white;
- box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.5);
+ box-shadow: 2px 2px 6px var(--color-shadow);
color: white;
font-weight: bold;
@@ -36,7 +36,7 @@
left: -12px;
border-top: 12px solid transparent;
border-bottom: 12px solid transparent;
- border-right: 12px solid rgb(53, 141, 248);
+ border-right: 12px solid var(--color-brand);
}
.PageFlag:before {
diff --git a/frontend/src/metabase/tutorial/Portal.jsx b/frontend/src/metabase/tutorial/Portal.jsx
index 1378b4a396e684c7587db648f177fdfceb5ca6a0..031bdaf89a3bd3caeac0f8b393fba138014654b2 100644
--- a/frontend/src/metabase/tutorial/Portal.jsx
+++ b/frontend/src/metabase/tutorial/Portal.jsx
@@ -1,6 +1,7 @@
import React, { Component } from "react";
import BodyComponent from "metabase/components/BodyComponent.jsx";
+import colors from "metabase/lib/colors";
@BodyComponent
export default class Portal extends Component {
@@ -69,8 +70,8 @@ export default class Portal extends Component {
return {
position: "absolute",
boxSizing: "content-box",
- border: "10000px solid rgba(0,0,0,0.70)",
- boxShadow: "inset 0px 0px 8px rgba(0,0,0,0.25)",
+ border: `10000px solid ${colors["accent2"]}`,
+ boxShadow: `inset 0px 0px 8px ${colors["shadow"]}`,
transform: "translate(-10000px, -10000px)",
borderRadius: "10010px",
pointerEvents: "none",
diff --git a/frontend/src/metabase/tutorial/Tutorial.jsx b/frontend/src/metabase/tutorial/Tutorial.jsx
index bded7bfb6a7ce47c4bc3128247ebc9f5f748d331..6c5a2e97d5b51f50c3a99ff6e9ec00faa43b0a7b 100644
--- a/frontend/src/metabase/tutorial/Tutorial.jsx
+++ b/frontend/src/metabase/tutorial/Tutorial.jsx
@@ -89,7 +89,9 @@ export default class Tutorial extends Component {
}
return;
}
- } catch (e) {}
+ } catch (e) {
+ // intentionally do nothing
+ }
}
if (e.type === "click" && this.refs.pageflag) {
@@ -171,7 +173,9 @@ export default class Tutorial extends Component {
if (step.getPageFlagTarget) {
try {
pageFlagTarget = step.getPageFlagTarget();
- } catch (e) {}
+ } catch (e) {
+ // intentionally do nothing
+ }
if (pageFlagTarget == undefined) {
missingTarget = missingTarget || true;
}
@@ -181,7 +185,9 @@ export default class Tutorial extends Component {
if (step.getPortalTarget) {
try {
portalTarget = step.getPortalTarget();
- } catch (e) {}
+ } catch (e) {
+ // intentionally do nothing
+ }
if (portalTarget == undefined) {
missingTarget = missingTarget || true;
}
@@ -191,7 +197,9 @@ export default class Tutorial extends Component {
if (step.getModalTarget) {
try {
modalTarget = step.getModalTarget();
- } catch (e) {}
+ } catch (e) {
+ // intentionally do nothing
+ }
if (modalTarget == undefined) {
missingTarget = missingTarget || true;
}
diff --git a/frontend/src/metabase/user/components/SetUserPassword.jsx b/frontend/src/metabase/user/components/SetUserPassword.jsx
index e326aa672f6622cea05cd0e4b381db7c2d4143e0..1c793287614f3b59388f934867d5e5dfc09fa29f 100644
--- a/frontend/src/metabase/user/components/SetUserPassword.jsx
+++ b/frontend/src/metabase/user/components/SetUserPassword.jsx
@@ -36,7 +36,9 @@ export default class SetUserPassword extends Component {
// required: first_name, last_name, email
for (let fieldName in this.refs) {
let node = ReactDOM.findDOMNode(this.refs[fieldName]);
- if (node.required && MetabaseUtils.isEmpty(node.value)) isValid = false;
+ if (node.required && MetabaseUtils.isEmpty(node.value)) {
+ isValid = false;
+ }
}
if (isValid !== valid) {
diff --git a/frontend/src/metabase/user/components/UpdateUserDetails.jsx b/frontend/src/metabase/user/components/UpdateUserDetails.jsx
index 6683743dff1bb4ec87ed3e54663e3461e02b11a1..d398fa9393fc9fe822c60c4c95651f8e8a469d67 100644
--- a/frontend/src/metabase/user/components/UpdateUserDetails.jsx
+++ b/frontend/src/metabase/user/components/UpdateUserDetails.jsx
@@ -35,7 +35,9 @@ export default class UpdateUserDetails extends Component {
// required: first_name, last_name, email
for (let fieldName in this.refs) {
let node = ReactDOM.findDOMNode(this.refs[fieldName]);
- if (node.required && MetabaseUtils.isEmpty(node.value)) isValid = false;
+ if (node.required && MetabaseUtils.isEmpty(node.value)) {
+ isValid = false;
+ }
}
if (isValid !== valid) {
diff --git a/frontend/src/metabase/visualizations/components/ChartWithLegend.css b/frontend/src/metabase/visualizations/components/ChartWithLegend.css
index e8a4fe9312bd98d5d5a1b1d79c9c6b9bade75ff6..4ca163572093c290f2e4b319eb4431536bd646ce 100644
--- a/frontend/src/metabase/visualizations/components/ChartWithLegend.css
+++ b/frontend/src/metabase/visualizations/components/ChartWithLegend.css
@@ -65,12 +65,12 @@
/* DEBUG */
/*
:local .ChartWithLegend .Legend {
- background-color: rgba(0,0,255,0.1);
+ background-color: color(var(--color-bg-black) alpha(-90%));
}
:local .ChartWithLegend .Chart {
- background-color: rgba(0,255,0,0.1);
+ background-color: color(var(--color-success) alpha(-90%));
}
:local .ChartWithLegend.flexChart .Chart {
- background-color: rgba(255,0,0,0.1);
+ background-color: color(var(--color-error) alpha(-90%));
}
*/
diff --git a/frontend/src/metabase/visualizations/components/ChoroplethMap.jsx b/frontend/src/metabase/visualizations/components/ChoroplethMap.jsx
index 666af838d769ce44ca6feb7996af8c793dd9f454..380539f34b8a9fa42351a1fb8a9190083d8d78b2 100644
--- a/frontend/src/metabase/visualizations/components/ChoroplethMap.jsx
+++ b/frontend/src/metabase/visualizations/components/ChoroplethMap.jsx
@@ -1,3 +1,5 @@
+/* eslint-disable no-color-literals */
+
import React, { Component } from "react";
import { t } from "c-3po";
import LoadingSpinner from "metabase/components/LoadingSpinner.jsx";
@@ -30,6 +32,7 @@ import _ from "underscore";
// ];
// const HEAT_MAP_ZERO_COLOR = '#CCC';
+// TODO COLOR
const HEAT_MAP_COLORS = [
// "#E2F2FF",
"#C4E4FF",
diff --git a/frontend/src/metabase/visualizations/components/FunnelNormal.css b/frontend/src/metabase/visualizations/components/FunnelNormal.css
index c1497d0458e4eba82475a1fc6ce0faf74714a363..afde8aeb77a387387bce4e369da1034908c633c5 100644
--- a/frontend/src/metabase/visualizations/components/FunnelNormal.css
+++ b/frontend/src/metabase/visualizations/components/FunnelNormal.css
@@ -1,12 +1,12 @@
:local .Funnel {
- color: #a2a2a2;
+ color: var(--color-text-medium);
height: 100%;
}
:local .FunnelStep {
width: 100%;
min-width: 20px;
- border-right: 1px solid #e2e2e2;
+ border-right: 1px solid var(--color-border);
}
:local .FunnelStep.Initial {
diff --git a/frontend/src/metabase/visualizations/components/LeafletGridHeatMap.jsx b/frontend/src/metabase/visualizations/components/LeafletGridHeatMap.jsx
index 96b66add16440248b9ad63e3a0b4248083c57c4c..e841cf41e01981cad6ec2b9a73b51c317159a013 100644
--- a/frontend/src/metabase/visualizations/components/LeafletGridHeatMap.jsx
+++ b/frontend/src/metabase/visualizations/components/LeafletGridHeatMap.jsx
@@ -4,6 +4,7 @@ import { t } from "c-3po";
import d3 from "d3";
import { rangeForValue } from "metabase/lib/dataset";
+import colors from "metabase/lib/colors";
export default class LeafletGridHeatMap extends LeafletMap {
componentDidMount() {
@@ -29,7 +30,7 @@ export default class LeafletGridHeatMap extends LeafletMap {
.linear()
.domain([min, max])
.interpolate(d3.interpolateHcl)
- .range([d3.rgb("#00FF00"), d3.rgb("#FF0000")]);
+ .range([d3.rgb(colors["success"]), d3.rgb(colors["error"])]);
let gridSquares = gridLayer.getLayers();
let totalSquares = Math.max(points.length, gridSquares.length);
diff --git a/frontend/src/metabase/visualizations/components/LegendHeader.jsx b/frontend/src/metabase/visualizations/components/LegendHeader.jsx
index 51f9253b50f1ad6511f1cb41df0e79085d6362d0..6d1f0b72064cd2402bb81d02e3c32c1b2e658a05 100644
--- a/frontend/src/metabase/visualizations/components/LegendHeader.jsx
+++ b/frontend/src/metabase/visualizations/components/LegendHeader.jsx
@@ -28,6 +28,7 @@ export default class LegendHeader extends Component {
onChangeCardAndRun: PropTypes.func,
actionButtons: PropTypes.node,
description: PropTypes.string,
+ classNameWidgets: PropTypes.string,
};
static defaultProps = {
@@ -59,6 +60,7 @@ export default class LegendHeader extends Component {
description,
onVisualizationClick,
visualizationIsClickable,
+ classNameWidgets,
} = this.props;
const showDots = series.length > 1;
const isNarrow = this.state.width < 150;
@@ -105,6 +107,7 @@ export default class LegendHeader extends Component {
})
: null
}
+ infoClassName={classNameWidgets}
/>,
onRemoveSeries &&
index > 0 && (
@@ -118,7 +121,12 @@ export default class LegendHeader extends Component {
),
])}
{actionButtons && (
- <span className="flex-no-shrink flex-align-right relative">
+ <span
+ className={cx(
+ classNameWidgets,
+ "flex-no-shrink flex-align-right relative",
+ )}
+ >
{actionButtons}
</span>
)}
diff --git a/frontend/src/metabase/visualizations/components/LegendItem.jsx b/frontend/src/metabase/visualizations/components/LegendItem.jsx
index 4edacdabbbb1d8d032452380fc6d27a883563910..0ac18f12b9e56a2201d49975f42e6c942bf6dc81 100644
--- a/frontend/src/metabase/visualizations/components/LegendItem.jsx
+++ b/frontend/src/metabase/visualizations/components/LegendItem.jsx
@@ -39,6 +39,7 @@ export default class LegendItem extends Component {
className,
description,
onClick,
+ infoClassName,
} = this.props;
return (
<LegendLink
@@ -79,7 +80,7 @@ export default class LegendItem extends Component {
{description && (
<div className="hover-child">
<Tooltip tooltip={description} maxWidth={"22em"}>
- <Icon name="info" />
+ <Icon className={infoClassName} name="info" />
</Tooltip>
</div>
)}
diff --git a/frontend/src/metabase/visualizations/components/LineAreaBarChart.css b/frontend/src/metabase/visualizations/components/LineAreaBarChart.css
index 689a80609c43a0e2857c829d494878f764361a50..a5e0d6f0c404f0e9c630347410b188070ae20f34 100644
--- a/frontend/src/metabase/visualizations/components/LineAreaBarChart.css
+++ b/frontend/src/metabase/visualizations/components/LineAreaBarChart.css
@@ -7,7 +7,7 @@
}
.LineAreaBarChart .dc-chart .grid-line.horizontal {
- stroke: rgba(151, 151, 151, 0.2);
+ stroke: color(var(--color-text-medium) alpha(-80%));
stroke-dasharray: 5, 5;
}
@@ -23,15 +23,15 @@
.LineAreaBarChart .dc-chart .axis .domain,
.LineAreaBarChart .dc-chart .axis .tick line {
- stroke: #dce1e4;
+ stroke: var(--color-text-light);
}
.LineAreaBarChart .dc-chart .axis .tick text {
- fill: #93a1ab;
+ fill: var(--color-text-medium);
}
.LineAreaBarChart .dc-chart g.row text.outside {
- fill: #c5c6c8;
+ fill: var(--color-text-light);
}
.LineAreaBarChart .dc-chart g.row text.inside {
fill: white;
@@ -47,7 +47,7 @@
.LineAreaBarChart .dc-chart .x-axis-label,
.LineAreaBarChart .dc-chart .y-axis-label {
- fill: #727479;
+ fill: var(--color-text-medium);
font-size: 14px;
font-weight: 900;
}
@@ -121,7 +121,7 @@
opacity: 0;
}
.LineAreaBarChart .dc-chart .line.deselected {
- color: #ccc;
+ color: var(--color-text-light);
}
.LineAreaBarChart .dc-chart .area,
@@ -168,6 +168,6 @@
/* brush handles */
.LineAreaBarChart .dc-chart .brush .resize path {
- fill: #f9fbfc;
- stroke: #9ba5b1;
+ fill: var(--color-bg-light);
+ stroke: var(--color-text-medium);
}
diff --git a/frontend/src/metabase/visualizations/components/Table.css b/frontend/src/metabase/visualizations/components/Table.css
index 715c772707bd66f24c1e18aebf3f1ff90f20a05c..e65d8cf74154a808551c6e241e3cdb09afa3813e 100644
--- a/frontend/src/metabase/visualizations/components/Table.css
+++ b/frontend/src/metabase/visualizations/components/Table.css
@@ -12,13 +12,13 @@
}
:local(.Table) tr {
- border-bottom: 1px solid var(--table-border-color);
+ border-bottom: 1px solid color(var(--color-border) alpha(-70%));
}
:local(.Table) th,
:local(.Table) td {
padding: 1em;
- border-bottom: 1px solid var(--table-border-color);
+ border-bottom: 1px solid color(var(--color-border) alpha(-70%));
}
:local(.TableSimple) th:first-child,
diff --git a/frontend/src/metabase/visualizations/components/TableInteractive.css b/frontend/src/metabase/visualizations/components/TableInteractive.css
index 07511fb6817797f28eeeb7ccea47038418618877..029ead80e5c34b83d5a2110b0a6580da524ee6a7 100644
--- a/frontend/src/metabase/visualizations/components/TableInteractive.css
+++ b/frontend/src/metabase/visualizations/components/TableInteractive.css
@@ -30,12 +30,12 @@
/* if the column is the one that is being sorted*/
.TableInteractive-headerCellData--sorted {
- color: var(--brand-color);
+ color: var(--color-brand);
}
.TableInteractive-header {
box-sizing: border-box;
- border-bottom: 1px solid #e0e0e0;
+ border-bottom: 1px solid var(--color-border);
}
.TableInteractive .TableInteractive-cellWrapper {
@@ -47,14 +47,14 @@
border-top: 1px solid transparent;
border-left: 1px solid transparent;
border-right: 1px solid transparent;
- border-bottom: 1px solid var(--table-border-color);
+ border-bottom: 1px solid color(var(--color-border) alpha(-70%));
}
.TableInteractive .TableInteractive-cellWrapper--active,
.TableInteractive:not(.TableInteractive--noHover)
.TableInteractive-cellWrapper:hover {
- border-color: var(--brand-color);
- color: var(--brand-color);
+ border-color: var(--color-brand);
+ color: var(--color-brand);
}
.TableInteractive .TableInteractive-cellWrapper--active {
@@ -63,13 +63,13 @@
.TableInteractive .TableInteractive-header,
.TableInteractive .TableInteractive-header .TableInteractive-cellWrapper {
- background-color: #fff;
+ background-color: var(--color-bg-white);
background-image: none;
}
.TableInteractive .TableInteractive-header,
.TableInteractive .TableInteractive-header .TableInteractive-cellWrapper {
- background-color: #fff;
+ background-color: var(--color-bg-white);
}
/* cell overflow ellipsis */
@@ -83,14 +83,14 @@
/* pivot */
.TableInteractive.TableInteractive--pivot
.TableInteractive-cellWrapper--firstColumn {
- border-right: 1px solid rgb(205, 205, 205);
+ border-right: 1px solid var(--color-border);
}
.PagingButtons {
- border: 1px solid #ddd;
+ border: 1px solid var(--color-border);
}
.TableInteractive .TableInteractive-cellWrapper.tether-enabled {
- background-color: var(--brand-color);
+ background-color: var(--color-brand);
color: white !important;
}
diff --git a/frontend/src/metabase/visualizations/components/Visualization.jsx b/frontend/src/metabase/visualizations/components/Visualization.jsx
index 863c27d0a3fce3e3d717986df072dc50d884469a..d4c87d44d4c7645b5970f5026954c39fe2d0f3f4 100644
--- a/frontend/src/metabase/visualizations/components/Visualization.jsx
+++ b/frontend/src/metabase/visualizations/components/Visualization.jsx
@@ -92,6 +92,8 @@ type Props = {
gridSize?: { width: number, height: number },
// if gridSize isn't specified, compute using this gridSize (4x width, 3x height)
gridUnit?: number,
+
+ classNameWidgets?: string,
};
type State = {
@@ -402,7 +404,7 @@ export default class Visualization extends Component {
</span>
);
- let { gridSize, gridUnit } = this.props;
+ let { gridSize, gridUnit, classNameWidgets } = this.props;
if (!gridSize && gridUnit) {
gridSize = {
width: Math.round(width / (gridUnit * 4)),
@@ -421,6 +423,7 @@ export default class Visualization extends Component {
replacementContent ? (
<div className="p1 flex-no-shrink">
<LegendHeader
+ classNameWidgets={classNameWidgets}
series={
settings["card.title"]
? // if we have a card title set, use it
diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingInputGroup.jsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingInputGroup.jsx
index b1646600f185d385597c764569ad8b0d77fd0fb6..8cc95fbbfef2f77f3bea8c56acec1df61f294b85 100644
--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingInputGroup.jsx
+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingInputGroup.jsx
@@ -11,7 +11,9 @@ export default function ChartSettingInputGroup({ value: values, onChange }) {
value={str}
onBlurChange={e => {
const newStr = e.target.value.trim();
- if (!newStr || !newStr.length) return;
+ if (!newStr || !newStr.length) {
+ return;
+ }
// clone the original values array. It's read-only so we can't just replace the one value we want
const newValues = values.slice();
newValues[i] = newStr;
diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingsTableFormatting.jsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingsTableFormatting.jsx
index 0d669b714558247e613ce6e7574d7419f4d2fbbc..054f5391eb531a2b83a0e56201d375c3c3b0c0db 100644
--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingsTableFormatting.jsx
+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingsTableFormatting.jsx
@@ -28,16 +28,16 @@ const OPERATOR_NAMES = {
"!=": t`not equal to`,
};
-import { desaturated as colors, getColorScale } from "metabase/lib/colors";
+import colors, { desaturated, getColorScale } from "metabase/lib/colors";
-const COLORS = Object.values(colors);
+const COLORS = Object.values(desaturated);
const COLOR_RANGES = [].concat(
...COLORS.map(color => [["white", color], [color, "white"]]),
[
- [colors.red, "white", colors.green],
- [colors.green, "white", colors.red],
- [colors.red, colors.yellow, colors.green],
- [colors.green, colors.yellow, colors.red],
+ [colors.error, "white", colors.success],
+ [colors.success, "white", colors.error],
+ [colors.error, colors.warning, colors.success],
+ [colors.success, colors.warning, colors.error],
],
);
@@ -217,10 +217,9 @@ const RulePreview = ({ rule, cols, onClick, onRemove }) => (
<div className="p2 flex align-center">
<RuleBackground
rule={rule}
- className={cx(
- "mr2 flex-no-shrink rounded overflow-hidden border-grey-1",
- { bordered: rule.type === "range" },
- )}
+ className={cx("mr2 flex-no-shrink rounded overflow-hidden", {
+ bordered: rule.type === "range",
+ })}
style={{ width: 40, height: 40 }}
/>
<RuleDescription rule={rule} />
diff --git a/frontend/src/metabase/visualizations/lib/LineAreaBarPostRender.js b/frontend/src/metabase/visualizations/lib/LineAreaBarPostRender.js
index 73a1a1d0c908d4e54a8a23be4c5c5baefdfef201..516a9a991c8a031dbcbec74bead17c2cffc71bc0 100644
--- a/frontend/src/metabase/visualizations/lib/LineAreaBarPostRender.js
+++ b/frontend/src/metabase/visualizations/lib/LineAreaBarPostRender.js
@@ -2,6 +2,7 @@
import d3 from "d3";
+import colors from "metabase/lib/colors";
import { clipPathReference } from "metabase/lib/dom";
import { adjustYAxisTicksIfNeeded } from "./apply_axis";
@@ -170,7 +171,7 @@ function onRenderCleanupGoal(chart, onGoalHover, isSplitAxis) {
this.parentNode.appendChild(this);
});
chart.selectAll(".goal .line").attr({
- stroke: "rgba(157,160,164, 0.7)",
+ stroke: colors["text-medium"],
"stroke-dasharray": "5,5",
});
@@ -204,7 +205,7 @@ function onRenderCleanupGoal(chart, onGoalHover, isSplitAxis) {
y: y - 5,
"text-anchor": labelOnRight ? "end" : "start",
"font-weight": "bold",
- fill: "rgb(157,160,164)",
+ fill: colors["text-medium"],
})
.on("mouseenter", function() {
onGoalHover(this);
diff --git a/frontend/src/metabase/visualizations/lib/LineAreaBarRenderer.js b/frontend/src/metabase/visualizations/lib/LineAreaBarRenderer.js
index 681fded98ac709fb0e8ae2895e7345a2cef82524..24f5f2aa1d908ba69c6f6741f616daffe0798b5b 100644
--- a/frontend/src/metabase/visualizations/lib/LineAreaBarRenderer.js
+++ b/frontend/src/metabase/visualizations/lib/LineAreaBarRenderer.js
@@ -122,7 +122,9 @@ function getXInterval({ settings, series }, xValues) {
// TODO: multiseries?
const binningInfo = getFirstNonEmptySeries(series).data.cols[0]
.binning_info;
- if (binningInfo) return binningInfo.bin_width;
+ if (binningInfo) {
+ return binningInfo.bin_width;
+ }
// Otherwise try to infer from the X values
return computeNumericDataInverval(xValues);
@@ -351,17 +353,21 @@ function getDcjsChart(cardType, parent) {
function applyChartLineBarSettings(chart, settings, chartType) {
// LINE/AREA:
// for chart types that have an 'interpolate' option (line/area charts), enable based on settings
- if (chart.interpolate)
+ if (chart.interpolate) {
chart.interpolate(settings["line.interpolate"] || DEFAULT_INTERPOLATION);
+ }
// AREA:
- if (chart.renderArea) chart.renderArea(chartType === "area");
+ if (chart.renderArea) {
+ chart.renderArea(chartType === "area");
+ }
// BAR:
- if (chart.barPadding)
+ if (chart.barPadding) {
chart
.barPadding(BAR_PADDING_RATIO)
.centerBar(settings["graph.x_axis.scale"] !== "ordinal");
+ }
}
// TODO - give this a good name when I figure out what it does
@@ -424,8 +430,9 @@ function getCharts(
return groups.map((group, index) => {
const chart = getDcjsChart(chartType, parent);
- if (enableBrush(series, onChangeCardAndRun))
+ if (enableBrush(series, onChangeCardAndRun)) {
initBrush(parent, chart, onBrushChange, onBrushEnd);
+ }
// disable clicks
chart.onClick = () => {};
@@ -436,8 +443,9 @@ function getCharts(
.transitionDuration(0)
.useRightYAxis(yAxisSplit.length > 1 && yAxisSplit[1].includes(index));
- if (chartType === "scatter")
+ if (chartType === "scatter") {
doScatterChartStuff(chart, datas, index, yAxisProps);
+ }
if (chart.defined) {
chart.defined(
@@ -466,7 +474,9 @@ function addGoalChartAndGetOnGoalHover(
parent,
charts,
) {
- if (!settings["graph.show_goal"]) return () => {};
+ if (!settings["graph.show_goal"]) {
+ return () => {};
+ }
const goalValue = settings["graph.goal_value"];
const goalData = [[xDomain[0], goalValue], [xDomain[1], goalValue]];
@@ -503,18 +513,22 @@ function addGoalChartAndGetOnGoalHover(
}
function applyXAxisSettings(parent, series, xAxisProps) {
- if (isTimeseries(parent.settings))
+ if (isTimeseries(parent.settings)) {
applyChartTimeseriesXAxis(parent, series, xAxisProps);
- else if (isQuantitative(parent.settings))
+ } else if (isQuantitative(parent.settings)) {
applyChartQuantitativeXAxis(parent, series, xAxisProps);
- else applyChartOrdinalXAxis(parent, series, xAxisProps);
+ } else {
+ applyChartOrdinalXAxis(parent, series, xAxisProps);
+ }
}
function applyYAxisSettings(parent, { yLeftSplit, yRightSplit }) {
- if (yLeftSplit && yLeftSplit.series.length > 0)
+ if (yLeftSplit && yLeftSplit.series.length > 0) {
applyChartYAxis(parent, yLeftSplit.series, yLeftSplit.extent, "left");
- if (yRightSplit && yRightSplit.series.length > 0)
+ }
+ if (yRightSplit && yRightSplit.series.length > 0) {
applyChartYAxis(parent, yRightSplit.series, yRightSplit.extent, "right");
+ }
}
// TODO - better name
@@ -551,7 +565,9 @@ function doHistogramBarStuff(parent) {
const barCharts = chart
.selectAll(".sub rect:first-child")[0]
.map(node => node.parentNode.parentNode.parentNode);
- if (!barCharts.length) return;
+ if (!barCharts.length) {
+ return;
+ }
// manually size bars to fill space, minus 1 pixel padding
const bars = barCharts[0].querySelectorAll("rect");
@@ -607,7 +623,9 @@ export default function lineAreaBar(
datas = fillMissingValuesInDatas(props, xAxisProps, datas);
xAxisProps = getXAxisProps(props, datas);
- if (isScalarSeries) xAxisProps.xValues = datas.map(data => data[0][0]); // TODO - what is this for?
+ if (isScalarSeries) {
+ xAxisProps.xValues = datas.map(data => data[0][0]);
+ } // TODO - what is this for?
const {
dimension,
@@ -617,8 +635,9 @@ export default function lineAreaBar(
const yAxisProps = getYAxisProps(props, groups, datas);
// Don't apply to linear or timeseries X-axis since the points are always plotted in order
- if (!isTimeseries(settings) && !isQuantitative(settings))
+ if (!isTimeseries(settings) && !isQuantitative(settings)) {
forceSortedGroupsOfGroups(groups, makeIndexMap(xAxisProps.xValues));
+ }
const parent = dc.compositeChart(element);
initChart(parent, element);
@@ -657,7 +676,9 @@ export default function lineAreaBar(
applyXAxisSettings(parent, props.series, xAxisProps);
// override tick format for bars. ticks are aligned with beginning of bar, so just show the start value
- if (isHistogramBar(props)) parent.xAxis().tickFormat(d => formatNumber(d));
+ if (isHistogramBar(props)) {
+ parent.xAxis().tickFormat(d => formatNumber(d));
+ }
applyYAxisSettings(parent, yAxisProps);
@@ -674,13 +695,16 @@ export default function lineAreaBar(
);
// only ordinal axis can display "null" values
- if (isOrdinal(parent.settings)) delete warnings[NULL_DIMENSION_WARNING];
+ if (isOrdinal(parent.settings)) {
+ delete warnings[NULL_DIMENSION_WARNING];
+ }
- if (onRender)
+ if (onRender) {
onRender({
yAxisSplit: yAxisProps.yAxisSplit,
warnings: Object.keys(warnings),
});
+ }
// return an unregister function
return () => {
diff --git a/frontend/src/metabase/visualizations/lib/apply_axis.js b/frontend/src/metabase/visualizations/lib/apply_axis.js
index 572f3ea85cff906f41534337a73813bbe2131977..5129e359249b34f0b8d8b3cfe871c52a6380a144 100644
--- a/frontend/src/metabase/visualizations/lib/apply_axis.js
+++ b/frontend/src/metabase/visualizations/lib/apply_axis.js
@@ -48,7 +48,9 @@ function averageStringLengthOfValues(values) {
values = values.slice(0, MAX_VALUES_TO_MEASURE);
let totalLength = 0;
- for (let value of values) totalLength += String(value).length;
+ for (let value of values) {
+ totalLength += String(value).length;
+ }
return Math.round(totalLength / values.length);
}
@@ -73,7 +75,9 @@ function adjustXAxisTicksIfNeeded(axis, chartWidthPixels, xValues) {
const maxTicks = Math.floor(chartWidthPixels / tickAverageWidthPixels);
// finally, if the chart is currently showing more ticks than we think it can show, adjust it down
- if (getNumTicks(axis) > maxTicks) axis.ticks(maxTicks);
+ if (getNumTicks(axis) > maxTicks) {
+ axis.ticks(maxTicks);
+ }
}
export function applyChartTimeseriesXAxis(
diff --git a/frontend/src/metabase/visualizations/lib/apply_tooltips.js b/frontend/src/metabase/visualizations/lib/apply_tooltips.js
index ae2e22c71a5029861127cc97d454a968da561843..3c7aef85d6f88dc8ff6faae36c5c20386334ad9b 100644
--- a/frontend/src/metabase/visualizations/lib/apply_tooltips.js
+++ b/frontend/src/metabase/visualizations/lib/apply_tooltips.js
@@ -107,8 +107,12 @@ function applyChartTooltips(
data = rawCols.map((col, i) => {
// if this was one of the original x/y columns keep the original object because it
// may have the `isNormalized` tweak above.
- if (col === data[0].col) return data[0];
- if (col === data[1].col) return data[1];
+ if (col === data[0].col) {
+ return data[0];
+ }
+ if (col === data[1].col) {
+ return data[1];
+ }
// otherwise just create a new object for any other columns.
return {
key: getFriendlyName(col),
diff --git a/frontend/src/metabase/visualizations/lib/numeric.js b/frontend/src/metabase/visualizations/lib/numeric.js
index 2644882af2d2ffe075d504608cb6f9ff947c14bc..733629806bc588158f39e14718ce0df2001068e1 100644
--- a/frontend/src/metabase/visualizations/lib/numeric.js
+++ b/frontend/src/metabase/visualizations/lib/numeric.js
@@ -24,7 +24,9 @@ export function precision(a) {
}
export function decimalCount(a) {
- if (!isFinite(a)) return 0;
+ if (!isFinite(a)) {
+ return 0;
+ }
let e = 1,
p = 0;
while (Math.round(a * e) / e !== a) {
diff --git a/frontend/src/metabase/visualizations/lib/settings.js b/frontend/src/metabase/visualizations/lib/settings.js
index 2669174347dce653b836e969374189410172669c..2331906775dcb80b1668d0a8dbfa04391d646d69 100644
--- a/frontend/src/metabase/visualizations/lib/settings.js
+++ b/frontend/src/metabase/visualizations/lib/settings.js
@@ -64,39 +64,36 @@ function getDefaultScatterColumns([{ data: { cols, rows } }]) {
function getDefaultLineAreaBarColumns([{ data: { cols, rows } }]) {
let type = getChartTypeFromData(cols, rows, false);
- switch (type) {
- case DIMENSION_DIMENSION_METRIC:
- let dimensions = [cols[0], cols[1]];
- if (isDate(dimensions[1]) && !isDate(dimensions[0])) {
- // if the series dimension is a date but the axis dimension is not then swap them
- dimensions.reverse();
- } else if (
- getColumnCardinality(cols, rows, 1) >
- getColumnCardinality(cols, rows, 0)
- ) {
- // if the series dimension is higher cardinality than the axis dimension then swap them
- dimensions.reverse();
- }
- return {
- dimensions: dimensions.map(col => col.name),
- metrics: [cols[2].name],
- };
- case DIMENSION_METRIC:
- return {
- dimensions: [cols[0].name],
- metrics: [cols[1].name],
- };
- case DIMENSION_METRIC_METRIC:
- return {
- dimensions: [cols[0].name],
- metrics: cols.slice(1).map(col => col.name),
- };
- default:
- return {
- dimensions: [null],
- metrics: [null],
- };
+ if (type === DIMENSION_DIMENSION_METRIC) {
+ let dimensions = [cols[0], cols[1]];
+ if (isDate(dimensions[1]) && !isDate(dimensions[0])) {
+ // if the series dimension is a date but the axis dimension is not then swap them
+ dimensions.reverse();
+ } else if (
+ getColumnCardinality(cols, rows, 1) > getColumnCardinality(cols, rows, 0)
+ ) {
+ // if the series dimension is higher cardinality than the axis dimension then swap them
+ dimensions.reverse();
+ }
+ return {
+ dimensions: dimensions.map(col => col.name),
+ metrics: [cols[2].name],
+ };
+ } else if (type === DIMENSION_METRIC) {
+ return {
+ dimensions: [cols[0].name],
+ metrics: [cols[1].name],
+ };
+ } else if (type === DIMENSION_METRIC_METRIC) {
+ return {
+ dimensions: [cols[0].name],
+ metrics: cols.slice(1).map(col => col.name),
+ };
}
+ return {
+ dimensions: [null],
+ metrics: [null],
+ };
}
export function getDefaultDimensionAndMetric([{ data }]) {
diff --git a/frontend/src/metabase/visualizations/lib/timeseries.js b/frontend/src/metabase/visualizations/lib/timeseries.js
index 73024a50183f1620d5dd6f8cb4153b075b8d87b0..7c984fbae6e6e7b3fe0f2572a3310ff7a72e4e9e 100644
--- a/frontend/src/metabase/visualizations/lib/timeseries.js
+++ b/frontend/src/metabase/visualizations/lib/timeseries.js
@@ -257,7 +257,9 @@ function timeseriesTicksInterval(
},
);
// if we weren't able to find soemthing matching then we'll start from the beginning and try everything
- if (initialIndex === -1) initialIndex = 0;
+ if (initialIndex === -1) {
+ initialIndex = 0;
+ }
// now starting at the TIMESERIES_INTERVALS entry in question, calculate the expected tick count for that interval
// based on the time range we are displaying. If the expected tick count is less than or equal to the target
@@ -265,8 +267,9 @@ function timeseriesTicksInterval(
// example every 3 hours instead of every one hour. Continue until we find something with an interval large enough
// to keep the total tick count under the max tick count
for (const interval of _.rest(TIMESERIES_INTERVALS, initialIndex)) {
- if (expectedTickCount(interval, timeRangeMilliseconds) <= maxTickCount)
+ if (expectedTickCount(interval, timeRangeMilliseconds) <= maxTickCount) {
return interval;
+ }
}
// If we still failed to find an interval that will produce less ticks than the max then fall back to the largest
diff --git a/frontend/src/metabase/visualizations/lib/utils.js b/frontend/src/metabase/visualizations/lib/utils.js
index 31cc7e71796697cce2e079a884e69c82aca35fee..bac3243557d2e537daaa35edfead60a6eccb7eba 100644
--- a/frontend/src/metabase/visualizations/lib/utils.js
+++ b/frontend/src/metabase/visualizations/lib/utils.js
@@ -6,7 +6,7 @@ import d3 from "d3";
import { t } from "c-3po";
import crossfilter from "crossfilter";
-import * as colors from "metabase/lib/colors";
+import { harmony } from "metabase/lib/colors";
const SPLIT_AXIS_UNSPLIT_COST = -100;
const SPLIT_AXIS_COST_FACTOR = 2;
@@ -172,8 +172,8 @@ export function getCardColors(card) {
chartColorList = settings.line.colors;
}
return _.uniq(
- [chartColor || Object.values(colors.harmony)[0]].concat(
- chartColorList || Object.values(colors.harmony),
+ [chartColor || Object.values(harmony)[0]].concat(
+ chartColorList || Object.values(harmony),
),
);
}
diff --git a/frontend/src/metabase/visualizations/visualizations/ObjectDetail.jsx b/frontend/src/metabase/visualizations/visualizations/ObjectDetail.jsx
index d38f38e1f727641342d3d1d028908741e4c42db1..2daa03af2f7f6354efa75f4669853c980291edea 100644
--- a/frontend/src/metabase/visualizations/visualizations/ObjectDetail.jsx
+++ b/frontend/src/metabase/visualizations/visualizations/ObjectDetail.jsx
@@ -69,7 +69,9 @@ export class ObjectDetail extends Component {
}
getIdValue() {
- if (!this.props.data) return null;
+ if (!this.props.data) {
+ return null;
+ }
const { data: { cols, rows } } = this.props;
const columnIndex = _.findIndex(cols, col => isPK(col));
diff --git a/frontend/src/metabase/visualizations/visualizations/PieChart.css b/frontend/src/metabase/visualizations/visualizations/PieChart.css
index e8416580450c54a991fd517322e88b336950284d..b171490e8ae7a2ea7714c1f4988840414c1ad53a 100644
--- a/frontend/src/metabase/visualizations/visualizations/PieChart.css
+++ b/frontend/src/metabase/visualizations/visualizations/PieChart.css
@@ -26,13 +26,13 @@
}
:local .Value {
- color: #676c72;
+ color: var(--color-text-dark);
font-size: 22px;
font-weight: bolder;
}
:local .Title {
- color: #b8c0c9;
+ color: var(--color-text-light);
font-size: 14px;
font-weight: bold;
text-transform: uppercase;
diff --git a/frontend/src/metabase/visualizations/visualizations/PieChart.jsx b/frontend/src/metabase/visualizations/visualizations/PieChart.jsx
index 5561ed83238a06dfdb49b976380209feb93bbb8b..02535be0fc5f1b6cbe4af9b7db44448d979a826d 100644
--- a/frontend/src/metabase/visualizations/visualizations/PieChart.jsx
+++ b/frontend/src/metabase/visualizations/visualizations/PieChart.jsx
@@ -16,7 +16,7 @@ import {
import { formatValue } from "metabase/lib/formatting";
-import * as colors from "metabase/lib/colors";
+import { normal, harmony } from "metabase/lib/colors";
import cx from "classnames";
@@ -136,9 +136,7 @@ export default class PieChart extends Component {
let total: number = rows.reduce((sum, row) => sum + row[metricIndex], 0);
// use standard colors for up to 5 values otherwise use color harmony to help differentiate slices
- let sliceColors = Object.values(
- rows.length > 5 ? colors.harmony : colors.normal,
- );
+ let sliceColors = Object.values(rows.length > 5 ? harmony : normal);
let sliceThreshold =
typeof settings["pie.slice_threshold"] === "number"
? settings["pie.slice_threshold"] / 100
@@ -162,7 +160,7 @@ export default class PieChart extends Component {
key: "Other",
value: otherTotal,
percentage: otherTotal / total,
- color: colors.normal.grey1,
+ color: normal.grey1,
};
slices.push(otherSlice);
}
@@ -188,7 +186,7 @@ export default class PieChart extends Component {
if (slices.length === 0) {
otherSlice = {
value: 1,
- color: colors.normal.grey1,
+ color: normal.grey1,
noHover: true,
};
slices.push(otherSlice);
diff --git a/frontend/src/metabase/visualizations/visualizations/Scalar.css b/frontend/src/metabase/visualizations/visualizations/Scalar.css
index 0a372b305caf7145fbcf067662a3931b255e36f0..e64e37bf166cc290b2d4950921d8896dab96f6e1 100644
--- a/frontend/src/metabase/visualizations/visualizations/Scalar.css
+++ b/frontend/src/metabase/visualizations/visualizations/Scalar.css
@@ -3,7 +3,7 @@
flex-direction: column;
justify-content: center;
padding: 1em 2em 1em 2em;
- color: #525658;
+ color: var(--color-text-dark);
}
:local .Scalar .Value {
font-weight: bold;
diff --git a/frontend/src/metabase/visualizations/visualizations/Text.css b/frontend/src/metabase/visualizations/visualizations/Text.css
index 9de3a09bb365503013822517f5bf8582c31202e9..49290aac48694d6b05bc225ca4b0c4bbf5d4bbad 100644
--- a/frontend/src/metabase/visualizations/visualizations/Text.css
+++ b/frontend/src/metabase/visualizations/visualizations/Text.css
@@ -21,9 +21,9 @@
border-radius: var(--default-border-radius);
}
:local .Text .text-card-textarea:focus {
- border-color: var(--brand-color);
+ border-color: var(--color-brand);
background-color: white;
- box-shadow: 0 1px 7px rgba(0, 0, 0, 0.1);
+ box-shadow: 0 1px 7px var(--color-shadow);
}
:local .Text .text-card-markdown {
overflow: auto;
@@ -90,7 +90,7 @@
font-weight: bold;
cursor: pointer;
text-decoration: none;
- color: var(--default-link-color);
+ color: var(--color-brand);
}
:local .text-card-markdown a:hover {
text-decoration: underline;
@@ -116,15 +116,15 @@
text-align: left;
}
:local .text-card-markdown tr {
- border-bottom: 1px solid var(--table-border-color);
+ border-bottom: 1px solid color(var(--color-border) alpha(-70%));
}
:local .text-card-markdown tr:nth-child(even) {
- background-color: var(--table-alt-bg-color);
+ background-color: color(var(--color-bg-black) alpha(-98%));
}
:local .text-card-markdown th,
:local .text-card-markdown td {
padding: 0.75em;
- border: 1px solid var(--table-border-color);
+ border: 1px solid color(var(--color-border) alpha(-70%));
}
:local .text-card-markdown code {
@@ -132,7 +132,7 @@
font-size: 12.64px;
line-height: 20px;
padding: 0 0.25em;
- background-color: var(--base-grey);
+ background-color: var(--color-bg-light);
border-radius: var(--default-border-radius);
}
@@ -143,8 +143,8 @@
}
:local .text-card-markdown blockquote {
- color: var(--grey-4);
- border-left: 5px solid var(--grey-1);
+ color: var(--color-text-medium);
+ border-left: 5px solid var(--color-border);
padding: 0 1.5em 0 17px;
margin: 0.5em 0 0.5em 1em;
}
diff --git a/frontend/test/.eslintrc b/frontend/test/.eslintrc
index 61e755e9d565102e72622a488abeed085ff4f2ad..1cd6314fbfd1f8f7a14d53b2058bbc8115419913 100644
--- a/frontend/test/.eslintrc
+++ b/frontend/test/.eslintrc
@@ -2,7 +2,8 @@
"rules": {
"jasmine/no-focused-tests": 2,
"jasmine/no-suite-dupes": [2, "branch"],
- "import/no-commonjs": 0
+ "import/no-commonjs": 0,
+ "no-color-literals": 0
},
"env": {
"jasmine": true,
diff --git a/frontend/test/__runner__/backend.js b/frontend/test/__runner__/backend.js
index 5df9cfb1608c1f80e1aac19a14e9f7c3dcad5e66..42b1f0b0b406eb2a3137efaa597277a2d34d2611 100644
--- a/frontend/test/__runner__/backend.js
+++ b/frontend/test/__runner__/backend.js
@@ -145,7 +145,6 @@ function createSharedResource(
};
entriesByKey.set(entry.key, entry);
entriesByResource.set(entry.resource, entry);
- } else {
}
++entry.references;
return entry.resource;
diff --git a/frontend/test/__support__/enzyme_utils.js b/frontend/test/__support__/enzyme_utils.js
index b72044669542e38ed8fc3033b1bce1711d10ba56..b50b2f41b5de80fb405ad2a490c6c717c749fd60 100644
--- a/frontend/test/__support__/enzyme_utils.js
+++ b/frontend/test/__support__/enzyme_utils.js
@@ -67,7 +67,9 @@ export const setInputValue = (inputWrapper, value, { blur = true } = {}) => {
}
inputWrapper.simulate("change", { target: { value: value } });
- if (blur) inputWrapper.simulate("blur");
+ if (blur) {
+ inputWrapper.simulate("blur");
+ }
};
export const chooseSelectOption = optionWrapper => {
diff --git a/frontend/test/__support__/integrated_tests.js b/frontend/test/__support__/integrated_tests.js
index 04f9a7895e7f2b56dccd804f35174ae84135e2f4..754f82dea9e16291e9c51992fe15e65f3993635b 100644
--- a/frontend/test/__support__/integrated_tests.js
+++ b/frontend/test/__support__/integrated_tests.js
@@ -231,7 +231,9 @@ const testStoreEnhancer = (createStore, history, getRoutes) => {
actionWithTimestamp,
);
- if (store._onActionDispatched) store._onActionDispatched();
+ if (store._onActionDispatched) {
+ store._onActionDispatched();
+ }
return result;
},
@@ -677,7 +679,9 @@ api._makeRequest = async (method, url, headers, requestBody, data, options) => {
);
console.log(error, { depth: null });
console.log(`The original request: ${method} ${url}`);
- if (requestBody) console.log(`Original payload: ${requestBody}`);
+ if (requestBody) {
+ console.log(`Original payload: ${requestBody}`);
+ }
}
throw error;
diff --git a/frontend/test/dashboard/DashCard.unit.spec.js b/frontend/test/dashboard/DashCard.unit.spec.js
index 6aaefd4b297592fba3545b7d0ecfc3bc115b6737..df5e710bf2e41ca5b0bb6c99b4ca1d6467be2ae4 100644
--- a/frontend/test/dashboard/DashCard.unit.spec.js
+++ b/frontend/test/dashboard/DashCard.unit.spec.js
@@ -20,6 +20,9 @@ const DEFAULT_PROPS = {
parameterValues: {},
markNewCardSeen: () => {},
fetchCardData: () => {},
+ dashboard: {
+ parameters: [],
+ },
};
describe("DashCard", () => {
diff --git a/frontend/test/dashboard/dashboard.integ.spec.js b/frontend/test/dashboard/dashboard.integ.spec.js
index 298004dfd7ff3ff206e015b30b3abc7e3f6f9820..fe7dcb98fbd7c3043b74514967e24e17c3a07920 100644
--- a/frontend/test/dashboard/dashboard.integ.spec.js
+++ b/frontend/test/dashboard/dashboard.integ.spec.js
@@ -152,10 +152,11 @@ describe("Dashboard", () => {
});
it("lets you add a filter", async () => {
- if (!dashboardId)
+ if (!dashboardId) {
throw new Error(
"Test fails because previous tests failed to create a dashboard",
);
+ }
const store = await createTestStore();
store.pushPath(Urls.dashboard(dashboardId));
@@ -197,10 +198,11 @@ describe("Dashboard", () => {
});
it("lets you open and close the revisions screen", async () => {
- if (!dashboardId)
+ if (!dashboardId) {
throw new Error(
"Test fails because previous tests failed to create a dashboard",
);
+ }
const store = await createTestStore();
const dashboardUrl = Urls.dashboard(dashboardId);
diff --git a/frontend/test/internal/__snapshots__/components.unit.spec.js.snap b/frontend/test/internal/__snapshots__/components.unit.spec.js.snap
index ff624a8dc68cb0e3c558e2eb4f4c73ac2315497a..70fb8030fb5b216bb6e5ccefa1a879224d149b02 100644
--- a/frontend/test/internal/__snapshots__/components.unit.spec.js.snap
+++ b/frontend/test/internal/__snapshots__/components.unit.spec.js.snap
@@ -1,5 +1,41 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
+exports[`Card should render "dark" correctly 1`] = `
+<div
+ className="Card-RQot jvlGhM"
+>
+ <div
+ className="p4"
+ >
+ Look, a card!
+ </div>
+</div>
+`;
+
+exports[`Card should render "hoverable" correctly 1`] = `
+<div
+ className="Card-RQot lhSKsP"
+>
+ <div
+ className="p4"
+ >
+ Look, a card!
+ </div>
+</div>
+`;
+
+exports[`Card should render "normal" correctly 1`] = `
+<div
+ className="Card-RQot eykJzW"
+>
+ <div
+ className="p4"
+ >
+ Look, a card!
+ </div>
+</div>
+`;
+
exports[`CheckBox should render "Default - Off" correctly 1`] = `
<div
className="cursor-pointer"
@@ -10,7 +46,7 @@ exports[`CheckBox should render "Default - Off" correctly 1`] = `
style={
Object {
"backgroundColor": "white",
- "border": "2px solid #ddd",
+ "border": "2px solid #C7CFD4",
"height": 16,
"width": 16,
}
@@ -180,8 +216,8 @@ exports[`CheckBox should render "Yellow" correctly 1`] = `
className="flex align-center justify-center rounded"
style={
Object {
- "backgroundColor": "#f9d45c",
- "border": "2px solid #f9d45c",
+ "backgroundColor": "#F9D45C",
+ "border": "2px solid #F9D45C",
"height": 16,
"width": 16,
}
@@ -808,7 +844,7 @@ exports[`StackedCheckBox should render "Off - Default" correctly 1`] = `
style={
Object {
"backgroundColor": "white",
- "border": "2px solid #ddd",
+ "border": "2px solid #C7CFD4",
"height": 16,
"width": 16,
}
@@ -825,7 +861,7 @@ exports[`StackedCheckBox should render "Off - Default" correctly 1`] = `
style={
Object {
"backgroundColor": "white",
- "border": "2px solid #ddd",
+ "border": "2px solid #C7CFD4",
"height": 16,
"width": 16,
}
diff --git a/frontend/test/lib/urls.unit.spec.js b/frontend/test/lib/urls.unit.spec.js
index 69c66785144660c3579188f7551cdfd454c7f12b..eb3855970c3b86a0af6f14a2be13cad3fbfe0f8b 100644
--- a/frontend/test/lib/urls.unit.spec.js
+++ b/frontend/test/lib/urls.unit.spec.js
@@ -1,4 +1,4 @@
-import { question } from "metabase/lib/urls";
+import { question, extractQueryParams } from "metabase/lib/urls";
describe("urls", () => {
describe("question", () => {
@@ -20,4 +20,30 @@ describe("urls", () => {
});
});
});
+ describe("query", () => {
+ it("should return the correct number of parameters", () => {
+ expect(extractQueryParams({ foo: "bar" })).toHaveLength(1);
+ expect(extractQueryParams({ foo: [1, 2, 3] })).toHaveLength(3);
+ expect(extractQueryParams({ foo: ["1", "2"] })).toHaveLength(2);
+ expect(
+ extractQueryParams({
+ foo1: ["baz1", "baz2"],
+ foo2: [1, 2, 3],
+ foo3: ["bar1", "bar2"],
+ }),
+ ).toHaveLength(7);
+ });
+ it("should return correct parameters", () => {
+ expect(extractQueryParams({ foo: "bar" })).toEqual([["foo", "bar"]]);
+
+ const extractedParams1 = extractQueryParams({ foo: [1, 2, 3] });
+ expect(extractedParams1).toContainEqual(["foo", 1]);
+ expect(extractedParams1).toContainEqual(["foo", 2]);
+ expect(extractedParams1).toContainEqual(["foo", 3]);
+
+ const extractedParams2 = extractQueryParams({ foo: ["1", "2"] });
+ expect(extractedParams2).toContainEqual(["foo", "1"]);
+ expect(extractedParams2).toContainEqual(["foo", "2"]);
+ });
+ });
});
diff --git a/frontend/test/public/public.integ.spec.js b/frontend/test/public/public.integ.spec.js
index ce047682ef17ae90f145dea1d6d56d8b3dc03821..80df3537a35772216f29bc4b62de07455b3b1e7b 100644
--- a/frontend/test/public/public.integ.spec.js
+++ b/frontend/test/public/public.integ.spec.js
@@ -331,10 +331,11 @@ describe("public/embedded", () => {
}
it("should allow seeing an embedded question", async () => {
- if (!embedUrl)
+ if (!embedUrl) {
throw new Error(
"This test fails because previous tests didn't produce an embed url.",
);
+ }
const embedUrlTestStore = await createTestStore({ embedApp: true });
await runSharedQuestionTests(
embedUrlTestStore,
@@ -344,10 +345,11 @@ describe("public/embedded", () => {
});
it("should allow seeing a public question", async () => {
- if (!publicUrl)
+ if (!publicUrl) {
throw new Error(
"This test fails because previous tests didn't produce a public url.",
);
+ }
const publicUrlTestStore = await createTestStore({ publicApp: true });
await runSharedQuestionTests(
publicUrlTestStore,
@@ -567,20 +569,22 @@ describe("public/embedded", () => {
}
it("should handle parameters in public Dashboards correctly", async () => {
- if (!publicDashUrl)
+ if (!publicDashUrl) {
throw new Error(
"This test fails because test setup code didn't produce a public Dashboard URL.",
);
+ }
const publicUrlTestStore = await createTestStore({ publicApp: true });
await runSharedDashboardTests(publicUrlTestStore, publicDashUrl);
});
it("should handle parameters in embedded Dashboards correctly", async () => {
- if (!embedDashUrl)
+ if (!embedDashUrl) {
throw new Error(
"This test fails because test setup code didn't produce a embedded Dashboard URL.",
);
+ }
const embedUrlTestStore = await createTestStore({ embedApp: true });
await runSharedDashboardTests(embedUrlTestStore, embedDashUrl);
diff --git a/package.json b/package.json
index 4f77edadc538ebe6856e56e2fdcf85de219d1d2f..28862e9d3dde2f1b37d2d3e53a1ba0ba8228bccf 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
"chevrotain": "0.21.0",
"classnames": "^2.1.3",
"color": "^3.0.0",
+ "color-harmony": "^0.3.0",
"crossfilter": "^1.3.12",
"cxs": "^5.0.0",
"d3": "^3.5.17",
@@ -100,6 +101,7 @@
"babel-preset-stage-0": "^6.5.0",
"babel-register": "^6.11.6",
"banner-webpack-plugin": "^0.2.3",
+ "color-diff": "^1.1.0",
"concurrently": "^3.1.0",
"css-loader": "^0.28.7",
"documentation": "^4.0.0-rc.1",
@@ -128,6 +130,7 @@
"jasmine-reporters": "^2.2.0",
"jasmine-spec-reporter": "^3.0.0",
"jest": "^19.0.2",
+ "jscodeshift": "0.5.0",
"jsonwebtoken": "^7.2.1",
"karma": "^1.3.0",
"karma-chrome-launcher": "^2.0.0",
@@ -156,34 +159,39 @@
"webpack-postcss-tools": "^1.1.2"
},
"scripts": {
- "dev": "concurrently --kill-others -p name -n 'backend,frontend' -c 'blue,green' 'lein ring server' 'yarn build-hot'",
+ "dev":
+ "concurrently --kill-others -p name -n 'backend,frontend' -c 'blue,green' 'lein ring server' 'yarn build-hot'",
"lint": "yarn lint-eslint && yarn lint-prettier",
- "lint-eslint": "yarn && eslint --ext .js --ext .jsx --max-warnings 0 frontend/src frontend/test",
- "lint-prettier": "yarn && prettier -l 'frontend/**/*.{js,jsx,css}' || (echo '\nThese files are not formatted correctly. Did you forget to \"yarn prettier\"?' && false)",
+ "lint-eslint":
+ "yarn && eslint --ext .js --ext .jsx --rulesdir frontend/lint/eslint-rules --max-warnings 0 frontend/src frontend/test",
+ "lint-prettier":
+ "yarn && prettier -l 'frontend/**/*.{js,jsx,css}' || (echo '\nThese files are not formatted correctly. Did you forget to \"yarn prettier\"?' && false)",
"flow": "yarn && flow check",
"test": "yarn test-unit && yarn test-integrated && yarn test-karma",
"test-integrated": "./bin/build-for-test && yarn test-integrated-no-build",
"test-integrated-watch": "yarn test-integrated --watch",
- "test-integrated-no-build": "yarn && babel-node ./frontend/test/__runner__/run_integrated_tests.js",
+ "test-integrated-no-build":
+ "yarn && babel-node ./frontend/test/__runner__/run_integrated_tests.js",
"test-unit": "yarn && jest --maxWorkers=8 --config jest.unit.conf.json",
"test-unit-watch": "yarn test-unit --watch",
"test-unit-update-snapshot": "yarn test-unit --updateSnapshot",
- "test-karma": "yarn && karma start frontend/test/karma.conf.js --single-run",
- "test-karma-watch": "yarn && karma start frontend/test/karma.conf.js --auto-watch --reporters nyan",
+ "test-karma":
+ "yarn && karma start frontend/test/karma.conf.js --single-run",
+ "test-karma-watch":
+ "yarn && karma start frontend/test/karma.conf.js --auto-watch --reporters nyan",
"build": "yarn && webpack --bail",
"build-watch": "yarn && webpack --watch",
"build-hot": "yarn && NODE_ENV=hot webpack-dev-server --progress",
"build-stats": "yarn && webpack --json > stats.json",
"start": "yarn build && lein ring server",
"precommit": "lint-staged",
- "preinstall": "echo $npm_execpath | grep -q yarn || echo '\\033[0;33mSorry, npm is not supported. Please use Yarn (https://yarnpkg.com/).\\033[0m'",
+ "preinstall":
+ "echo $npm_execpath | grep -q yarn || echo '\\033[0;33mSorry, npm is not supported. Please use Yarn (https://yarnpkg.com/).\\033[0m'",
"prettier": "prettier --write 'frontend/**/*.{js,jsx,css}'",
- "docs": "documentation build -f html -o frontend/docs frontend/src/metabase-lib/lib/**"
+ "docs":
+ "documentation build -f html -o frontend/docs frontend/src/metabase-lib/lib/**"
},
"lint-staged": {
- "frontend/**/*.{js,jsx,css}": [
- "prettier --write",
- "git add"
- ]
+ "frontend/**/*.{js,jsx,css}": ["prettier --write", "git add"]
}
}
diff --git a/src/metabase/api/card.clj b/src/metabase/api/card.clj
index 7d9870523ff9b954088f78834f311b56a54f69a4..a4b1456352c611b7dbdca9d2663b922b8634d8fc 100644
--- a/src/metabase/api/card.clj
+++ b/src/metabase/api/card.clj
@@ -224,16 +224,21 @@
;; check that we have permissions for the collection we're trying to save this card to, if applicable
(collection/check-write-perms-for-collection collection_id)
;; everything is g2g, now save the card
- (let [card (db/insert! Card
- :creator_id api/*current-user-id*
- :dataset_query dataset_query
- :description description
- :display display
- :name name
- :visualization_settings visualization_settings
- :collection_id collection_id
- :collection_position collection_position
- :result_metadata (result-metadata dataset_query result_metadata metadata_checksum))]
+ (let [card-data {:creator_id api/*current-user-id*
+ :dataset_query dataset_query
+ :description description
+ :display display
+ :name name
+ :visualization_settings visualization_settings
+ :collection_id collection_id
+ :collection_position collection_position
+ :result_metadata (result-metadata dataset_query result_metadata metadata_checksum)}
+
+ card (db/transaction
+ ;; Adding a new card at `collection_position` could cause other cards in this
+ ;; collection to change position, check that and fix it if needed
+ (api/maybe-reconcile-collection-position! card-data)
+ (db/insert! Card card-data))]
(events/publish-event! :card-create card)
;; include same information returned by GET /api/card/:id since frontend replaces the Card it currently has
;; with returned one -- See #4283
@@ -402,14 +407,19 @@
(let [card-updates (assoc card-updates
:result_metadata (result-metadata-for-updating card-before-update dataset_query
result_metadata metadata_checksum))]
- ;; ok, now save the Card
- (db/update! Card id
- ;; `collection_id` and `description` can be `nil` (in order to unset them). Other values should only be
- ;; modified if they're passed in as non-nil
- (u/select-keys-when card-updates
- :present #{:collection_id :collection_position :description}
- :non-nil #{:dataset_query :display :name :visualization_settings :archived :enable_embedding
- :embedding_params :result_metadata})))
+
+ ;; Setting up a transaction here so that we don't get a partially reconciled/updated card.
+ (db/transaction
+ (api/maybe-reconcile-collection-position! card-before-update card-updates)
+
+ ;; ok, now save the Card
+ (db/update! Card id
+ ;; `collection_id` and `description` can be `nil` (in order to unset them). Other values should only be
+ ;; modified if they're passed in as non-nil
+ (u/select-keys-when card-updates
+ :present #{:collection_id :collection_position :description}
+ :non-nil #{:dataset_query :display :name :visualization_settings :archived :enable_embedding
+ :embedding_params :result_metadata}))))
;; Fetch the updated Card from the DB
(let [card (Card id)]
(delete-alerts-if-needed! card-before-update card)
@@ -454,26 +464,71 @@
;;; -------------------------------------------- Bulk Collections Update ---------------------------------------------
+(defn- update-collection-positions!
+ "For cards that have a position in the previous collection, add them to the end of the new collection, trying to
+ preseve the order from the original collections. Note it's possible for there to be multiple collections
+ (and thus duplicate collection positions) merged into this new collection. No special tie breaker logic for when
+ that's the case, just use the order the DB returned it in"
+ [new-collection-id-or-nil cards]
+ ;; Sorting by `:collection_position` to ensure lower position cards are appended first
+ (let [sorted-cards (sort-by :collection_position cards)
+ max-position-result (db/select-one [Card [:%max.collection_position :max_position]]
+ :collection_id new-collection-id-or-nil)
+ ;; collection_position for the next card in the collection
+ starting-position (inc (get max-position-result :max_position 0))]
+
+ ;; This is using `map` but more like a `doseq` with multiple seqs. Wrapping this in a `doall` as we don't want it
+ ;; to be lazy and we're just going to discard the results
+ (doall
+ (map (fn [idx {:keys [collection_id collection_position] :as card}]
+ ;; We are removing this card from `collection_id` so we need to reconcile any
+ ;; `collection_position` entries left behind by this move
+ (api/reconcile-position-for-collection! collection_id collection_position nil)
+ ;; Now we can update the card with the new collection and a new calculated position
+ ;; that appended to the end
+ (db/update! Card (u/get-id card)
+ :collection_position idx
+ :collection_id new-collection-id-or-nil))
+ ;; These are reversed because of the classic issue when removing an item from array. If we remove an
+ ;; item at index 1, everthing above index 1 will get decremented. By reversing our processing order we
+ ;; can avoid changing the index of cards we haven't yet updated
+ (reverse (range starting-position (+ (count sorted-cards) starting-position)))
+ (reverse sorted-cards)))))
+
(defn- move-cards-to-collection! [new-collection-id-or-nil card-ids]
;; if moving to a collection, make sure we have write perms for it
(when new-collection-id-or-nil
(api/write-check Collection new-collection-id-or-nil))
;; for each affected card...
(when (seq card-ids)
- (let [cards (db/select [Card :id :collection_id :dataset_query]
+ (let [cards (db/select [Card :id :collection_id :collection_position :dataset_query]
{:where [:and [:in :id (set card-ids)]
[:or [:not= :collection_id new-collection-id-or-nil]
- (when new-collection-id-or-nil
- [:= :collection_id nil])]]})] ; poisioned NULLs = ick
+ (when new-collection-id-or-nil
+ [:= :collection_id nil])]]})] ; poisioned NULLs = ick
;; ...check that we have write permissions for it...
(doseq [card cards]
(api/write-check card))
;; ...and check that we have write permissions for the old collections if applicable
(doseq [old-collection-id (set (filter identity (map :collection_id cards)))]
- (api/write-check Collection old-collection-id)))
- ;; ok, everything checks out. Set the new `collection_id` for all the Cards
- (db/update-where! Card {:id [:in (set card-ids)]}
- :collection_id new-collection-id-or-nil)))
+ (api/write-check Collection old-collection-id))
+
+ ;; Ensure all of the card updates occur in a transaction. Read commited (the default) really isn't what we want
+ ;; here. We are querying for the max card position for a given collection, then using that to base our position
+ ;; changes if the cards are moving to a different collection. Without repeatable read here, it's possible we'll
+ ;; get duplicates
+ (db/transaction
+ ;; If any of the cards have a `:collection_position`, we'll need to fixup the old collection now that the cards
+ ;; are gone and update the position in the new collection
+ (when-let [cards-with-position (seq (filter :collection_position cards))]
+ (update-collection-positions! new-collection-id-or-nil cards-with-position))
+
+ ;; ok, everything checks out. Set the new `collection_id` for all the Cards that haven't been updated already
+ (when-let [cards-without-position (seq (for [card cards
+ :when (not (:collection_position card))]
+ (u/get-id card)))]
+ (db/update-where! Card {:id [:in (set cards-without-position)]}
+ :collection_id new-collection-id-or-nil))))))
(api/defendpoint POST "/collections"
"Bulk update endpoint for Card Collections. Move a set of `Cards` with CARD_IDS into a `Collection` with
diff --git a/src/metabase/api/collection.clj b/src/metabase/api/collection.clj
index 4493b5cd518ca6818ee5a98be600d0dbb2e4e065..29acb7a5e59e7ca93b1fc284c2094a40ae16c846 100644
--- a/src/metabase/api/collection.clj
+++ b/src/metabase/api/collection.clj
@@ -130,7 +130,7 @@
;; add in some things for the FE to display since the 'Root' Collection isn't real and wouldn't normally have
;; these things
(assoc
- :name (tru "Saved items")
+ :name (tru "Our analytics")
:id "root")
(dissoc ::collection/is-root?)))
diff --git a/src/metabase/api/common.clj b/src/metabase/api/common.clj
index 7829217131afca8b13af6c95d0e5c2be1b09b2de..06226f682c8f470f9b5333285273df33630bb8e6 100644
--- a/src/metabase/api/common.clj
+++ b/src/metabase/api/common.clj
@@ -7,6 +7,7 @@
[clojure.string :as str]
[clojure.tools.logging :as log]
[compojure.core :as compojure]
+ [honeysql.types :as htypes]
[medley.core :as m]
[metabase
[public-settings :as public-settings]
@@ -511,3 +512,77 @@
(and (contains? object-updates k)
(not= (get object-before-updates k)
(get object-updates k)))))
+
+;;; ------------------------------------------ COLLECTION POSITION HELPER FNS ----------------------------------------
+
+(s/defn reconcile-position-for-collection!
+ "Compare `old-position` and `new-position` to determine what needs to be updated based on the position change. Used
+ for fixing card/dashboard/pulse changes that impact other instances in the collection"
+ [collection-id :- (s/maybe su/IntGreaterThanZero)
+ old-position :- (s/maybe su/IntGreaterThanZero)
+ new-position :- (s/maybe su/IntGreaterThanZero)]
+ (let [update-fn! (fn [plus-or-minus position-update-clause]
+ (doseq [model '[Card Dashboard Pulse]]
+ (db/update-where! model {:collection_id collection-id
+ :collection_position position-update-clause}
+ :collection_position (htypes/call plus-or-minus :collection_position 1))))]
+ (when (not= new-position old-position)
+ (cond
+ (and (nil? new-position)
+ old-position)
+ (update-fn! :- [:> old-position])
+
+ (and new-position (nil? old-position))
+ (update-fn! :+ [:>= new-position])
+
+ (> new-position old-position)
+ (update-fn! :- [:between old-position new-position])
+
+ (< new-position old-position)
+ (update-fn! :+ [:between new-position old-position])))))
+
+(def ^:private ModelWithPosition
+ "Intended to cover Cards/Dashboards/Pulses, it only asserts collection id and position, allowing extra keys"
+ {:collection_id (s/maybe su/IntGreaterThanZero)
+ :collection_position (s/maybe su/IntGreaterThanZero)
+ s/Any s/Any})
+
+(def ^:private ModelWithOptionalPosition
+ "Intended to cover Cards/Dashboards/Pulses updates. Collection id and position are optional, if they are not
+ present, they didn't change. If they are present, they might have changed and we need to compare."
+ {(s/optional-key :collection_id) (s/maybe su/IntGreaterThanZero)
+ (s/optional-key :collection_position) (s/maybe su/IntGreaterThanZero)
+ s/Any s/Any})
+
+(s/defn maybe-reconcile-collection-position!
+ "Generic function for working on cards/dashboards/pulses. Checks the before and after changes to see if there is any
+ impact to the collection position of that model instance. If so, executes updates to fix the collection position
+ that goes with the change. The 2-arg version of this function is used for a new card/dashboard/pulse (i.e. not
+ updating an existing instance, but creating a new one)."
+ ([new-model-data :- ModelWithPosition]
+ (maybe-reconcile-collection-position! nil new-model-data))
+ ([{old-collection-id :collection_id, old-position :collection_position, :as before-update} :- (s/maybe ModelWithPosition)
+ {new-collection-id :collection_id, new-position :collection_position, :as model-updates} :- ModelWithOptionalPosition]
+ (let [updated-collection? (and (contains? model-updates :collection_id)
+ (not= old-collection-id new-collection-id))
+ updated-position? (and (contains? model-updates :collection_position)
+ (not= old-position new-position))]
+ (cond
+ ;; If the collection hasn't changed, but we have a new collection position, we might need to reconcile
+ (and (not updated-collection?) updated-position?)
+ (reconcile-position-for-collection! old-collection-id old-position new-position)
+
+ ;; If we have a new collection id, but no new position, reconcile the old collection, then update the new
+ ;; collection with the existing position
+ (and updated-collection? (not updated-position?))
+ (do
+ (reconcile-position-for-collection! old-collection-id old-position nil)
+ (reconcile-position-for-collection! new-collection-id nil old-position))
+
+ ;; We have a new collection id AND and new collection position
+ ;; Update the old collection using the old position
+ ;; Update the new collection using the new position
+ (and updated-collection? updated-position?)
+ (do
+ (reconcile-position-for-collection! old-collection-id old-position nil)
+ (reconcile-position-for-collection! new-collection-id nil new-position))))))
diff --git a/src/metabase/api/dashboard.clj b/src/metabase/api/dashboard.clj
index a0fb9940edee113dadd2c20fba0c4e126f76cbe5..aa64401e20190b0a57731c341c7085193f70f304 100644
--- a/src/metabase/api/dashboard.clj
+++ b/src/metabase/api/dashboard.clj
@@ -67,16 +67,20 @@
collection_position (s/maybe su/IntGreaterThanZero)}
;; if we're trying to save the new dashboard in a Collection make sure we have permissions to do that
(collection/check-write-perms-for-collection collection_id)
- ;; Ok, now save the Dashboard
- (->> (db/insert! Dashboard
- :name name
- :description description
- :parameters (or parameters [])
- :creator_id api/*current-user-id*
- :collection_id collection_id
- :collection_position collection_position)
- ;; publish an event and return the newly created Dashboard
- (events/publish-event! :dashboard-create)))
+ (let [dashboard-data {:name name
+ :description description
+ :parameters (or parameters [])
+ :creator_id api/*current-user-id*
+ :collection_id collection_id
+ :collection_position collection_position}]
+ (db/transaction
+ ;; Adding a new dashboard at `collection_position` could cause other dashboards in this collection to change
+ ;; position, check that and fix up if needed
+ (api/maybe-reconcile-collection-position! dashboard-data)
+ ;; Ok, now save the Dashboard
+ (->> (db/insert! Dashboard dashboard-data)
+ ;; publish an event and return the newly created Dashboard
+ (events/publish-event! :dashboard-create)))))
;;; -------------------------------------------- Hiding Unreadable Cards ---------------------------------------------
@@ -232,15 +236,21 @@
(let [dash-before-update (api/write-check Dashboard id)]
;; Do various permissions checks as needed
(collection/check-allowed-to-change-collection dash-before-update dash-updates)
- (check-allowed-to-change-embedding dash-before-update dash-updates))
- (api/check-500
- (db/update! Dashboard id
- ;; description, position, collection_id, and collection_position are allowed to be `nil`. Everything else must be
- ;; non-nil
- (u/select-keys-when dash-updates
- :present #{:description :position :collection_id :collection_position}
- :non-nil #{:name :parameters :caveats :points_of_interest :show_in_getting_started :enable_embedding
- :embedding_params :archived})))
+ (check-allowed-to-change-embedding dash-before-update dash-updates)
+ (api/check-500
+ (db/transaction
+
+ ;;If the dashboard has an updated position, or if the dashboard is moving to a new collection, we might need to
+ ;;adjust the collection position of other dashboards in the collection
+ (api/maybe-reconcile-collection-position! dash-before-update dash-updates)
+
+ (db/update! Dashboard id
+ ;; description, position, collection_id, and collection_position are allowed to be `nil`. Everything else must be
+ ;; non-nil
+ (u/select-keys-when dash-updates
+ :present #{:description :position :collection_id :collection_position}
+ :non-nil #{:name :parameters :caveats :points_of_interest :show_in_getting_started :enable_embedding
+ :embedding_params :archived})))))
;; now publish an event and return the updated Dashboard
(u/prog1 (Dashboard id)
(events/publish-event! :dashboard-update (assoc <> :actor_id api/*current-user-id*))))
diff --git a/src/metabase/api/embed.clj b/src/metabase/api/embed.clj
index 46ac0d35eabe40d2546cc473e700765955d0f710..c339c925b3a52c4bccb9954c5ea122e3ac35be08 100644
--- a/src/metabase/api/embed.clj
+++ b/src/metabase/api/embed.clj
@@ -324,7 +324,8 @@
(dashboard-for-unsigned-token unsigned, :constraints {:enable_embedding true})))
-(api/defendpoint GET "/dashboard/:token/dashcard/:dashcard-id/card/:card-id"
+
+(defn- card-for-signed-token
"Fetch the results of running a Card belonging to a Dashboard using a JSON Web Token signed with the
`embedding-secret-key`.
@@ -334,7 +335,8 @@
:params <parameters>}
Additional dashboard parameters can be provided in the query string, but params in the JWT token take precedence."
- [token dashcard-id card-id & query-params]
+ {:style/indent 1}
+ [token dashcard-id card-id query-params]
(let [unsigned-token (eu/unsign token)
dashboard-id (eu/get-in-unsigned-token-or-throw unsigned-token [:resource :dashboard])]
(check-embedding-enabled-for-dashboard dashboard-id)
@@ -346,6 +348,10 @@
:token-params (eu/get-in-unsigned-token-or-throw unsigned-token [:params])
:query-params query-params)))
+(api/defendpoint GET "/dashboard/:token/dashcard/:dashcard-id/card/:card-id"
+ "Fetch the results of running a Card belonging to a Dashboard using a JSON Web Token signed with the `embedding-secret-key`"
+ [token dashcard-id card-id & query-params]
+ (card-for-signed-token token dashcard-id card-id query-params ))
;;; +----------------------------------------------------------------------------------------------------------------+
;;; | FieldValues, Search, Remappings |
@@ -417,4 +423,12 @@
(public-api/dashboard-field-remapped-values dashboard-id field-id remapped-id value)))
+(api/defendpoint GET ["/dashboard/:token/dashcard/:dashcard-id/card/:card-id/:export-format",
+ :export-format dataset-api/export-format-regex]
+ "Fetch the results of running a Card belonging to a Dashboard using a JSON Web Token signed with the `embedding-secret-key`
+ return the data in one of the export formats"
+ [token export-format dashcard-id card-id & query-params]
+ {export-format dataset-api/ExportFormat}
+ (dataset-api/as-format export-format (card-for-signed-token token dashcard-id card-id query-params )))
+
(api/define-routes)
diff --git a/src/metabase/api/pulse.clj b/src/metabase/api/pulse.clj
index b4d455bda175f0badbe364247cedac20362ff523..e2bd363d97c7ef8c432af692515bb08fe5c9e6fb 100644
--- a/src/metabase/api/pulse.clj
+++ b/src/metabase/api/pulse.clj
@@ -46,7 +46,7 @@
"Create a new `Pulse`."
[:as {{:keys [name cards channels skip_if_empty collection_id collection_position]} :body}]
{name su/NonBlankString
- cards (su/non-empty [pulse/CardRef])
+ cards (su/non-empty [pulse/CoercibleToCardRef])
channels (su/non-empty [su/Map])
skip_if_empty (s/maybe s/Bool)
collection_id (s/maybe su/IntGreaterThanZero)
@@ -55,14 +55,18 @@
(check-card-read-permissions cards)
;; if we're trying to create this Pulse inside a Collection, make sure we have write permissions for that collection
(collection/check-write-perms-for-collection collection_id)
- ;; ok, now create the Pulse
- (api/check-500
- (pulse/create-pulse! (map pulse/card->ref cards) channels
- {:name name
- :creator_id api/*current-user-id*
- :skip_if_empty skip_if_empty
- :collection_id collection_id
- :collection_position collection_position})))
+ (let [pulse-data {:name name
+ :creator_id api/*current-user-id*
+ :skip_if_empty skip_if_empty
+ :collection_id collection_id
+ :collection_position collection_position}]
+ (db/transaction
+ ;; Adding a new pulse at `collection_position` could cause other pulses in this collection to change position,
+ ;; check that and fix it if needed
+ (api/maybe-reconcile-collection-position! pulse-data)
+ ;; ok, now create the Pulse
+ (api/check-500
+ (pulse/create-pulse! (map pulse/card->ref cards) channels pulse-data)))))
(api/defendpoint GET "/:id"
@@ -75,18 +79,23 @@
"Update a Pulse with `id`."
[id :as {{:keys [name cards channels skip_if_empty collection_id], :as pulse-updates} :body}]
{name (s/maybe su/NonBlankString)
- cards (s/maybe (su/non-empty [pulse/CardRef]))
+ cards (s/maybe (su/non-empty [pulse/CoercibleToCardRef]))
channels (s/maybe (su/non-empty [su/Map]))
skip_if_empty (s/maybe s/Bool)
collection_id (s/maybe su/IntGreaterThanZero)}
;; do various perms checks
(let [pulse-before-update (api/write-check Pulse id)]
(check-card-read-permissions cards)
- (collection/check-allowed-to-change-collection pulse-before-update pulse-updates))
- ;; ok, now update the Pulse
- (pulse/update-pulse!
- (assoc (select-keys pulse-updates [:name :cards :channels :skip_if_empty :collection_id :collection_position])
- :id id))
+ (collection/check-allowed-to-change-collection pulse-before-update pulse-updates)
+
+ (db/transaction
+ ;; If the collection or position changed with this update, we might need to fixup the old and/or new collection,
+ ;; depending on what changed.
+ (api/maybe-reconcile-collection-position! pulse-before-update pulse-updates)
+ ;; ok, now update the Pulse
+ (pulse/update-pulse!
+ (assoc (select-keys pulse-updates [:name :cards :channels :skip_if_empty :collection_id :collection_position])
+ :id id))))
;; return updated Pulse
(pulse/retrieve-pulse id))
diff --git a/src/metabase/api/table.clj b/src/metabase/api/table.clj
index f0e2310c04c68d212630c9fc99d5ad1d988e8977..cfbcfb17787369ed71e4469b5f6af452efe4052e 100644
--- a/src/metabase/api/table.clj
+++ b/src/metabase/api/table.clj
@@ -212,16 +212,11 @@
(update field :values fv/field-values->pairs)
field)))))
-(api/defendpoint GET "/:id/query_metadata"
- "Get metadata about a `Table` us eful for running queries.
- Returns DB, fields, field FKs, and field values.
-
- By passing `include_sensitive_fields=true`, information *about* sensitive `Fields` will be returned; in no case will
- any of its corresponding values be returned. (This option is provided for use in the Admin Edit Metadata page)."
- [id include_sensitive_fields]
- {include_sensitive_fields (s/maybe su/BooleanString)}
- (let [table (api/read-check Table id)
- driver (driver/database-id->driver (:db_id table))]
+(defn fetch-query-metadata
+ "Returns the query metadata used to power the query builder for the given table `table-or-table-id`"
+ [table include_sensitive_fields]
+ (api/read-check table)
+ (let [driver (driver/database-id->driver (:db_id table))]
(-> table
(hydrate :db [:fields [:target :has_field_values] :dimensions :has_field_values] :segments :metrics)
(m/dissoc-in [:db :details])
@@ -234,6 +229,16 @@
(partial filter (fn [{:keys [visibility_type]}]
(not= (keyword visibility_type) :sensitive))))))))
+(api/defendpoint GET "/:id/query_metadata"
+ "Get metadata about a `Table` useful for running queries.
+ Returns DB, fields, field FKs, and field values.
+
+ By passing `include_sensitive_fields=true`, information *about* sensitive `Fields` will be returned; in no case will
+ any of its corresponding values be returned. (This option is provided for use in the Admin Edit Metadata page)."
+ [id include_sensitive_fields]
+ {include_sensitive_fields (s/maybe su/BooleanString)}
+ (fetch-query-metadata (Table id) include_sensitive_fields))
+
(defn- card-result-metadata->virtual-fields
"Return a sequence of 'virtual' fields metadata for the 'virtual' table for a Card in the Saved Questions 'virtual'
database."
diff --git a/src/metabase/api/user.clj b/src/metabase/api/user.clj
index 62bdebac745030d887337415d1a645d567e1abc7..cee471889faf679b4d329c730ee2f6f1b1b30e80 100644
--- a/src/metabase/api/user.clj
+++ b/src/metabase/api/user.clj
@@ -86,6 +86,19 @@
(check-self-or-superuser id)
(api/check-404 (fetch-user :id id, :is_active true)))
+(defn- valid-email-update?
+ "This predicate tests whether or not the user is allowed to update the email address associated with this account."
+ [{:keys [google_auth ldap_auth email] :as foo } maybe-new-email]
+ (or
+ ;; Admin users can update
+ api/*is-superuser?*
+ ;; If the email address didn't change, let it through
+ (= email maybe-new-email)
+ ;; We should not allow a regular user to change their email address if they are a google/ldap user
+ (and
+ (not google_auth)
+ (not ldap_auth))))
+
(api/defendpoint PUT "/:id"
"Update an existing, active `User`."
[id :as {{:keys [email first_name last_name is_superuser login_attributes] :as body} :body}]
@@ -95,18 +108,20 @@
login_attributes (s/maybe user/LoginAttributes)}
(check-self-or-superuser id)
;; only allow updates if the specified account is active
- (api/check-404 (db/exists? User, :id id, :is_active true))
- ;; can't change email if it's already taken BY ANOTHER ACCOUNT
- (api/checkp (not (db/exists? User, :email email, :id [:not= id]))
- "email" (tru "Email address already associated to another user."))
- (api/check-500
- (db/update! User id
- (u/select-keys-when body
- :present (when api/*is-superuser?*
- #{:login_attributes})
- :non-nil (set (concat [:first_name :last_name :email]
- (when api/*is-superuser?*
- [:is_superuser]))))))
+ (api/let-404 [user-before-update (fetch-user :id id, :is_active true)]
+ ;; Google/LDAP non-admin users can't change their email to prevent account hijacking
+ (api/check-403 (valid-email-update? user-before-update email))
+ ;; can't change email if it's already taken BY ANOTHER ACCOUNT
+ (api/checkp (not (db/exists? User, :email email, :id [:not= id]))
+ "email" (tru "Email address already associated to another user."))
+ (api/check-500
+ (db/update! User id
+ (u/select-keys-when body
+ :present (when api/*is-superuser?*
+ #{:login_attributes})
+ :non-nil (set (concat [:first_name :last_name :email]
+ (when api/*is-superuser?*
+ [:is_superuser])))))))
(fetch-user :id id))
(api/defendpoint PUT "/:id/reactivate"
diff --git a/src/metabase/automagic_dashboards/core.clj b/src/metabase/automagic_dashboards/core.clj
index cfd405f66a6104fc795dc32652f6785bf6afddc5..dbd71afcf8085bd36fe0e820aadc2c40913c7c52 100644
--- a/src/metabase/automagic_dashboards/core.clj
+++ b/src/metabase/automagic_dashboards/core.clj
@@ -761,20 +761,12 @@
:description (:description dashboard)}))
(defn- related-entities
- ([root] (related-entities max-related root))
- ([n root]
- (let [recommendations (-> root :entity related/related)
- fields-selector (comp (partial remove key-col?) :fields)
- ;; Not everything `related/related` returns is relevent for us. Also note that the order
- ;; influences which entities get shown when results are trimmed.
- relevant-dimensions [:table :segments :metrics :linking-to :dashboard-mates
- :similar-questions :linked-from :tables fields-selector]]
- (->> relevant-dimensions
- (reduce (fn [acc selector]
- (concat acc (-> recommendations selector rules/ensure-seq)))
- [])
- (take n)
- (map ->related-entity)))))
+ [root]
+ (-> root
+ :entity
+ related/related
+ (update :fields (partial remove key-col?))
+ (->> (m/map-vals (comp (partial map ->related-entity) rules/ensure-seq)))))
(s/defn ^:private indepth
[root, rule :- (s/maybe rules/Rule)]
@@ -784,7 +776,7 @@
{:title ((some-fn :short-title :title) dashboard)
:description (:description dashboard)
:url (format "%s/rule/%s/%s" (:url root) (:rule rule) (:rule indepth))})))
- (take max-related)))
+ (hash-map :indepth)))
(defn- drilldown-fields
[context]
@@ -793,20 +785,79 @@
vals
(mapcat :matches)
filters/interesting-fields
- (map ->related-entity)))
+ (map ->related-entity)
+ (hash-map :drilldown-fields)))
+
+(defn- fill-related
+ "We fill available slots round-robin style. Each selector is a list of fns that are tried against
+ `related` in sequence until one matches. Matching items are stored in a map so we can later
+ reconstruct ordering and group items by selector."
+ [available-slots selectors related]
+ (let [pop-first (fn [m ks]
+ (loop [[k & ks] ks]
+ (let [item (-> k m first)]
+ (cond
+ item [item k (update m k rest)]
+ (empty? ks) [nil nil m]
+ :else (recur ks)))))]
+ (loop [[selector & remaining-selectors] selectors
+ related related
+ selected []]
+ (let [[next selector related] (pop-first related (mapcat shuffle selector))
+ num-selected (count selected)]
+ (cond
+ (= num-selected available-slots)
+ selected
+
+ next
+ (recur remaining-selectors related (conj selected {:entity next
+ :selector selector}))
+
+ (and (empty? remaining-selectors)
+ (empty? selected))
+ {}
+
+ (empty? remaining-selectors)
+ (concat selected (fill-related (- available-slots num-selected) selectors related))
+
+ :else
+ (recur remaining-selectors related selected))))))
+
+(def ^:private related-selectors
+ {(type Table) (let [down [[:indepth] [:segments :metrics] [:drilldown-fields]]
+ sideways [[:linking-to :linked-from] [:tables]]]
+ [down down down down sideways sideways])
+ (type Segment) (let [down [[:indepth] [:segments :metrics] [:drilldown-fields]]
+ sideways [[:linking-to] [:tables]]
+ up [[:table]]]
+ [down down down sideways sideways up])
+ (type Metric) (let [down [[:drilldown-fields]]
+ sideways [[:metrics :segments]]
+ up [[:table]]]
+ [sideways sideways sideways down down up])
+ (type Field) (let [sideways [[:fields]]
+ up [[:table] [:metrics :segments]]]
+ [sideways sideways up])
+ (type Card) (let [down [[:drilldown-fields]]
+ sideways [[:metrics] [:similar-questions :dashboard-mates]]
+ up [[:table]]]
+ [sideways sideways sideways down down up])
+ (type Query) (let [down [[:drilldown-fields]]
+ sideways [[:metrics] [:similar-questions]]
+ up [[:table]]]
+ [sideways sideways sideways down down up])})
(s/defn ^:private related
- [context, rule :- (s/maybe rules/Rule)]
- (let [root (:root context)
- indepth (indepth root rule)]
- (if (not-empty indepth)
- {:indepth indepth
- :related (related-entities (- max-related (count indepth)) root)}
- (let [drilldown-fields (drilldown-fields context)
- n-related-entities (max (math/floor (* (/ 2 3) max-related))
- (- max-related (count drilldown-fields)))]
- {:related (related-entities n-related-entities root)
- :drilldown-fields (take (- max-related n-related-entities) drilldown-fields)}))))
+ "Build a balanced list of related X-rays. General composition of the list is determined for each
+ root type individually via `related-selectors`. That recepie is then filled round-robin style."
+ [dashboard, rule :- (s/maybe rules/Rule)]
+ (let [root (-> dashboard :context :root)]
+ (->> (merge (indepth root rule)
+ (drilldown-fields dashboard)
+ (related-entities root))
+ (fill-related max-related (related-selectors (-> root :entity type)))
+ (group-by :selector)
+ (m/map-vals (partial map :entity)))))
(defn- filter-referenced-fields
"Return a map of fields referenced in filter cluase."
diff --git a/src/metabase/db/migrations.clj b/src/metabase/db/migrations.clj
index 421a5405aa8ab6096c370b74a786d99b53be8cdf..1aeed2b266b17732a92614d5ed061272f0564256 100644
--- a/src/metabase/db/migrations.clj
+++ b/src/metabase/db/migrations.clj
@@ -6,7 +6,8 @@
CREATE TABLE IF NOT EXISTS ... -- Good
CREATE TABLE ... -- Bad"
- (:require [clojure.java.jdbc :as jdbc]
+ (:require [cemerick.friend.credentials :as creds]
+ [clojure.java.jdbc :as jdbc]
[clojure.string :as str]
[clojure.tools.logging :as log]
[metabase
@@ -33,7 +34,8 @@
[metabase.util.date :as du]
[toucan
[db :as db]
- [models :as models]]))
+ [models :as models]])
+ (:import java.util.UUID))
;;; # Migration Helpers
@@ -367,3 +369,34 @@
:special_type (mdb/isa :type/Category)
:active true}
:has_field_values "list"))
+
+;; In v0.30.0 we switiched to making standard SQL the default for BigQuery; up until that point we had been using
+;; BigQuery legacy SQL. For a while, we've supported standard SQL if you specified the case-insensitive `#standardSQL`
+;; directive at the beginning of your query, and similarly allowed you to specify legacy SQL with the `#legacySQL`
+;; directive (although this was already the default). Since we're now defaulting to standard SQL, we'll need to go in
+;; and add a `#legacySQL` directive to all existing BigQuery SQL queries that don't have a directive, so they'll
+;; continue to run as legacy SQL.
+(defmigration ^{:author "camsaul", :added "0.30.0"} add-legacy-sql-directive-to-bigquery-sql-cards
+ ;; For each BigQuery database...
+ (doseq [database-id (db/select-ids Database :engine "bigquery")]
+ ;; For each Card belonging to that BigQuery database...
+ (doseq [{query :dataset_query, card-id :id} (db/select [Card :id :dataset_query] :database_id database-id)]
+ ;; If the Card isn't native, ignore it
+ (when (= (:type query) "native")
+ (let [sql (get-in query [:native :query])]
+ ;; if the Card already contains a #standardSQL or #legacySQL (both are case-insenstive) directive, ignore it
+ (when-not (re-find #"(?i)#(standard|legacy)sql" sql)
+ ;; if it doesn't have a directive it would have (under old behavior) defaulted to legacy SQL, so give it a
+ ;; #legacySQL directive...
+ (let [updated-sql (str "#legacySQL\n" sql)]
+ ;; and save the updated dataset_query map
+ (db/update! Card (u/get-id card-id)
+ :dataset_query (assoc-in query [:native :query] updated-sql)))))))))
+
+;; Before 0.30.0, we were storing the LDAP user's password in the `core_user` table (though it wasn't used). This
+;; migration clears those passwords and replaces them with a UUID. This is similar to a new account setup, or how we
+;; disable passwords for Google authenticated users
+(defmigration ^{:author "senior", :added "0.30.0"} clear-ldap-user-local-passwords
+ (db/transaction
+ (doseq [user (db/select [User :id :password_salt] :ldap_auth [:= true])]
+ (db/update! User (u/get-id user) :password (creds/hash-bcrypt (str (:password_salt user) (UUID/randomUUID)))))))
diff --git a/src/metabase/driver/bigquery.clj b/src/metabase/driver/bigquery.clj
index 6188a651af91c44ee67a7c259b816959649c7871..1fffeece2ea36e47a6782788976c9382bd9302f6 100644
--- a/src/metabase/driver/bigquery.clj
+++ b/src/metabase/driver/bigquery.clj
@@ -1,5 +1,6 @@
(ns metabase.driver.bigquery
- (:require [clj-time
+ (:require [cheshire.core :as json]
+ [clj-time
[coerce :as tcoerce]
[core :as time]
[format :as tformat]]
@@ -10,41 +11,63 @@
[clojure.tools.logging :as log]
[honeysql
[core :as hsql]
+ [format :as hformat]
[helpers :as h]]
[metabase
[config :as config]
[driver :as driver]
[util :as u]]
- [metabase.util.date :as du]
[metabase.driver
[generic-sql :as sql]
[google :as google]]
[metabase.driver.generic-sql.query-processor :as sqlqp]
[metabase.driver.generic-sql.util.unprepare :as unprepare]
- [metabase.models
- [database :refer [Database]]
- [field :as field]]
[metabase.query-processor
[annotate :as annotate]
[util :as qputil]]
- [metabase.util.honeysql-extensions :as hx]
+ [metabase.util
+ [date :as du]
+ [honeysql-extensions :as hx]]
+ [puppetlabs.i18n.core :refer [tru]]
[toucan.db :as db])
(:import com.google.api.client.googleapis.auth.oauth2.GoogleCredential
- [com.google.api.client.http HttpRequestInitializer HttpRequest]
+ com.google.api.client.http.HttpRequestInitializer
[com.google.api.services.bigquery Bigquery Bigquery$Builder BigqueryScopes]
- [com.google.api.services.bigquery.model QueryRequest QueryResponse Table TableCell TableFieldSchema
- TableList TableList$Tables TableReference TableRow TableSchema]
+ [com.google.api.services.bigquery.model QueryRequest QueryResponse Table TableCell TableFieldSchema TableList
+ TableList$Tables TableReference TableRow TableSchema]
+ honeysql.format.ToSql
java.sql.Time
[java.util Collections Date]
- [metabase.query_processor.interface AggregationWithField AggregationWithoutField DateTimeValue Expression TimeValue Value]))
+ [metabase.query_processor.interface AggregationWithField AggregationWithoutField Expression Field TimeValue]))
(defrecord BigQueryDriver []
:load-ns true
clojure.lang.Named
(getName [_] "BigQuery"))
+(defn- valid-bigquery-identifier?
+ "Is String `s` a valid BigQuery identifiers? Identifiers are only allowed to contain letters, numbers, and
+ underscores; cannot start with a number; and can be at most 128 characters long."
+ [s]
+ (boolean
+ (and (string? s)
+ (re-matches #"^([a-zA-Z_][a-zA-Z_0-9]*){1,128}$" s))))
+
+(defn- dataset-name-for-current-query
+ "Fetch the dataset name for the database associated with this query, needed because BigQuery requires you to qualify
+ identifiers with it. This is primarily called automatically for the `to-sql` implementation of the
+ `BigQueryIdentifier` record type; see its definition for more details.
+
+ This looks for the value inside the SQL QP's `*query*` dynamic var; since this won't be bound for non-MBQL queries,
+ you will want to avoid this function for SQL queries."
+ []
+ {:pre [(map? sqlqp/*query*)], :post [(valid-bigquery-identifier? %)]}
+ (get-in sqlqp/*query* [:database :details :dataset-id]))
+
-;;; ----------------------------------------------------- Client -----------------------------------------------------
+;;; +----------------------------------------------------------------------------------------------------------------+
+;;; | Client |
+;;; +----------------------------------------------------------------------------------------------------------------+
(defn- ^Bigquery credential->client [^GoogleCredential credential]
(.build (doto (Bigquery$Builder.
@@ -64,11 +87,13 @@
(comp credential->client database->credential))
-;;; ------------------------------------------------------ Etc. ------------------------------------------------------
+;;; +----------------------------------------------------------------------------------------------------------------+
+;;; | Sync |
+;;; +----------------------------------------------------------------------------------------------------------------+
(defn- ^TableList list-tables
"Fetch a page of Tables. By default, fetches the first page; page size is 50. For cases when more than 50 Tables are
- present, you may fetch subsequent pages by specifying the PAGE-TOKEN; the token for the next page is returned with a
+ present, you may fetch subsequent pages by specifying the `page-token`; the token for the next page is returned with a
page when one exists."
([database]
(list-tables database nil))
@@ -134,6 +159,10 @@
:fields (set (table-schema->metabase-field-info (.getSchema (get-table database table-name))))})
+;;; +----------------------------------------------------------------------------------------------------------------+
+;;; | Running Queries & Parsing Results |
+;;; +----------------------------------------------------------------------------------------------------------------+
+
(def ^:private ^:const ^Integer query-timeout-seconds 60)
(defn- ^QueryResponse execute-bigquery
@@ -144,8 +173,8 @@
{:pre [client (seq project-id) (seq query-string)]}
(let [request (doto (QueryRequest.)
(.setTimeoutMs (* query-timeout-seconds 1000))
- ;; if the query contains a `#standardSQL` directive then use Standard SQL instead of legacy SQL
- (.setUseLegacySql (not (str/includes? (str/lower-case query-string) "#standardsql")))
+ ;; if the query contains a `#legacySQL` directive then use legacy SQL instead of standard SQL
+ (.setUseLegacySql (str/includes? (str/lower-case query-string) "#legacysql"))
(.setQuery query-string))]
(google/execute (.query (.jobs client) project-id request)))))
@@ -218,82 +247,89 @@
(post-process-native (execute-bigquery database query-string))))
-;;; # Generic SQL Driver Methods
-
-(defn- date-add [unit timestamp interval]
- (hsql/call :date_add timestamp interval (hx/literal unit)))
-
-;; microseconds = unix timestamp in microseconds. Most BigQuery functions like strftime require timestamps in this
-;; format
-
-(def ^:private ->microseconds (partial hsql/call :timestamp_to_usec))
+;;; +----------------------------------------------------------------------------------------------------------------+
+;;; | Generic SQL Driver Methods |
+;;; +----------------------------------------------------------------------------------------------------------------+
-(defn- microseconds->str [format-str µs]
- (hsql/call :strftime_utc_usec µs (hx/literal format-str)))
+(defn- trunc
+ "Generate raw SQL along the lines of `timestamp_trunc(cast(<some-field> AS timestamp), day)`"
+ [unit expr]
+ (hsql/call :timestamp_trunc (hx/->timestamp expr) (hsql/raw (name unit))))
-(defn- trunc-with-format [format-str timestamp]
- (hx/->timestamp (microseconds->str format-str (->microseconds timestamp))))
+(defn- extract [unit expr]
+ ;; implemenation of extract() in `metabase.util.honeysql-extensions` handles actual conversion to raw SQL (!)
+ (hsql/call :extract unit (hx/->timestamp expr)))
(defn- date [unit expr]
(case unit
:default expr
- :minute (trunc-with-format "%Y-%m-%d %H:%M:00" expr)
- :minute-of-hour (hx/minute expr)
- :hour (trunc-with-format "%Y-%m-%d %H:00:00" expr)
- :hour-of-day (hx/hour expr)
- :day (hx/->timestamp (hsql/call :date expr))
- :day-of-week (hsql/call :dayofweek expr)
- :day-of-month (hsql/call :day expr)
- :day-of-year (hsql/call :dayofyear expr)
- :week (date-add :day (date :day expr) (hx/- 1 (date :day-of-week expr)))
- :week-of-year (hx/week expr)
- :month (trunc-with-format "%Y-%m-01" expr)
- :month-of-year (hx/month expr)
- :quarter (date-add :month
- (trunc-with-format "%Y-01-01" expr)
- (hx/* (hx/dec (date :quarter-of-year expr))
- 3))
- :quarter-of-year (hx/quarter expr)
- :year (hx/year expr)))
+ :minute (trunc :minute expr)
+ :minute-of-hour (extract :minute expr)
+ :hour (trunc :hour expr)
+ :hour-of-day (extract :hour expr)
+ :day (trunc :day expr)
+ :day-of-week (extract :dayofweek expr)
+ :day-of-month (extract :day expr)
+ :day-of-year (extract :dayofyear expr)
+ :week (trunc :week expr)
+ :week-of-year (-> (extract :week expr) hx/inc) ; BigQuery's impl of `week` uses 0 for the first week; we use 1
+ :month (trunc :month expr)
+ :month-of-year (extract :month expr)
+ :quarter (trunc :quarter expr)
+ :quarter-of-year (extract :quarter expr)
+ :year (extract :year expr)))
(defn- unix-timestamp->timestamp [expr seconds-or-milliseconds]
(case seconds-or-milliseconds
- :seconds (hsql/call :sec_to_timestamp expr)
- :milliseconds (hsql/call :msec_to_timestamp expr)))
-
-
-;;; # Query Processing
-
-(declare driver)
-
-;; Make the dataset-id the "schema" of every field or table in the query because otherwise BigQuery can't figure out
-;; where things is from
-(defn- qualify-fields-and-tables-with-dataset-id [{{{:keys [dataset-id]} :details} :database, :as query}]
- (walk/postwalk (fn [x]
- (cond
- ;; TODO - it is inconvenient that we use different keys for `schema` across different classes. We
- ;; should one day refactor to use the same key everywhere.
- (instance? metabase.query_processor.interface.Field x) (assoc x :schema-name dataset-id)
- (instance? metabase.query_processor.interface.JoinTable x) (assoc x :schema dataset-id)
- :else x))
- (assoc-in query [:query :source-table :schema] dataset-id)))
-
-(defn- honeysql-form [outer-query]
- (sqlqp/build-honeysql-form driver (qualify-fields-and-tables-with-dataset-id outer-query)))
+ :seconds (hsql/call :timestamp_seconds expr)
+ :milliseconds (hsql/call :timestamp_millis expr)))
+
+
+;;; +----------------------------------------------------------------------------------------------------------------+
+;;; | Query Processor |
+;;; +----------------------------------------------------------------------------------------------------------------+
+
+(def ^:private bq-driver (BigQueryDriver.))
+
+;; This record type used for BigQuery table and field identifiers, since BigQuery has some stupid rules about how to
+;; quote them (tables are like `dataset.table` and fields are like `dataset.table`.`field`)
+;; This implements HoneySql's ToSql protocol, so we can just output this directly in most of our QP code below
+(defrecord ^:private BigQueryIdentifier [dataset-name ; optional; will use (dataset-name-for-current-query) otherwise
+ table-name
+ field-name]
+ honeysql.format/ToSql
+ (to-sql [{:keys [dataset-name table-name field-name], :as bq-id}]
+ ;; Check to make sure the identifiers are valid and don't contain any sorts of escape characters since we are
+ ;; constructing raw SQL here, and would like to avoid potential SQL injection vectors (even though this is not
+ ;; direct user input, but instead would require someone to go in and purposely corrupt their Table names/Field names
+ ;; to do so)
+ (when dataset-name
+ (assert (valid-bigquery-identifier? dataset-name)
+ (tru "Invalid BigQuery identifier: ''{0}''" dataset-name)))
+ (assert (valid-bigquery-identifier? table-name)
+ (tru "Invalid BigQuery identifier: ''{0}''" table-name))
+ (when (seq field-name)
+ (assert (valid-bigquery-identifier? field-name)
+ (tru "Invalid BigQuery identifier: ''{0}''" field-name)))
+ ;; BigQuery identifiers should look like `dataset.table` or `dataset.table`.`field` (SAD!)
+ (str (format "`%s.%s`" (or dataset-name (dataset-name-for-current-query)) table-name)
+ (when (seq field-name)
+ (format ".`%s`" field-name)))))
(defn- honeysql-form->sql ^String [honeysql-form]
{:pre [(map? honeysql-form)]}
- ;; replace identifiers like [shakespeare].[word] with ones like [shakespeare.word] since that's hat BigQuery expects
- (let [[sql & args] (sql/honeysql-form->sql+args driver honeysql-form)
- sql (str/replace (hx/unescape-dots sql) #"\]\.\[" ".")]
- (assert (empty? args)
- "BigQuery statements can't be parameterized!")
+ ;; replace identifiers like `shakespeare`.`word` with ones like `shakespeare.word` since that's what BigQuery expects
+ (let [[sql & args] (sql/honeysql-form->sql+args bq-driver honeysql-form)]
+ (when (seq args)
+ (throw (Exception. (str (tru "BigQuery statements can't be parameterized!")))))
sql))
-(defn- post-process-mbql [dataset-id table-name {:keys [columns rows]}]
- ;; Since we don't alias column names the come back like "veryNiceDataset_shakepeare_corpus". Strip off the dataset
- ;; and table IDs
- (let [demangle-name (u/rpartial str/replace (re-pattern (str \^ dataset-id \_ table-name \_)) "")
+(defn- post-process-mbql [table-name {:keys [columns rows]}]
+ ;; Say we have an identifier like `veryNiceDataset.shakespeare`.`corpus`. We will alias it like
+ ;; `shakespeare___corpus` (because BigQuery does not let you include symbols in identifiers); during post-processing
+ ;; we can go ahead and strip off the table name from the alias since we don't want it to show up in the result
+ ;; column names
+ (let [demangle-name #(str/replace % (re-pattern (str \^ table-name "___")) "")
columns (for [column columns]
(keyword (demangle-name column)))
rows (for [row rows]
@@ -340,26 +376,8 @@
maybe-agg))
query)))
-(defn- mbql->native [{{{:keys [dataset-id]} :details, :as database} :database, {{table-name :name} :source-table} :query, :as outer-query}]
- {:pre [(map? database) (seq dataset-id) (seq table-name)]}
- (let [aliased-query (pre-alias-aggregations outer-query)]
- (binding [sqlqp/*query* aliased-query]
- {:query (-> aliased-query honeysql-form honeysql-form->sql)
- :table-name table-name
- :mbql? true})))
-
-(defn- execute-query [{{{:keys [dataset-id]} :details, :as database} :database, {sql :query, params :params, :keys [table-name mbql?]} :native, :as outer-query}]
- (let [sql (str "-- " (qputil/query->remark outer-query) "\n" (if (seq params)
- (unprepare/unprepare (cons sql params))
- sql))
- results (process-native* database sql)
- results (if mbql?
- (post-process-mbql dataset-id table-name results)
- (update results :columns (partial map keyword)))]
- (assoc results :annotate? mbql?)))
-
-;; These provide implementations of `->honeysql` that prevents HoneySQL from converting forms to prepared
-;; statement parameters (`?`)
+;; These provide implementations of `->honeysql` that prevent HoneySQL from converting forms to prepared statement
+;; parameters (`?` symbols)
(defmethod sqlqp/->honeysql [BigQueryDriver String]
[_ s]
;; TODO - what happens if `s` contains single-quotes? Shouldn't we be escaping them somehow?
@@ -380,10 +398,22 @@
(sqlqp/->honeysql driver)
hx/->time))
-(defn- field->alias [driver {:keys [^String schema-name, ^String field-name, ^String table-name, ^Integer index, field], :as this}]
+(defmethod sqlqp/->honeysql [BigQueryDriver Field]
+ [_ {:keys [table-name field-name special-type] :as field}]
+ (let [field (map->BigQueryIdentifier {:table-name table-name, :field-name field-name})]
+ (cond
+ (isa? special-type :type/UNIXTimestampSeconds) (unix-timestamp->timestamp field :seconds)
+ (isa? special-type :type/UNIXTimestampMilliseconds) (unix-timestamp->timestamp field :milliseconds)
+ :else field)))
+
+(defn- field->alias
+ "Generate an appropriate alias for a `field`. This will normally be something like `tableName___fieldName` (done this
+ way because BigQuery will not let us include symbols in identifiers, so we can't make our alias be
+ `tableName.fieldName`, like we do for other drivers)."
+ [driver {:keys [^String field-name, ^String table-name, ^Integer index, field], :as this}]
{:pre [(map? this) (or field
index
- (and (seq schema-name) (seq field-name) (seq table-name))
+ (and (seq field-name) (seq table-name))
(log/error "Don't know how to alias: " this))]}
(cond
field (recur driver field) ; type/DateTime
@@ -399,17 +429,24 @@
:else
(name ag-type)))
- :else (str schema-name \. table-name \. field-name)))
-
-;; TODO - Making 2 DB calls for each field to fetch its dataset is inefficient and makes me cry, but this method is
-;; currently only used for SQL params so it's not a huge deal at this point
-(defn- field->identifier [{table-id :table_id, :as field}]
- (let [db-id (db/select-one-field :db_id 'Table :id table-id)
- dataset (:dataset-id (db/select-one-field :details Database, :id db-id))]
- (hsql/raw (apply format "[%s.%s.%s]" dataset (field/qualified-name-components field)))))
+ :else (str table-name "___" field-name)))
+
+(defn- field->identifier
+ "Generate appropriate identifier for a Field for SQL parameters. (NOTE: THIS IS ONLY USED FOR SQL PARAMETERS!)"
+ ;; TODO - Making a DB call for each field to fetch its dataset is inefficient and makes me cry, but this method is
+ ;; currently only used for SQL params so it's not a huge deal at this point
+ [{table-id :table_id, :as field}]
+ ;; manually write the query here to save us from having to do 2 seperate queries...
+ (let [[{:keys [details table-name]}] (db/query {:select [[:database.details :details] [:table.name :table-name]]
+ :from [[:metabase_table :table]]
+ :left-join [[:metabase_database :database]
+ [:= :database.id :table.db_id]]
+ :where [:= :table.id (u/get-id table-id)]})
+ details (json/parse-string (u/jdbc-clob->str details) keyword)]
+ (map->BigQueryIdentifier {:dataset-name (:dataset-id details), :table-name table-name, :field-name (:name field)})))
(defn- field->breakout-identifier [driver field]
- (hsql/raw (str \[ (field->alias driver field) \])))
+ (hsql/raw (str \` (field->alias driver field) \`)))
(defn- apply-breakout [driver honeysql-form {breakout-fields :breakout, fields-fields :fields}]
(-> honeysql-form
@@ -421,44 +458,89 @@
:when (not (contains? (set fields-fields) field))]
(sqlqp/as driver (sqlqp/->honeysql driver field) field)))))
+(defn apply-source-table
+ "Copy of the Generic SQL implementation of `apply-source-table` that prepends the current dataset ID to the table
+ name."
+ [honeysql-form {{table-name :name} :source-table}]
+ {:pre [(seq table-name)]}
+ (h/from honeysql-form (map->BigQueryIdentifier {:table-name table-name})))
+
(defn- apply-join-tables
- "Copy of the Generic SQL implementation of `apply-join-tables`, but prepends schema (dataset-id) to join-alias."
- [honeysql-form {join-tables :join-tables, {source-table-name :name, source-schema :schema} :source-table}]
- (loop [honeysql-form honeysql-form, [{:keys [table-name pk-field source-field schema join-alias]} & more] join-tables]
- (let [honeysql-form (h/merge-left-join honeysql-form
- [(hx/qualify-and-escape-dots schema table-name) (hx/qualify-and-escape-dots schema join-alias)]
- [:= (hx/qualify-and-escape-dots source-schema source-table-name (:field-name source-field))
- (hx/qualify-and-escape-dots schema join-alias (:field-name pk-field))])]
+ "Copy of the Generic SQL implementation of `apply-join-tables`, but prepends the current dataset ID to join-alias."
+ [honeysql-form {join-tables :join-tables, {source-table-name :name} :source-table}]
+ (loop [honeysql-form honeysql-form, [{:keys [table-name pk-field source-field join-alias]} & more] join-tables]
+ (let [honeysql-form
+ (h/merge-left-join honeysql-form
+ [(map->BigQueryIdentifier {:table-name table-name})
+ (map->BigQueryIdentifier {:table-name join-alias})]
+ [:=
+ (map->BigQueryIdentifier {:table-name source-table-name, :field-name (:field-name source-field)})
+ (map->BigQueryIdentifier {:table-name join-alias, :field-name (:field-name pk-field)})])]
(if (seq more)
(recur honeysql-form more)
honeysql-form))))
(defn- apply-order-by [driver honeysql-form {subclauses :order-by}]
(loop [honeysql-form honeysql-form, [{:keys [field direction]} & more] subclauses]
- (let [honeysql-form (h/merge-order-by honeysql-form [(field->breakout-identifier driver field) (case direction
- :ascending :asc
- :descending :desc)])]
+ (let [honeysql-form (h/merge-order-by honeysql-form [(field->breakout-identifier driver field)
+ (case direction
+ :ascending :asc
+ :descending :desc)])]
(if (seq more)
(recur honeysql-form more)
honeysql-form))))
+;;; +----------------------------------------------------------------------------------------------------------------+
+;;; | Other Driver / SQLDriver Method Implementations |
+;;; +----------------------------------------------------------------------------------------------------------------+
+
(defn- string-length-fn [field-key]
(hsql/call :length field-key))
(defn- date-interval [driver unit amount]
(sqlqp/->honeysql driver (du/relative-date unit amount)))
+(defn- mbql->native
+ "Custom implementation of ISQLDriver's `mbql->native` with these differences:
+
+ * Runs `pre-alias-aggregations` on the query
+ * Runs our customs `honeysql-form->sql` method
+ * Incldues `table-name` in the resulting map (do not remember why we are doing so, perhaps it is needed to run the
+ query)"
+ [{{{:keys [dataset-id]} :details, :as database} :database
+ {{table-name :name} :source-table} :query
+ :as outer-query}]
+ {:pre [(map? database) (seq dataset-id) (seq table-name)]}
+ (let [aliased-query (pre-alias-aggregations outer-query)]
+ (binding [sqlqp/*query* aliased-query]
+ {:query (->> aliased-query
+ (sqlqp/build-honeysql-form bq-driver)
+ honeysql-form->sql)
+ :table-name table-name
+ :mbql? true})))
+
+(defn- execute-query [{database :database
+ {sql :query, params :params, :keys [table-name mbql?]} :native
+ :as outer-query}]
+ (let [sql (str "-- " (qputil/query->remark outer-query) "\n" (if (seq params)
+ (unprepare/unprepare (cons sql params))
+ sql))
+ results (process-native* database sql)
+ results (if mbql?
+ (post-process-mbql table-name results)
+ (update results :columns (partial map keyword)))]
+ (assoc results :annotate? mbql?)))
+
;; BigQuery doesn't return a timezone with it's time strings as it's always UTC, JodaTime parsing also defaults to UTC
(def ^:private bigquery-date-formatters (driver/create-db-time-formatters "yyyy-MM-dd HH:mm:ss.SSSSSS"))
(def ^:private bigquery-db-time-query "select CAST(CURRENT_TIMESTAMP() AS STRING)")
-(def ^:private driver (BigQueryDriver.))
-
(u/strict-extend BigQueryDriver
sql/ISQLDriver
(merge (sql/ISQLDriverDefaultsMixin)
{:apply-breakout apply-breakout
+ :apply-source-table (u/drop-first-arg apply-source-table)
:apply-join-tables (u/drop-first-arg apply-join-tables)
:apply-order-by apply-order-by
;; these two are actually not applicable since we don't use JDBC
@@ -468,9 +550,7 @@
:date (u/drop-first-arg date)
:field->alias field->alias
:field->identifier (u/drop-first-arg field->identifier)
- ;; we want identifiers quoted [like].[this] initially (we have to convert them to [like.this] before
- ;; executing)
- :quote-style (constantly :sqlserver)
+ :quote-style (constantly :mysql)
:string-length-fn (u/drop-first-arg string-length-fn)
:unix-timestamp->timestamp (u/drop-first-arg unix-timestamp->timestamp)})
@@ -519,9 +599,9 @@
#{:foreign-keys})))
:format-custom-field-name (u/drop-first-arg format-custom-field-name)
:mbql->native (u/drop-first-arg mbql->native)
- :current-db-time (driver/make-current-db-time-fn bigquery-db-time-query bigquery-date-formatters)}))
+ :current-db-time (driver/make-current-db-time-fn bigquery-db-time-query bigquery-date-formatters)}))
(defn -init-driver
"Register the BigQuery driver"
[]
- (driver/register-driver! :bigquery driver))
+ (driver/register-driver! :bigquery bq-driver))
diff --git a/src/metabase/driver/generic_sql/query_processor.clj b/src/metabase/driver/generic_sql/query_processor.clj
index c05205cd0a2df19ca829bc8b37b5683eb893f16c..e29e0b7d9eb14f2da784a942ae6ecf5a0422a0b3 100644
--- a/src/metabase/driver/generic_sql/query_processor.clj
+++ b/src/metabase/driver/generic_sql/query_processor.clj
@@ -278,8 +278,10 @@
(h/where honeysql-form (filter-clause->predicate driver clause)))
(defn apply-join-tables
- "Apply expanded query `join-tables` clause to HONEYSQL-FORM. Default implementation of `apply-join-tables` for SQL drivers."
+ "Apply expanded query `join-tables` clause to `honeysql-form`. Default implementation of `apply-join-tables` for SQL
+ drivers."
[_ honeysql-form {join-tables :join-tables, {source-table-name :name, source-schema :schema} :source-table}]
+ ;; TODO - why doesn't this use ->honeysql like mostly everything else does?
(loop [honeysql-form honeysql-form, [{:keys [table-name pk-field source-field schema join-alias]} & more] join-tables]
(let [honeysql-form (h/merge-left-join honeysql-form
[(hx/qualify-and-escape-dots schema table-name) (keyword join-alias)]
@@ -317,7 +319,7 @@
"Apply `source-table` clause to `honeysql-form`. Default implementation of `apply-source-table` for SQL drivers.
Override as needed."
[_ honeysql-form {{table-name :name, schema :schema} :source-table}]
- {:pre [table-name]}
+ {:pre [(seq table-name)]}
(h/from honeysql-form (hx/qualify-and-escape-dots schema table-name)))
(declare apply-clauses)
diff --git a/src/metabase/driver/mongo.clj b/src/metabase/driver/mongo.clj
index 5296b2d0db7ecbe4504a4c088a461a802c6258e4..45f504ea3bc5898a6ce370e178e55c05e15f9093 100644
--- a/src/metabase/driver/mongo.clj
+++ b/src/metabase/driver/mongo.clj
@@ -66,14 +66,17 @@
(cond
;; 1. url?
(and (string? field-value)
- (u/url? field-value)) :type/URL
+ (u/url? field-value))
+ :type/URL
+
;; 2. json?
(and (string? field-value)
(or (.startsWith "{" field-value)
- (.startsWith "[" field-value))) (when-let [j (u/try-apply json/parse-string field-value)]
- (when (or (map? j)
- (sequential? j))
- :type/SerializedJSON))))
+ (.startsWith "[" field-value)))
+ (when-let [j (u/ignore-exceptions (json/parse-string field-value))]
+ (when (or (map? j)
+ (sequential? j))
+ :type/SerializedJSON))))
(defn- find-nested-fields [field-value nested-fields]
(loop [[k & more-keys] (keys field-value)
diff --git a/src/metabase/driver/sparksql.clj b/src/metabase/driver/sparksql.clj
index 1b797de9d3c41a167ecd9a3aeac04cc1f84092b3..9a53cd2f4402110909a74cef5536ca9a0ae2887a 100644
--- a/src/metabase/driver/sparksql.clj
+++ b/src/metabase/driver/sparksql.clj
@@ -15,6 +15,7 @@
[generic-sql :as sql]
[hive-like :as hive-like]]
[metabase.driver.generic-sql.query-processor :as sqlqp]
+ [metabase.models.table :refer [Table]]
[metabase.query-processor.util :as qputil]
[metabase.util.honeysql-extensions :as hx]
[puppetlabs.i18n.core :refer [trs]])
@@ -32,9 +33,13 @@
(def ^:private source-table-alias "t1")
+(defn- find-source-table [query]
+ (first (qputil/postwalk-collect #(instance? (type Table) %)
+ identity
+ query)))
+
(defn- resolve-table-alias [{:keys [schema-name table-name special-type field-name] :as field}]
- (let [source-table (or (get-in sqlqp/*query* [:query :source-table])
- (get-in sqlqp/*query* [:query :source-query :source-table]))]
+ (let [source-table (find-source-table sqlqp/*query*)]
(if (and (= schema-name (:schema source-table))
(= table-name (:name source-table)))
(-> (assoc field :schema-name nil)
@@ -49,7 +54,7 @@
(defmethod sqlqp/->honeysql [SparkSQLDriver Field]
[driver field-before-aliasing]
- (let [{:keys [schema-name table-name special-type field-name]} (resolve-table-alias field-before-aliasing)
+ (let [{:keys [schema-name table-name special-type field-name] :as foo} (resolve-table-alias field-before-aliasing)
field (keyword (hx/qualify-and-escape-dots schema-name table-name field-name))]
(cond
(isa? special-type :type/UNIXTimestampSeconds) (sql/unix-timestamp->timestamp driver field :seconds)
diff --git a/src/metabase/integrations/ldap.clj b/src/metabase/integrations/ldap.clj
index b3987b00f867468275977b9f96130f15efa2320d..27ba7f9cefbb92c18d28fd65708282b066d8e993 100644
--- a/src/metabase/integrations/ldap.clj
+++ b/src/metabase/integrations/ldap.clj
@@ -98,7 +98,7 @@
(defn- escape-value
"Escapes a value for use in an LDAP filter expression."
[value]
- (str/replace value #"[\*\(\)\\\\0]" (comp (partial format "\\%02X") int first)))
+ (str/replace value #"(?:^\s|\s$|[,\\\#\+<>;\"=\*\(\)\\0])" (comp (partial format "\\%02X") int first)))
(defn- get-connection
"Connects to LDAP with the currently set settings and returns the connection."
@@ -211,11 +211,8 @@
(let [user (or (db/select-one [User :id :last_login] :email email)
(user/create-new-ldap-auth-user! {:first_name first-name
:last_name last-name
- :email email
- :password password}))]
+ :email email}))]
(u/prog1 user
- (when password
- (user/set-password! (:id user) password))
(when (ldap-group-sync)
(let [special-ids #{(:id (group/admin)) (:id (group/all-users))}
current-ids (set (map :group_id (db/select ['PermissionsGroupMembership :group_id] :user_id (:id user))))
diff --git a/src/metabase/models/interface.clj b/src/metabase/models/interface.clj
index d8ebb1d23836f17fff6c8b34768c3b90a4be264c..45ed8e4ec11393e3c7bf40cd4232cf352e0bc7c4 100644
--- a/src/metabase/models/interface.clj
+++ b/src/metabase/models/interface.clj
@@ -68,6 +68,10 @@
:in encrypted-json-in
:out (comp cached-encrypted-json-out u/jdbc-clob->str))
+(models/add-type! :encrypted-text
+ :in encryption/maybe-encrypt
+ :out (comp encryption/maybe-decrypt u/jdbc-clob->str))
+
(defn compress
"Compress OBJ, returning a byte array."
[obj]
diff --git a/src/metabase/models/pulse.clj b/src/metabase/models/pulse.clj
index 771f55de4d9a0411c3ae95f93fd95fc04ea96a21..b3cefa148d77d14c7560b22e18e2716ff9888a34 100644
--- a/src/metabase/models/pulse.clj
+++ b/src/metabase/models/pulse.clj
@@ -14,7 +14,8 @@
functions for fetching a specific Pulse). At some point in the future, we can clean this namespace up and bring the
code in line with the rest of the codebase, but for the time being, it probably makes sense to follow the existing
patterns in this namespace rather than further confuse things."
- (:require [clojure.tools.logging :as log]
+ (:require [clojure.string :as str]
+ [clojure.tools.logging :as log]
[medley.core :as m]
[metabase
[events :as events]
@@ -27,6 +28,7 @@
[pulse-channel :as pulse-channel :refer [PulseChannel]]
[pulse-channel-recipient :refer [PulseChannelRecipient]]]
[metabase.util.schema :as su]
+ [puppetlabs.i18n.core :refer [tru]]
[schema.core :as s]
[toucan
[db :as db]
@@ -73,6 +75,42 @@
:can-write? (partial i/current-user-has-full-permissions? :write)
:perms-objects-set perms-objects-set})
+;;; ---------------------------------------------------- Schemas -----------------------------------------------------
+
+(def AlertConditions
+ "Schema for valid values of `:alert_condition` for Alerts."
+ (s/enum "rows" "goal"))
+
+(def CardRef
+ "Schema for the map we use to internally represent the fact that a Card is in a Notification and the details about its
+ presence there."
+ (su/with-api-error-message {:id su/IntGreaterThanZero
+ :include_csv s/Bool
+ :include_xls s/Bool}
+ (tru "value must be a map with the keys `{0}`, `{1}`, and `{2}`." "id" "include_csv" "include_xls")))
+
+(def HybridPulseCard
+ "This schema represents the cards that are included in a pulse. This is the data from the `PulseCard` and some
+ additional information used by the UI to display it from `Card`. This is a superset of `CardRef` and is coercible to
+ a `CardRef`"
+ (su/with-api-error-message
+ (merge (:schema CardRef)
+ {:name (s/maybe s/Str)
+ :description (s/maybe s/Str)
+ :display (s/maybe su/KeywordOrString)
+ :collection_id (s/maybe su/IntGreaterThanZero)})
+ (tru "value must be a map with the following keys `({0})`"
+ (str/join ", " ["collection_id" "description" "display" "id" "include_csv" "include_xls" "name"]))))
+
+(def CoercibleToCardRef
+ "Schema for functions accepting either a `HybridPulseCard` or `CardRef`."
+ (s/conditional
+ (fn check-hybrid-pulse-card [maybe-map]
+ (and (map? maybe-map)
+ (some #(contains? maybe-map %) [:name :description :display :collection_id])))
+ HybridPulseCard
+ :else
+ CardRef))
;;; --------------------------------------------------- Hydration ----------------------------------------------------
@@ -81,8 +119,7 @@
[notification-or-id]
(db/select PulseChannel, :pulse_id (u/get-id notification-or-id)))
-
-(defn ^:hydrate cards
+(s/defn ^:hydrate cards :- [HybridPulseCard]
"Return the Cards associated with this `notification`."
[notification-or-id]
(map (partial models/do-post-select Card)
@@ -96,22 +133,6 @@
[:= :c.archived false]]
:order-by [[:pc.position :asc]]})))
-
-;;; ---------------------------------------------------- Schemas -----------------------------------------------------
-
-(def AlertConditions
- "Schema for valid values of `:alert_condition` for Alerts."
- (s/enum "rows" "goal"))
-
-(def CardRef
- "Schema for the map we use to internally represent the fact that a Card is in a Notification and the details about its
- presence there."
- (su/with-api-error-message {:id su/IntGreaterThanZero
- :include_csv s/Bool
- :include_xls s/Bool}
- "value must be a map with the keys `id`, `include_csv`, and `include_xls`."))
-
-
;;; ---------------------------------------- Notification Fetching Helper Fns ----------------------------------------
(s/defn ^:private hydrate-notification :- PulseInstance
@@ -342,7 +363,7 @@
(s/optional-key :skip_if_empty) s/Bool
(s/optional-key :collection_id) (s/maybe su/IntGreaterThanZero)
(s/optional-key :collection_position) (s/maybe su/IntGreaterThanZero)
- (s/optional-key :cards) [CardRef]
+ (s/optional-key :cards) [CoercibleToCardRef]
(s/optional-key :channels) [su/Map]}]
(db/update! Pulse (u/get-id notification)
(u/select-keys-when notification
diff --git a/src/metabase/models/setting.clj b/src/metabase/models/setting.clj
index fd80041abc20e55e337e9604edb7993e25d9db8b..29a595b9e26a68ac848ae7b55fad76045e5fbce5 100644
--- a/src/metabase/models/setting.clj
+++ b/src/metabase/models/setting.clj
@@ -30,13 +30,20 @@
(setting/all)"
(:refer-clojure :exclude [get])
(:require [cheshire.core :as json]
- [clojure.string :as str]
+ [clojure
+ [core :as core]
+ [string :as str]]
+ [clojure.core.memoize :as memoize]
+ [clojure.java.jdbc :as jdbc]
[clojure.tools.logging :as log]
[environ.core :as env]
+ [honeysql.core :as hsql]
[metabase
+ [db :as mdb]
[events :as events]
[util :as u]]
- [puppetlabs.i18n.core :refer [tru]]
+ [metabase.util.honeysql-extensions :as hx]
+ [puppetlabs.i18n.core :refer [trs tru]]
[schema.core :as s]
[toucan
[db :as db]
@@ -49,7 +56,7 @@
(u/strict-extend (class Setting)
models/IModel
(merge models/IModelDefaults
- {:types (constantly {:value :clob})}))
+ {:types (constantly {:value :encrypted-text})}))
(def ^:private Type
@@ -74,7 +81,8 @@
setting-or-name
(let [k (keyword setting-or-name)]
(or (@registered-settings k)
- (throw (Exception. (str (tru "Setting {0} does not exist.\nFound: {1}" k (sort (keys @registered-settings))))))))))
+ (throw (Exception.
+ (str (tru "Setting {0} does not exist.\nFound: {1}" k (sort (keys @registered-settings))))))))))
;;; +----------------------------------------------------------------------------------------------------------------+
@@ -84,12 +92,115 @@
;; Cache is a 1:1 mapping of what's in the DB
;; Cached lookup time is ~60µs, compared to ~1800µs for DB lookup
-(defonce ^:private cache
+(def ^:private cache
+ "Settings cache. Map of Setting key (string) -> Setting value (string)."
(atom nil))
-(defn- restore-cache-if-needed! []
- (when-not @cache
- (reset! cache (db/select-field->field :key :value Setting))))
+;; CACHE SYNCHRONIZATION
+;;
+;; When running multiple Metabase instances (horizontal scaling), it is of course possible for one instance to update
+;; a Setting, and, since Settings are cached (to avoid tons of DB calls), for the other instances to then have an
+;; out-of-date cache. Thus we need a way for instances to know when their caches are out of date, so they can update
+;; them accordingly. Here is our solution:
+;;
+;; We will record the last time *any* Setting was updated in a special Setting called `settings-last-updated`.
+;;
+;; Since `settings-last-updated` itself is a Setting, it will get fetched as part of each instance's local cache; we
+;; can then periodically compare the locally cached value of `settings-last-updated` with the value in the DB. If our
+;; locally cached value is older than the one in the DB, we will flush our cache. When the cache is fetched again, it
+;; will have the up-to-date value.
+;;
+;; Because different machines can have out-of-sync clocks, we'll rely entirely on the application DB for caclulating
+;; and comparing values of `settings-last-updated`. Because the Setting table itself only stores text values, we'll
+;; need to cast it between TEXT and TIMESTAMP SQL types as needed.
+
+(def ^:private ^String settings-last-updated-key "settings-last-updated")
+
+(defn- update-settings-last-updated!
+ "Update the value of `settings-last-updated` in the DB; if the row does not exist, insert one."
+ []
+ (log/debug (trs "Updating value of settings-last-updated in DB..."))
+ ;; for MySQL, cast(current_timestamp AS char); for H2 & Postgres, cast(current_timestamp AS text)
+ (let [current-timestamp-as-string-honeysql (hx/cast (if (= (mdb/db-type) :mysql) :char :text)
+ (hsql/raw "current_timestamp"))]
+ ;; attempt to UPDATE the existing row. If no row exists, `update-where!` will return false...
+ (or (db/update-where! Setting {:key settings-last-updated-key} :value current-timestamp-as-string-honeysql)
+ ;; ...at which point we will try to INSERT a new row. Note that it is entirely possible two instances can both
+ ;; try to INSERT it at the same time; one instance would fail because it would violate the PK constraint on
+ ;; `key`, and throw a SQLException. As long as one instance updates the value, we are fine, so we can go ahead
+ ;; and ignore that Exception if one is thrown.
+ (try
+ ;; Use `simple-insert!` because we do *not* want to trigger pre-insert behavior, such as encrypting `:value`
+ (db/simple-insert! Setting :key settings-last-updated-key, :value current-timestamp-as-string-honeysql)
+ (catch java.sql.SQLException e
+ ;; go ahead and log the Exception anyway on the off chance that it *wasn't* just a race condition issue
+ (log/error (tru "Error inserting new Setting:") (with-out-str (jdbc/print-sql-exception-chain e)))))))
+ ;; Now that we updated the value in the DB, go ahead and update our cached value as well, because we know about the
+ ;; changes
+ (swap! cache assoc settings-last-updated-key (db/select-one-field :value Setting :key settings-last-updated-key)))
+
+(defn- cache-out-of-date?
+ "Check whether our Settings cache is out of date. We know the cache is out of date if either of the following
+ conditions is true:
+
+ * The cache is empty (the `cache` atom is `nil`), which of course means it needs to be updated
+ * There is a value of `settings-last-updated` in the cache, and it is older than the value of in the DB. (There
+ will be no value until the first time a normal Setting is updated; thus if it is not yet set, we do not yet need
+ to invalidate our cache.)"
+ []
+ (log/debug (trs "Checking whether settings cache is out of date (requires DB call)..."))
+ (boolean
+ (or
+ ;; is the cache empty?
+ (not @cache)
+ ;; if not, get the cached value of `settings-last-updated`, and if it exists...
+ (when-let [last-known-update (core/get @cache settings-last-updated-key)]
+ ;; compare it to the value in the DB. This is done be seeing whether a row exists
+ ;; WHERE value > <local-value>
+ (db/select-one Setting
+ {:where [:and
+ [:= :key settings-last-updated-key]
+ [:> :value last-known-update]]})))))
+
+(def ^:private cache-update-check-interval-ms
+ "How often we should check whether the Settings cache is out of date (which requires a DB call)?"
+ ;; once a minute
+ (* 60 1000))
+
+(def ^:private ^{:arglists '([])} should-restore-cache?
+ "TTL-memoized version of `cache-out-of-date?`. Call this function to see whether we need to repopulate the cache with
+ values from the DB."
+ (memoize/ttl cache-out-of-date? :ttl/threshold cache-update-check-interval-ms))
+
+(def ^:private restore-cache-if-needed-lock (Object.))
+
+(defn- restore-cache-if-needed!
+ "Check whether we need to repopulate the cache with fresh values from the DB (because the cache is either empty or
+ known to be out-of-date), and do so if needed. This is intended to be called every time a Setting value is
+ retrieved, so it should be efficient; thus the calculation (`should-restore-cache?`) is itself TTL-memoized."
+ []
+ ;; There's a potential race condition here where two threads both call this at the exact same moment, and both get
+ ;; `true` when they call `should-restore-cache`, and then both simultaneously try to update the cache (or, one
+ ;; updates the cache, but the other calls `should-restore-cache?` and gets `true` before the other calls
+ ;; `memo-swap!` (see below))
+ ;;
+ ;; This is not desirable, since either situation would result in duplicate work. Better to just add a quick lock
+ ;; here so only one of them does it, since at any rate waiting for the other thread to finish the task in progress is
+ ;; certainly quicker than starting the task ourselves from scratch
+ (locking restore-cache-if-needed-lock
+ (when (should-restore-cache?)
+ (log/debug (trs "Refreshing Settings cache..."))
+ (reset! cache (db/select-field->field :key :value Setting))
+ ;; Now the cache is up-to-date. That is all good, but if we call `should-restore-cache?` again in a second it
+ ;; will still return `true`, because its result is memoized, and we would be on the hook to (again) update the
+ ;; cache. So go ahead and clear the memozied results for `should-restore-cache?`. The next time around when
+ ;; someone calls this it will cache the latest value (which should be `false`)
+ ;;
+ ;; NOTE: I tried using `memo-swap!` instead to set the cached response to `false` here, avoiding the extra DB
+ ;; call the next fn call would make, but it didn't seem to work correctly (I think it was still discarding the
+ ;; new value because of the TTL). So we will just stick with `memo-clear!` for now. (One extra DB call whenever
+ ;; the cache gets invalidated shouldn't be a huge deal)
+ (memoize/memo-clear! should-restore-cache?))))
;;; +----------------------------------------------------------------------------------------------------------------+
@@ -100,14 +211,14 @@
(name (:name (resolve-setting setting-or-name))))
(defn- env-var-name
- "Get the env var corresponding to SETTING-OR-NAME.
+ "Get the env var corresponding to `setting-or-name`.
(This is used primarily for documentation purposes)."
^String [setting-or-name]
(let [setting (resolve-setting setting-or-name)]
(str "MB_" (str/upper-case (str/replace (setting-name setting) "-" "_")))))
(defn env-var-value
- "Get the value of SETTING-OR-NAME from the corresponding env var, if any.
+ "Get the value of `setting-or-name` from the corresponding env var, if any.
The name of the Setting is converted to uppercase and dashes to underscores;
for example, a setting named `default-domain` can be set with the env var `MB_DEFAULT_DOMAIN`."
^String [setting-or-name]
@@ -117,14 +228,14 @@
v)))
(defn- db-value
- "Get the value, if any, of SETTING-OR-NAME from the DB (using / restoring the cache as needed)."
+ "Get the value, if any, of `setting-or-name` from the DB (using / restoring the cache as needed)."
^String [setting-or-name]
(restore-cache-if-needed!)
(clojure.core/get @cache (setting-name setting-or-name)))
(defn get-string
- "Get string value of SETTING-OR-NAME. This is the default getter for `String` settings; valuBis fetched as follows:
+ "Get string value of `setting-or-name`. This is the default getter for `String` settings; valuBis fetched as follows:
1. From the database (i.e., set via the admin panel), if a value is present;
2. From corresponding env var, if any;
@@ -144,32 +255,33 @@
(case (str/lower-case string-value)
"true" true
"false" false
- (throw (Exception. (str (tru "Invalid value for string: must be either \"true\" or \"false\" (case-insensitive).")))))))
+ (throw (Exception.
+ (str (tru "Invalid value for string: must be either \"true\" or \"false\" (case-insensitive).")))))))
(defn get-boolean
- "Get boolean value of (presumably `:boolean`) SETTING-OR-NAME. This is the default getter for `:boolean` settings.
+ "Get boolean value of (presumably `:boolean`) `setting-or-name`. This is the default getter for `:boolean` settings.
Returns one of the following values:
- * `nil` if string value of SETTING-OR-NAME is unset (or empty)
- * `true` if *lowercased* string value of SETTING-OR-NAME is `true`
- * `false` if *lowercased* string value of SETTING-OR-NAME is `false`."
+ * `nil` if string value of `setting-or-name` is unset (or empty)
+ * `true` if *lowercased* string value of `setting-or-name` is `true`
+ * `false` if *lowercased* string value of `setting-or-name` is `false`."
^Boolean [setting-or-name]
(string->boolean (get-string setting-or-name)))
(defn get-integer
- "Get integer value of (presumably `:integer`) SETTING-OR-NAME. This is the default getter for `:integer` settings."
+ "Get integer value of (presumably `:integer`) `setting-or-name`. This is the default getter for `:integer` settings."
^Integer [setting-or-name]
(when-let [s (get-string setting-or-name)]
(Integer/parseInt s)))
(defn get-double
- "Get double value of (presumably `:double`) SETTING-OR-NAME. This is the default getter for `:double` settings."
+ "Get double value of (presumably `:double`) `setting-or-name`. This is the default getter for `:double` settings."
^Double [setting-or-name]
(when-let [s (get-string setting-or-name)]
(Double/parseDouble s)))
(defn get-json
- "Get the string value of SETTING-OR-NAME and parse it as JSON."
+ "Get the string value of `setting-or-name` and parse it as JSON."
[setting-or-name]
(json/parse-string (get-string setting-or-name) keyword))
@@ -181,7 +293,7 @@
:double get-double})
(defn get
- "Fetch the value of SETTING-OR-NAME. What this means depends on the Setting's `:getter`; by default, this looks for
+ "Fetch the value of `setting-or-name`. What this means depends on the Setting's `:getter`; by default, this looks for
first for a corresponding env var, then checks the cache, then returns the default value of the Setting, if any."
[setting-or-name]
((:getter (resolve-setting setting-or-name))))
@@ -191,13 +303,21 @@
;;; | set! |
;;; +----------------------------------------------------------------------------------------------------------------+
-(defn- update-setting! [setting-name new-value]
- (db/update-where! Setting {:key setting-name}
- :value new-value))
+(defn- update-setting!
+ "Update an existing Setting. Used internally by `set-string!` below; do not use directly."
+ [setting-name new-value]
+ (assert (not= setting-name settings-last-updated-key)
+ (tru "You cannot update `settings-last-updated` yourself! This is done automatically."))
+ ;; This is indeed a very annoying way of having to do things, but `update-where!` doesn't call `pre-update` (in case
+ ;; it updates thousands of objects). So we need to manually trigger `pre-update` behavior by calling `do-pre-update`
+ ;; so that `value` can get encrypted if `MB_ENCRYPTION_SECRET_KEY` is in use. Then take that possibly-encrypted
+ ;; value and pass that into `update-where!`.
+ (let [{maybe-encrypted-new-value :value} (models/do-pre-update Setting {:value new-value})]
+ (db/update-where! Setting {:key setting-name}
+ :value maybe-encrypted-new-value)))
(defn- set-new-setting!
- "Insert a new row for a Setting with SETTING-NAME and SETTING-VALUE.
- Takes care of resetting the cache if the insert fails for some reason."
+ "Insert a new row for a Setting. Used internally by `set-string!` below; do not use directly."
[setting-name new-value]
(try (db/insert! Setting
:key setting-name
@@ -206,13 +326,15 @@
;; and there's actually a row in the DB that's not in the cache for some reason. Go ahead and update the
;; existing value and log a warning
(catch Throwable e
- (log/warn "Error INSERTing a new Setting:" (.getMessage e)
- "\nAssuming Setting already exists in DB and updating existing value.")
+ (log/warn (tru "Error inserting a new Setting:") "\n"
+ (.getMessage e) "\n"
+ (tru "Assuming Setting already exists in DB and updating existing value."))
(update-setting! setting-name new-value))))
(s/defn set-string!
- "Set string value of SETTING-OR-NAME. A `nil` or empty NEW-VALUE can be passed to unset (i.e., delete)
- SETTING-OR-NAME."
+ "Set string value of `setting-or-name`. A `nil` or empty `new-value` can be passed to unset (i.e., delete)
+ `setting-or-name`. String-type settings use this function directly; all other types ultimately call this (e.g.
+ `set-boolean!` eventually calls `set-string!`). Returns the `new-value`."
[setting-or-name, new-value :- (s/maybe s/Str)]
(let [new-value (when (seq new-value)
new-value)
@@ -230,11 +352,14 @@
(if new-value
(swap! cache assoc setting-name new-value)
(swap! cache dissoc setting-name))
+ ;; Record the fact that a Setting has been updated so eventaully other instances (if applicable) find out about it
+ (update-settings-last-updated!)
+ ;; Now return the `new-value`.
new-value))
(defn set-boolean!
- "Set the value of boolean SETTING-OR-NAME. NEW-VALUE can be nil, a boolean, or a string representation of one, such
- as `\"true\"` or `\"false\"` (these strings are case-insensitive)."
+ "Set the value of boolean `setting-or-name`. `new-value` can be nil, a boolean, or a string representation of one,
+ such as `\"true\"` or `\"false\"` (these strings are case-insensitive)."
[setting-or-name new-value]
(set-string! setting-or-name (if (string? new-value)
(set-boolean! setting-or-name (string->boolean new-value))
@@ -244,7 +369,7 @@
nil nil))))
(defn set-integer!
- "Set the value of integer SETTING-OR-NAME."
+ "Set the value of integer `setting-or-name`."
[setting-or-name new-value]
(set-string! setting-or-name (when new-value
(assert (or (integer? new-value)
@@ -253,7 +378,7 @@
(str new-value))))
(defn set-double!
- "Set the value of double SETTING-OR-NAME."
+ "Set the value of double `setting-or-name`."
[setting-or-name new-value]
(set-string! setting-or-name (when new-value
(assert (or (float? new-value)
@@ -262,7 +387,7 @@
(str new-value))))
(defn set-json!
- "Serialize NEW-VALUE for SETTING-OR-NAME as a JSON string and save it."
+ "Serialize `new-value` for `setting-or-name` as a JSON string and save it."
[setting-or-name new-value]
(set-string! setting-or-name (when new-value
(json/generate-string new-value))))
@@ -275,7 +400,7 @@
:double set-double!})
(defn set!
- "Set the value of SETTING-OR-NAME. What this means depends on the Setting's `:setter`; by default, this just updates
+ "Set the value of `setting-or-name`. What this means depends on the Setting's `:setter`; by default, this just updates
the Settings cache and writes its value to the DB.
(set :mandrill-api-key \"xyz123\")
@@ -292,7 +417,7 @@
;;; +----------------------------------------------------------------------------------------------------------------+
(defn register-setting!
- "Register a new `Setting` with a map of `SettingDefinition` attributes.
+ "Register a new Setting with a map of `SettingDefinition` attributes.
This is used internally be `defsetting`; you shouldn't need to use it yourself."
[{setting-name :name, setting-type :type, default :default, :as setting}]
(u/prog1 (let [setting-type (s/validate Type (or setting-type :string))]
@@ -321,21 +446,21 @@
;; Turn on auto-complete-mode in Emacs and see for yourself!
:doc (str/join "\n" [ description
""
- (format "`%s` is a %s `Setting`. You can get its value by calling:" (setting-name setting) (name setting-type))
+ (format "`%s` is a %s Setting. You can get its value by calling:" (setting-name setting) (name setting-type))
""
- (format " (%s)" (setting-name setting))
+ (format " (%s)" (setting-name setting))
""
"and set its value by calling:"
""
- (format " (%s <new-value>)" (setting-name setting))
+ (format " (%s <new-value>)" (setting-name setting))
""
- (format "You can also set its value with the env var `%s`." (env-var-name setting))
+ (format "You can also set its value with the env var `%s`." (env-var-name setting))
""
"Clear its value by calling:"
""
- (format " (%s nil)" (setting-name setting))
+ (format " (%s nil)" (setting-name setting))
""
- (format "Its default value is `%s`." (if (nil? default) "nil" default))])})
+ (format "Its default value is `%s`." (if (nil? default) "nil" default))])})
@@ -352,7 +477,7 @@
(metabase.models.setting/set! setting new-value))))
(defmacro defsetting
- "Defines a new `Setting` that will be added to the DB at some point in the future.
+ "Defines a new Setting that will be added to the DB at some point in the future.
Conveniently can be used as a getter/setter as well:
(defsetting mandrill-api-key \"API key for Mandrill.\")
@@ -368,7 +493,7 @@
* `:default` - The default value of the setting. (default: `nil`)
* `:type` - `:string` (default), `:boolean`, `:integer`, or `:json`. Non-`:string` settings have special
default getters and setters that automatically coerce values to the correct types.
- * `:internal?` - This `Setting` is for internal use and shouldn't be exposed in the UI (i.e., not returned by the
+ * `:internal?` - This Setting is for internal use and shouldn't be exposed in the UI (i.e., not returned by the
corresponding endpoints). Default: `false`
* `:getter` - A custom getter fn, which takes no arguments. Overrides the default implementation. (This can in
turn call functions in this namespace like `get-string` or `get-boolean` to invoke the default
@@ -392,7 +517,7 @@
;;; +----------------------------------------------------------------------------------------------------------------+
(defn set-many!
- "Set the value of several `Settings` at once.
+ "Set the value of several Settings at once.
(set-all {:mandrill-api-key \"xyz123\", :another-setting \"ABC\"})"
[settings]
diff --git a/src/metabase/models/user.clj b/src/metabase/models/user.clj
index c7b930e5d68d239956c1534e91b94e81f91328c7..858558ab24621cb0c2054f02718af6fe5428580f 100644
--- a/src/metabase/models/user.clj
+++ b/src/metabase/models/user.clj
@@ -191,7 +191,10 @@
"Convenience for creating a new user via LDAP. This account is considered active immediately; thus all active admins
will recieve an email right away."
[new-user :- NewUser]
- (insert-new-user! (assoc new-user :ldap_auth true)))
+ (insert-new-user! (-> new-user
+ ;; We should not store LDAP passwords
+ (dissoc :password)
+ (assoc :ldap_auth true))))
(defn set-password!
"Updates the stored password for a specified `User` by hashing the password with a random salt."
diff --git a/src/metabase/query_processor/util.clj b/src/metabase/query_processor/util.clj
index 5441fa30c01096ff1fed8fcd3795fafcc819d0a0..09ef6f926de02aa3999203eb542a0b19a3f3f57e 100644
--- a/src/metabase/query_processor/util.clj
+++ b/src/metabase/query_processor/util.clj
@@ -4,7 +4,9 @@
[codecs :as codecs]
[hash :as hash]]
[cheshire.core :as json]
- [clojure.string :as str]
+ [clojure
+ [string :as str]
+ [walk :as walk]]
[metabase.util :as u]
[metabase.util.schema :as su]
[schema.core :as s]))
@@ -138,3 +140,30 @@
(when (string? source-table)
(when-let [[_ card-id-str] (re-matches #"^card__(\d+$)" source-table)]
(Integer/parseInt card-id-str)))))
+
+;;; ---------------------------------------- General Tree Manipulation Helpers ---------------------------------------
+
+(defn postwalk-pred
+ "Transform `form` by applying `f` to each node where `pred` returns true"
+ [pred f form]
+ (walk/postwalk (fn [node]
+ (if (pred node)
+ (f node)
+ node))
+ form))
+
+(defn postwalk-collect
+ "Invoke `collect-fn` on each node satisfying `pred`. If `collect-fn` returns a value, accumulate that and return the
+ results.
+
+ Note: This would be much better as a zipper. It could have the same API, would be faster and would avoid side
+ affects."
+ [pred collect-fn form]
+ (let [results (atom [])]
+ (postwalk-pred pred
+ (fn [node]
+ (when-let [result (collect-fn node)]
+ (swap! results conj result))
+ node)
+ form)
+ @results))
diff --git a/src/metabase/sync/analyze/fingerprint/text.clj b/src/metabase/sync/analyze/fingerprint/text.clj
index 767c429b8b2a8ef3c3c766d3388c339906069fb7..1588025abf930fca4a12c77557f1fb36057b72fb 100644
--- a/src/metabase/sync/analyze/fingerprint/text.clj
+++ b/src/metabase/sync/analyze/fingerprint/text.clj
@@ -3,9 +3,10 @@
(:require [cheshire.core :as json]
[metabase.sync.interface :as i]
[metabase.util :as u]
+ [metabase.util.schema :as su]
[schema.core :as s]))
-(s/defn ^:private average-length :- (s/constrained Double #(>= % 0))
+(s/defn ^:private average-length :- su/PositiveNum
"Return the average length of VALUES."
[values :- i/FieldSample]
(let [total-length (reduce + (for [value values]
diff --git a/src/metabase/sync/interface.clj b/src/metabase/sync/interface.clj
index 07a6a4e2be87000cd46b1fcfb50bf9b59832c593..1ee51060d5575a12c4841fb83555121ccdefc582 100644
--- a/src/metabase/sync/interface.clj
+++ b/src/metabase/sync/interface.clj
@@ -104,7 +104,7 @@
{(s/optional-key :percent-json) Percent
(s/optional-key :percent-url) Percent
(s/optional-key :percent-email) Percent
- (s/optional-key :average-length) (s/constrained Double #(>= % 0) "Valid number greater than or equal to zero")})
+ (s/optional-key :average-length) su/PositiveNum})
(def DateTimeFingerprint
"Schema for fingerprint information for Fields deriving from `:type/DateTime`."
diff --git a/src/metabase/util.clj b/src/metabase/util.clj
index 9d39e7ad08da90faf39d42a830250f236a66f4fd..34e204693edada38097b50be687eaee91bf1e061 100644
--- a/src/metabase/util.clj
+++ b/src/metabase/util.clj
@@ -4,9 +4,7 @@
[data :as data]
[pprint :refer [pprint]]
[string :as s]]
- [clojure.java
- [classpath :as classpath]
- [jdbc :as jdbc]]
+ [clojure.java.classpath :as classpath]
[clojure.math.numeric-tower :as math]
[clojure.tools.logging :as log]
[clojure.tools.namespace.find :as ns-find]
@@ -15,7 +13,6 @@
[puppetlabs.i18n.core :as i18n :refer [trs]]
[ring.util.codec :as codec])
(:import [java.net InetAddress InetSocketAddress Socket]
- java.sql.SQLException
[java.text Normalizer Normalizer$Form]))
;; This is the very first log message that will get printed. It's here because this is one of the very first
@@ -290,45 +287,6 @@
:when (re-find #"metabase" s)]
(s/replace s #"^metabase\." ""))))})
-(defn wrap-try-catch
- "Returns a new function that wraps F in a `try-catch`. When an exception is caught, it is logged
- with `log/error` and returns `nil`."
- ([f]
- (wrap-try-catch f nil))
- ([f f-name]
- (let [exception-message (if f-name
- (format "Caught exception in %s: " f-name)
- "Caught exception: ")]
- (fn [& args]
- (try
- (apply f args)
- (catch SQLException e
- (log/error (format-color 'red "%s\n%s\n%s"
- exception-message
- (with-out-str (jdbc/print-sql-exception-chain e))
- (pprint-to-str (filtered-stacktrace e)))))
- (catch Throwable e
- (log/error (format-color 'red "%s %s\n%s"
- exception-message
- (or (.getMessage e) e)
- (pprint-to-str (filtered-stacktrace e))))))))))
-
-(defn try-apply
- "Like `apply`, but wraps F inside a `try-catch` block and logs exceptions caught.
- (This is actaully more flexible than `apply` -- the last argument doesn't have to be
- a sequence:
-
- (try-apply vector :a :b [:c :d]) -> [:a :b :c :d]
- (apply vector :a :b [:c :d]) -> [:a :b :c :d]
- (try-apply vector :a :b :c :d) -> [:a :b :c :d]
- (apply vector :a :b :c :d) -> Not ok - :d is not a sequence
-
- This allows us to use `try-apply` in more situations than we'd otherwise be able to."
- [^clojure.lang.IFn f & args]
- (apply (wrap-try-catch f) (concat (butlast args) (if (sequential? (last args))
- (last args)
- [(last args)]))))
-
(defn deref-with-timeout
"Call `deref` on a FUTURE and throw an exception if it takes more than TIMEOUT-MS."
[futur timeout-ms]
@@ -515,7 +473,7 @@
(select-nested-keys v nested-keys))})))
(defn base64-string?
- "Is S a Base-64 encoded string?"
+ "Is `s` a Base-64 encoded string?"
^Boolean [s]
(boolean (when (string? s)
(re-find #"^[0-9A-Za-z/+]+=*$" s))))
diff --git a/src/metabase/util/date.clj b/src/metabase/util/date.clj
index 3c353f88535bce57b680dfdcd5d1e63384a70d22..00e964a0d585b587f5f0630990adfc980b5135bc 100644
--- a/src/metabase/util/date.clj
+++ b/src/metabase/util/date.clj
@@ -1,4 +1,5 @@
(ns metabase.util.date
+ "Utility functions for working with datetimes of different types, and other related tasks."
(:require [clj-time
[coerce :as coerce]
[core :as t]
diff --git a/src/metabase/util/encryption.clj b/src/metabase/util/encryption.clj
index fd920c98e479c8e84c9a472acf04d4d3cc8d0d9b..7f541c43dc42fa9ab07c5fe94841c0a3818232c9 100644
--- a/src/metabase/util/encryption.clj
+++ b/src/metabase/util/encryption.clj
@@ -1,5 +1,6 @@
(ns metabase.util.encryption
- "Utility functions for encrypting and decrypting strings using AES256 CBC + HMAC SHA512 and the `MB_ENCRYPTION_SECRET_KEY` env var."
+ "Utility functions for encrypting and decrypting strings using AES256 CBC + HMAC SHA512 and the
+ `MB_ENCRYPTION_SECRET_KEY` env var."
(:require [buddy.core
[codecs :as codecs]
[crypto :as crypto]
@@ -8,54 +9,62 @@
[clojure.tools.logging :as log]
[environ.core :as env]
[metabase.util :as u]
+ [puppetlabs.i18n.core :refer [trs]]
[ring.util.codec :as codec]))
(defn secret-key->hash
- "Generate a 64-byte byte array hash of SECRET-KEY using 100,000 iterations of PBKDF2+SHA512."
+ "Generate a 64-byte byte array hash of `secret-key` using 100,000 iterations of PBKDF2+SHA512."
^bytes [^String secret-key]
(kdf/get-bytes (kdf/engine {:alg :pbkdf2+sha512
:key secret-key
:iterations 100000}) ; 100,000 iterations takes about ~160ms on my laptop
64))
-;; apperently if you're not tagging in an arglist, `^bytes` will set the `:tag` metadata to `clojure.core/bytes` (ick) so you have to do `^{:tag 'bytes}` instead
+;; apperently if you're not tagging in an arglist, `^bytes` will set the `:tag` metadata to `clojure.core/bytes` (ick)
+;; so you have to do `^{:tag 'bytes}` instead
(defonce ^:private ^{:tag 'bytes} default-secret-key
(when-let [secret-key (env/env :mb-encryption-secret-key)]
(when (seq secret-key)
(assert (>= (count secret-key) 16)
- "MB_ENCRYPTION_SECRET_KEY must be at least 16 characters.")
+ (trs "MB_ENCRYPTION_SECRET_KEY must be at least 16 characters."))
(secret-key->hash secret-key))))
;; log a nice message letting people know whether DB details encryption is enabled
(log/info
- (format "DB details encryption is %s for this Metabase instance. %s"
- (if default-secret-key "ENABLED" "DISABLED")
- (u/emoji (if default-secret-key "ðŸ”" "🔓")))
- "\nSee"
- "http://www.metabase.com/docs/latest/operations-guide/start.html#encrypting-your-database-connection-details-at-rest"
- "for more information.")
+ (if default-secret-key
+ (trs "Saved credentials encryption is ENABLED for this Metabase instance.")
+ (trs "Saved credentials encryption is DISABLED for this Metabase instance."))
+ (u/emoji (if default-secret-key "ðŸ”" "🔓"))
+ (trs "\nFor more information, see")
+ "https://www.metabase.com/docs/latest/operations-guide/start.html#encrypting-your-database-connection-details-at-rest")
(defn encrypt
- "Encrypt string S as hex bytes using a SECRET-KEY (a 64-byte byte array), by default the hashed value of `MB_ENCRYPTION_SECRET_KEY`."
+ "Encrypt string `s` as hex bytes using a `secret-key` (a 64-byte byte array), by default the hashed value of
+ `MB_ENCRYPTION_SECRET_KEY`."
(^String [^String s]
(encrypt default-secret-key s))
(^String [^String secret-key, ^String s]
(let [initialization-vector (nonce/random-bytes 16)]
- (codec/base64-encode (byte-array (concat initialization-vector
- (crypto/encrypt (codecs/to-bytes s) secret-key initialization-vector {:algorithm :aes256-cbc-hmac-sha512})))))))
+ (codec/base64-encode
+ (byte-array
+ (concat initialization-vector
+ (crypto/encrypt (codecs/to-bytes s) secret-key initialization-vector
+ {:algorithm :aes256-cbc-hmac-sha512})))))))
(defn decrypt
- "Decrypt string S using a SECRET-KEY (a 64-byte byte array), by default the hashed value of `MB_ENCRYPTION_SECRET_KEY`."
+ "Decrypt string `s` using a `secret-key` (a 64-byte byte array), by default the hashed value of
+ `MB_ENCRYPTION_SECRET_KEY`."
(^String [^String s]
(decrypt default-secret-key s))
(^String [secret-key, ^String s]
(let [bytes (codec/base64-decode s)
[initialization-vector message] (split-at 16 bytes)]
- (codecs/bytes->str (crypto/decrypt (byte-array message) secret-key (byte-array initialization-vector) {:algorithm :aes256-cbc-hmac-sha512})))))
+ (codecs/bytes->str (crypto/decrypt (byte-array message) secret-key (byte-array initialization-vector)
+ {:algorithm :aes256-cbc-hmac-sha512})))))
(defn maybe-encrypt
- "If `MB_ENCRYPTION_SECRET_KEY` is set, return an encrypted version of S; otherwise return S as-is."
+ "If `MB_ENCRYPTION_SECRET_KEY` is set, return an encrypted version of `s`; otherwise return `s` as-is."
(^String [^String s]
(maybe-encrypt default-secret-key s))
(^String [secret-key, ^String s]
@@ -65,7 +74,7 @@
s)))
(defn maybe-decrypt
- "If `MB_ENCRYPTION_SECRET_KEY` is set and S is encrypted, decrypt S; otherwise return S as-is."
+ "If `MB_ENCRYPTION_SECRET_KEY` is set and `s` is encrypted, decrypt `s`; otherwise return `s` as-is."
(^String [^String s]
(maybe-decrypt default-secret-key s))
(^String [secret-key, ^String s]
@@ -75,7 +84,10 @@
(catch Throwable e
(if (u/base64-string? s)
;; if we can't decrypt `s`, but it *is* encrypted, log an error message and return `nil`
- (log/error "Cannot decrypt encrypted details. Have you changed or forgot to set MB_ENCRYPTION_SECRET_KEY?" (.getMessage e))
+ (log/error
+ (trs "Cannot decrypt encrypted credentials. Have you changed or forgot to set MB_ENCRYPTION_SECRET_KEY?")
+ (.getMessage e)
+ (u/pprint-to-str (u/filtered-stacktrace e)))
;; otherwise return S without decrypting. It's probably not decrypted in the first place
s)))
s)))
diff --git a/src/metabase/util/honeysql_extensions.clj b/src/metabase/util/honeysql_extensions.clj
index 64a65d6293fc06cc51ee583efd6413afcf3e6ad1..69b61d54b39fe40d757e3d58f94b931d66aba857 100644
--- a/src/metabase/util/honeysql_extensions.clj
+++ b/src/metabase/util/honeysql_extensions.clj
@@ -103,7 +103,7 @@
(defn literal
"Wrap keyword or string S in single quotes and a HoneySQL `raw` form."
[s]
- (Literal. s))
+ (Literal. (name s)))
(def ^{:arglists '([& exprs])} + "Math operator. Interpose `+` between EXPRS and wrap in parentheses." (partial hsql/call :+))
diff --git a/src/metabase/util/schema.clj b/src/metabase/util/schema.clj
index 75346c8b325c49751db8ca0be49e2a830dd22bab..4dc852266465dfac0f80abefb2f977c0e140c1a5 100644
--- a/src/metabase/util/schema.clj
+++ b/src/metabase/util/schema.clj
@@ -50,6 +50,13 @@
(instance? java.util.regex.Pattern existing-schema) (tru "value must be a string that matches the regex `{0}`."
existing-schema)))
+(declare api-error-message)
+
+(defn- create-cond-schema-message [child-schemas]
+ (str (tru "value must satisfy one of the following requirements: ")
+ (str/join " " (for [[i child-schema] (m/indexed child-schemas)]
+ (format "%d) %s" (inc i) (api-error-message child-schema))))))
+
(defn api-error-message
"Extract the API error messages attached to a schema, if any.
This functionality is fairly sophisticated:
@@ -74,13 +81,16 @@
;; 1) value must be a boolean.
;; 2) value must be a valid boolean string ('true' or 'false').
(when (instance? schema.core.CondPre schema)
- (str (tru "value must satisfy one of the following requirements: ")
- (str/join " " (for [[i child-schema] (m/indexed (:schemas schema))]
- (format "%d) %s" (inc i) (api-error-message child-schema))))))
+ (create-cond-schema-message (:schemas schema)))
+
+ ;; For conditional schemas we'll generate a string similar to `cond-pre` above
+ (when (instance? schema.core.ConditionalSchema schema)
+ (create-cond-schema-message (map second (:preds-and-schemas schema))))
+
;; do the same for sequences of a schema
(when (vector? schema)
(str (tru "value must be an array.") (when (= (count schema) 1)
- (when-let [message (:api-error-message (first schema))]
+ (when-let [message (api-error-message (first schema))]
(str " " (tru "Each {0}" message))))))))
@@ -108,6 +118,12 @@
(s/constrained s/Int (partial < 0) (tru "Integer greater than zero"))
(tru "value must be an integer greater than zero.")))
+(def PositiveNum
+ "Schema representing a numeric value greater than zero. This allows floating point numbers and integers."
+ (with-api-error-message
+ (s/constrained s/Num (partial < 0) (tru "Number greater than zero"))
+ (tru "value must be a number greater than zero.")))
+
(def KeywordOrString
"Schema for something that can be either a `Keyword` or a `String`."
(s/named (s/cond-pre s/Keyword s/Str) (tru "Keyword or string")))
diff --git a/test/metabase/api/card_test.clj b/test/metabase/api/card_test.clj
index 72846ef89d3ea79db1fc331949252f84caea1e1f..3c8d18d77ddfc8cfdbecf6ab41be8dbb3aa2af63 100644
--- a/test/metabase/api/card_test.clj
+++ b/test/metabase/api/card_test.clj
@@ -14,6 +14,7 @@
[card-favorite :refer [CardFavorite]]
[collection :refer [Collection]]
[database :refer [Database]]
+ [dashboard :refer [Dashboard]]
[permissions :as perms]
[permissions-group :as perms-group]
[pulse :as pulse :refer [Pulse]]
@@ -570,6 +571,260 @@
{:collection_position nil})
(db/select-one-field :collection_position Card :id (u/get-id card))))
+;;; +----------------------------------------------------------------------------------------------------------------+
+;;; | UPDATING THE POSITION OF A CARDS |
+;;; +----------------------------------------------------------------------------------------------------------------+
+
+(defn- name->position [results]
+ (zipmap (map :name results)
+ (map :collection_position results)))
+
+(defn get-name->collection-position
+ "Call the collection endpoint for `collection-id` as `user-kwd`. Will return a map with the names of the items as
+ keys and their position as the value"
+ [user-kwd collection-or-collection-id]
+ (name->position ((user->client user-kwd) :get 200 (format "collection/%s/items" (u/get-id collection-or-collection-id)))))
+
+(defmacro with-ordered-items
+ "Macro for creating many sequetial collection_position model instances, putting each in `collection`"
+ [collection model-and-name-syms & body]
+ `(tt/with-temp* ~(vec (mapcat (fn [idx [model-instance name-sym]]
+ [model-instance [name-sym {:name (name name-sym)
+ :collection_id `(u/get-id ~collection)
+ :collection_position idx}]])
+ (iterate inc 1)
+ (partition-all 2 model-and-name-syms)))
+ ~@body))
+
+;; Check to make sure we can move a card in a collection of just cards
+(expect
+ {"c" 1
+ "a" 2
+ "b" 3
+ "d" 4}
+ (tt/with-temp Collection [collection]
+ (with-ordered-items collection [Card a
+ Card b
+ Card c
+ Card d]
+ (perms/grant-collection-readwrite-permissions! (perms-group/all-users) collection)
+ ((user->client :rasta) :put 200 (str "card/" (u/get-id c))
+ {:collection_position 1})
+ (get-name->collection-position :rasta collection))))
+
+;; Change the position of the 4th card to 1st, all other cards should inc their position
+(expect
+ {"d" 1
+ "a" 2
+ "b" 3
+ "c" 4}
+ (tt/with-temp Collection [collection]
+ (with-ordered-items collection [Dashboard a
+ Dashboard b
+ Pulse c
+ Card d]
+ (perms/grant-collection-readwrite-permissions! (perms-group/all-users) collection)
+ ((user->client :rasta) :put 200 (str "card/" (u/get-id d))
+ {:collection_position 1})
+ (get-name->collection-position :rasta collection))))
+
+;; Change the position of the 1st card to the 4th, all of the other items dec
+(expect
+ {"b" 1
+ "c" 2
+ "d" 3
+ "a" 4}
+ (tt/with-temp Collection [collection]
+ (with-ordered-items collection [Card a
+ Dashboard b
+ Pulse c
+ Dashboard d]
+ (perms/grant-collection-readwrite-permissions! (perms-group/all-users) collection)
+ ((user->client :rasta) :put 200 (str "card/" (u/get-id a))
+ {:collection_position 4})
+ (get-name->collection-position :rasta collection))))
+
+;; Change the position of a card from nil to 2nd, should adjust the existing items
+(expect
+ {"a" 1
+ "b" 2
+ "c" 3
+ "d" 4}
+ (tt/with-temp* [Collection [{coll-id :id :as collection}]
+ Card [_ {:name "a", :collection_id coll-id, :collection_position 1}]
+ ;; Card b does not start with a collection_position
+ Card [b {:name "b", :collection_id coll-id}]
+ Dashboard [_ {:name "c", :collection_id coll-id, :collection_position 2}]
+ Card [_ {:name "d", :collection_id coll-id, :collection_position 3}]]
+ (perms/grant-collection-readwrite-permissions! (perms-group/all-users) collection)
+ ((user->client :rasta) :put 200 (str "card/" (u/get-id b))
+ {:collection_position 2})
+ (get-name->collection-position :rasta coll-id)))
+
+;; Update an existing card to no longer have a position, should dec items after it's position
+(expect
+ {"a" 1
+ "b" nil
+ "c" 2
+ "d" 3}
+ (tt/with-temp Collection [collection]
+ (with-ordered-items collection [Card a
+ Card b
+ Dashboard c
+ Pulse d]
+ (perms/grant-collection-readwrite-permissions! (perms-group/all-users) collection)
+ ((user->client :rasta) :put 200 (str "card/" (u/get-id b))
+ {:collection_position nil})
+ (get-name->collection-position :rasta collection))))
+
+;; Change the collection the card is in, leave the position, should cause old and new collection to have their
+;; positions updated
+(expect
+ [{"a" 1
+ "f" 2
+ "b" 3
+ "c" 4
+ "d" 5}
+ {"e" 1
+ "g" 2
+ "h" 3}]
+ (tt/with-temp* [Collection [collection-1]
+ Collection [collection-2]]
+ (with-ordered-items collection-1 [Dashboard a
+ Card b
+ Pulse c
+ Dashboard d]
+ (with-ordered-items collection-2 [Pulse e
+ Card f
+ Card g
+ Dashboard h]
+ (perms/grant-collection-readwrite-permissions! (perms-group/all-users) collection-1)
+ (perms/grant-collection-readwrite-permissions! (perms-group/all-users) collection-2)
+ ((user->client :rasta) :put 200 (str "card/" (u/get-id f))
+ {:collection_id (u/get-id collection-1)})
+ [(get-name->collection-position :rasta collection-1)
+ (get-name->collection-position :rasta collection-2)]))))
+
+;; Change the collection and the position, causing both collections and the updated card to have their order changed
+(expect
+ [{"h" 1
+ "a" 2
+ "b" 3
+ "c" 4
+ "d" 5}
+ {"e" 1
+ "f" 2
+ "g" 3}]
+ (tt/with-temp* [Collection [collection-1]
+ Collection [collection-2]]
+ (with-ordered-items collection-1 [Pulse a
+ Pulse b
+ Dashboard c
+ Dashboard d]
+ (with-ordered-items collection-2 [Dashboard e
+ Dashboard f
+ Pulse g
+ Card h]
+ (perms/grant-collection-readwrite-permissions! (perms-group/all-users) collection-1)
+ (perms/grant-collection-readwrite-permissions! (perms-group/all-users) collection-2)
+ ((user->client :rasta) :put 200 (str "card/" (u/get-id h))
+ {:collection_position 1, :collection_id (u/get-id collection-1)})
+ [(get-name->collection-position :rasta collection-1)
+ (get-name->collection-position :rasta collection-2)]))))
+
+;; Add a new card to an existing collection at position 1, will cause all existing positions to increment by 1
+(expect
+ ;; Original collection, before adding the new card
+ [{"b" 1
+ "c" 2
+ "d" 3}
+ ;; Add new card at index 1
+ {"a" 1
+ "b" 2
+ "c" 3
+ "d" 4}]
+ (tt/with-temp Collection [collection]
+ (tu/with-model-cleanup [Card]
+ (with-ordered-items collection [Dashboard b
+ Pulse c
+ Card d]
+ (perms/grant-collection-readwrite-permissions! (perms-group/all-users) collection)
+ [(get-name->collection-position :rasta collection)
+ (do
+ ((user->client :rasta) :post 200 "card"
+ (merge (card-with-name-and-query "a")
+ {:collection_id (u/get-id collection)
+ :collection_position 1}))
+ (get-name->collection-position :rasta collection))]))))
+
+;; Add a new card to the end of an existing collection
+(expect
+ ;; Original collection, before adding the new card
+ [{"a" 1
+ "b" 2
+ "c" 3}
+ ;; Add new card at index 4
+ {"a" 1
+ "b" 2
+ "c" 3
+ "d" 4}]
+ (tt/with-temp Collection [collection]
+ (tu/with-model-cleanup [Card]
+ (with-ordered-items collection [Card a
+ Dashboard b
+ Pulse c]
+ (perms/grant-collection-readwrite-permissions! (perms-group/all-users) collection)
+ [(get-name->collection-position :rasta collection)
+ (do
+ ((user->client :rasta) :post 200 "card"
+ (merge (card-with-name-and-query "d")
+ {:collection_id (u/get-id collection)
+ :collection_position 4}))
+ (get-name->collection-position :rasta collection))]))))
+
+;; When adding a new card to a collection that does not have a position, it should not change existing positions
+(expect
+ ;; Original collection, before adding the new card
+ [{"a" 1
+ "b" 2
+ "c" 3}
+ ;; Add new card without a position
+ {"a" 1
+ "b" 2
+ "c" 3
+ "d" nil}]
+ (tt/with-temp Collection [collection]
+ (tu/with-model-cleanup [Card]
+ (with-ordered-items collection [Pulse a
+ Card b
+ Dashboard c]
+ (perms/grant-collection-readwrite-permissions! (perms-group/all-users) collection)
+ [(get-name->collection-position :rasta collection)
+ (do
+ ((user->client :rasta) :post 200 "card"
+ (merge (card-with-name-and-query "d")
+ {:collection_id (u/get-id collection)
+ :collection_position nil}))
+ (get-name->collection-position :rasta collection))]))))
+
+(expect
+ {"d" 1
+ "a" 2
+ "b" 3
+ "c" 4
+ "e" 5
+ "f" 6}
+ (tt/with-temp Collection [collection]
+ (with-ordered-items collection [Dashboard a
+ Dashboard b
+ Card c
+ Card d
+ Pulse e
+ Pulse f]
+ (perms/grant-collection-readwrite-permissions! (perms-group/all-users) collection)
+ ((user->client :rasta) :put 200 (str "card/" (u/get-id d))
+ {:collection_position 1, :collection_id (u/get-id collection)})
+ (name->position ((user->client :rasta) :get 200 (format "collection/%s/items" (u/get-id collection)))))))
;;; +----------------------------------------------------------------------------------------------------------------+
;;; | Card updates that impact alerts |
@@ -1035,6 +1290,46 @@
(perms/grant-collection-readwrite-permissions! (perms-group/all-users) collection)
(POST-card-collections! :rasta 403 collection [card-1 card-2])))
+;; Test that we can bulk move some Cards from one collection to another, while updating the collection position of the
+;; old collection and the new collection
+(expect
+ [{:response {:status "ok"}
+ :collections ["New Collection" "New Collection"]}
+ {"a" 4 ;-> Moved to the new collection, gets the first slot available
+ "b" 5
+ "c" 1 ;-> With a and b no longer in the collection, c is first
+ "d" 1 ;-> Existing cards in new collection are untouched and position unchanged
+ "e" 2
+ "f" 3}]
+ (tt/with-temp* [Collection [{coll-id-1 :id} {:name "Old Collection"}]
+ Collection [{coll-id-2 :id
+ :as new-collection} {:name "New Collection"}]
+ Card [card-a {:name "a", :collection_id coll-id-1, :collection_position 1}]
+ Card [card-b {:name "b", :collection_id coll-id-1, :collection_position 2}]
+ Card [card-c {:name "c", :collection_id coll-id-1, :collection_position 3}]
+ Card [card-d {:name "d", :collection_id coll-id-2, :collection_position 1}]
+ Card [card-e {:name "e", :collection_id coll-id-2, :collection_position 2}]
+ Card [card-f {:name "f", :collection_id coll-id-2, :collection_position 3}]]
+ [(POST-card-collections! :crowberto 200 new-collection [card-a card-b])
+ (merge (name->position ((user->client :crowberto) :get 200 (format "collection/%s/items" coll-id-1) :model "card" :archived "false"))
+ (name->position ((user->client :crowberto) :get 200 (format "collection/%s/items" coll-id-2) :model "card" :archived "false")))]))
+
+;; Moving a card without a collection_position keeps the collection_position nil
+(expect
+ [{:response {:status "ok"}
+ :collections ["New Collection" "New Collection"]}
+ {"a" nil
+ "b" 1
+ "c" 2}]
+ (tt/with-temp* [Collection [{coll-id-1 :id} {:name "Old Collection"}]
+ Collection [{coll-id-2 :id
+ :as new-collection} {:name "New Collection"}]
+ Card [card-a {:name "a", :collection_id coll-id-1}]
+ Card [card-b {:name "b", :collection_id coll-id-2, :collection_position 1}]
+ Card [card-c {:name "c", :collection_id coll-id-2, :collection_position 2}]]
+ [(POST-card-collections! :crowberto 200 new-collection [card-a card-b])
+ (merge (name->position ((user->client :crowberto) :get 200 (format "collection/%s/items" coll-id-1) :model "card" :archived "false"))
+ (name->position ((user->client :crowberto) :get 200 (format "collection/%s/items" coll-id-2) :model "card" :archived "false")))]))
;;; +----------------------------------------------------------------------------------------------------------------+
;;; | PUBLIC SHARING ENDPOINTS |
diff --git a/test/metabase/api/collection_test.clj b/test/metabase/api/collection_test.clj
index 51c6e438a82bcbbc9ac5a83c7da9b4c5e216c4c1..1f08d7551fe66e63cd78b9f4b3c11531b711bef1 100644
--- a/test/metabase/api/collection_test.clj
+++ b/test/metabase/api/collection_test.clj
@@ -104,33 +104,18 @@
;;; ----------------------------------------- Cards, Dashboards, and Pulses ------------------------------------------
-;; check that cards are returned with the collections detail endpoint
+;; check that cards are returned with the collection/items endpoint
(tt/expect-with-temp [Collection [collection]
Card [card {:collection_id (u/get-id collection)}]]
(tu/obj->json->obj
- (assoc collection
- :items [{:id (u/get-id card)
- :name (:name card)
- :description nil
- :collection_position nil
- :favorite false
- :model "card"}]
- :effective_ancestors []
- :effective_location "/"
- :can_write true))
+ [{:id (u/get-id card)
+ :name (:name card)
+ :description nil
+ :collection_position nil
+ :favorite false
+ :model "card"}])
(tu/obj->json->obj
- (-> ((user->client :crowberto) :get 200 (str "collection/" (u/get-id collection)))
- (assoc :items ((user->client :crowberto) :get 200 (str "collection/" (u/get-id collection) "/items"))))))
-
-
-(defn- remove-ids-from-collection-detail [results & {:keys [keep-collection-id?]
- :or {keep-collection-id? false}}]
- (into {} (for [[k items] (select-keys results (cond->> [:name :items :can_write]
- keep-collection-id? (cons :id)))]
- [k (if-not (sequential? items)
- items
- (for [item items]
- (dissoc item :id)))])))
+ ((user->client :crowberto) :get 200 (str "collection/" (u/get-id collection) "/items"))))
(defn- do-with-some-children-of-collection [collection-or-id-or-nil f]
(collection-test/force-create-personal-collections!)
@@ -144,44 +129,43 @@
(defmacro ^:private with-some-children-of-collection {:style/indent 1} [collection-or-id-or-nil & body]
`(do-with-some-children-of-collection ~collection-or-id-or-nil (fn [] ~@body)))
+(defn- default-item [item-map]
+ (merge {:id true, :collection_position nil} item-map))
+
+(defn- collection-item [collection-name & {:as extra-keypairs}]
+ (merge {:id true, :description nil,
+ :model "collection", :name collection-name}
+ extra-keypairs))
+
;; check that you get to see the children as appropriate
(expect
- {:name "Debt Collection"
- :items [{:name "Birthday Card", :description nil, :collection_position nil, :favorite false, :model "card"}
- {:name "Dine & Dashboard", :description nil, :collection_position nil, :model "dashboard"}
- {:name "Electro-Magnetic Pulse", :collection_position nil, :model "pulse"}]
- :can_write false}
+ (map default-item [{:name "Birthday Card", :description nil, :favorite false, :model "card"}
+ {:name "Dine & Dashboard", :description nil, :model "dashboard"}
+ {:name "Electro-Magnetic Pulse", :model "pulse"}])
(tt/with-temp Collection [collection {:name "Debt Collection"}]
(perms/grant-collection-read-permissions! (group/all-users) collection)
(with-some-children-of-collection collection
- (-> ((user->client :rasta) :get 200 (str "collection/" (u/get-id collection)))
- (assoc :items ((user->client :rasta) :get 200 (str "collection/" (u/get-id collection) "/items")))
- remove-ids-from-collection-detail))))
+ (tu/boolean-ids-and-timestamps
+ ((user->client :rasta) :get 200 (str "collection/" (u/get-id collection) "/items"))))))
;; ...and that you can also filter so that you only see the children you want to see
(expect
- {:name "Art Collection"
- :items [{:name "Dine & Dashboard", :description nil, :collection_position nil, :model "dashboard"}]
- :can_write false}
+ [(default-item {:name "Dine & Dashboard", :description nil, :model "dashboard"})]
(tt/with-temp Collection [collection {:name "Art Collection"}]
(perms/grant-collection-read-permissions! (group/all-users) collection)
(with-some-children-of-collection collection
- (-> ((user->client :rasta) :get 200 (str "collection/" (u/get-id collection)))
- (assoc :items ((user->client :rasta) :get 200 (str "collection/" (u/get-id collection) "/items?model=dashboard")))
- remove-ids-from-collection-detail))))
+ (tu/boolean-ids-and-timestamps
+ ((user->client :rasta) :get 200 (str "collection/" (u/get-id collection) "/items?model=dashboard"))))))
;; Let's make sure the `archived` option works.
(expect
- {:name "Art Collection"
- :items [{:name "Dine & Dashboard", :description nil, :collection_position nil, :model "dashboard"}]
- :can_write false}
+ [(default-item {:name "Dine & Dashboard", :description nil, :model "dashboard"})]
(tt/with-temp Collection [collection {:name "Art Collection"}]
(perms/grant-collection-read-permissions! (group/all-users) collection)
(with-some-children-of-collection collection
(db/update-where! Dashboard {:collection_id (u/get-id collection)} :archived true)
- (-> ((user->client :rasta) :get 200 (str "collection/" (u/get-id collection)))
- (assoc :items ((user->client :rasta) :get 200 (str "collection/" (u/get-id collection) "/items?archived=true")))
- remove-ids-from-collection-detail))))
+ (tu/boolean-ids-and-timestamps
+ ((user->client :rasta) :get 200 (str "collection/" (u/get-id collection) "/items?archived=true"))))))
;;; --------------------------------- Fetching Personal Collections (Ours & Others') ---------------------------------
@@ -223,27 +207,23 @@
"You don't have permissions to do that."
(api-get-lucky-personal-collection :rasta, :expected-status-code 403))
-
-(defn- lucky-personal-collection-with-subcollection []
- (assoc (lucky-personal-collection)
- :items [{:name "Lucky's Personal Sub-Collection", :description nil, :model "collection"}]))
+(def ^:private lucky-personal-subcollection-item
+ [(collection-item "Lucky's Personal Sub-Collection")])
(defn- api-get-lucky-personal-collection-with-subcollection [user-kw]
(tt/with-temp Collection [_ {:name "Lucky's Personal Sub-Collection"
:location (collection/children-location
(collection/user->personal-collection (user->id :lucky)))}]
- (-> (api-get-lucky-personal-collection user-kw)
- (assoc :items (api-get-lucky-personal-collection-items user-kw))
- (update :items (partial map #(dissoc % :id))))))
+ (tu/boolean-ids-and-timestamps (api-get-lucky-personal-collection-items user-kw))))
;; If we have a sub-Collection of our Personal Collection, that should show up
(expect
- (lucky-personal-collection-with-subcollection)
+ lucky-personal-subcollection-item
(api-get-lucky-personal-collection-with-subcollection :lucky))
;; sub-Collections of other's Personal Collections should show up for admins as well
(expect
- (lucky-personal-collection-with-subcollection)
+ lucky-personal-subcollection-item
(api-get-lucky-personal-collection-with-subcollection :crowberto))
@@ -265,8 +245,7 @@
"Nicely format the `:effective_` results from an API call."
[results]
(-> results
- (select-keys [:items :effective_ancestors :effective_location])
- (update :items (partial map #(update % :id integer?)))
+ (select-keys [:effective_ancestors :effective_location])
(update :effective_ancestors (partial map #(update % :id integer?)))
(update :effective_location collection-test/location-path-ids->names)))
@@ -274,79 +253,73 @@
"Call the API with Rasta to fetch `collection-or-id` and put the `:effective_` results in a nice format for the tests
below."
[collection-or-id & additional-get-params]
- (-> ((user->client :rasta) :get 200 (str "collection/" (u/get-id collection-or-id)))
- (assoc :items (apply (user->client :rasta) :get 200 (str "collection/" (u/get-id collection-or-id) "/items")
- additional-get-params))
- format-ancestors-and-children))
+ [(format-ancestors-and-children ((user->client :rasta) :get 200 (str "collection/" (u/get-id collection-or-id))))
+ (tu/boolean-ids-and-timestamps (apply (user->client :rasta) :get 200 (str "collection/" (u/get-id collection-or-id) "/items")
+ additional-get-params))])
;; does a top-level Collection like A have the correct Children?
(expect
- {:items [{:name "B", :id true, :description nil, :model "collection"}
- {:name "C", :id true, :description nil, :model "collection"}]
- :effective_ancestors []
- :effective_location "/"}
+ [{:effective_ancestors []
+ :effective_location "/"}
+ (map collection-item ["B" "C"])]
(with-collection-hierarchy [a b c d g]
(api-get-collection-ancestors-and-children a)))
;; ok, does a second-level Collection have its parent and its children?
(expect
- {:items [{:name "D", :id true, :description nil, :model "collection"}
- {:name "G", :id true, :description nil, :model "collection"}]
- :effective_ancestors [{:name "A", :id true}]
- :effective_location "/A/"}
+ [{:effective_ancestors [{:name "A", :id true}]
+ :effective_location "/A/"}
+ (map collection-item ["D" "G"])]
(with-collection-hierarchy [a b c d g]
(api-get-collection-ancestors-and-children c)))
;; what about a third-level Collection?
(expect
- {:items []
- :effective_ancestors [{:name "A", :id true}
- {:name "C", :id true}]
- :effective_location "/A/C/"}
+ [{:effective_ancestors [{:name "A", :id true}
+ {:name "C", :id true}]
+ :effective_location "/A/C/"}
+ []]
(with-collection-hierarchy [a b c d g]
(api-get-collection-ancestors-and-children d)))
;; for D: if we remove perms for C we should only have A as an ancestor; effective_location should lie and say we are
;; a child of A
(expect
- {:items []
- :effective_ancestors [{:name "A", :id true}]
- :effective_location "/A/"}
+ [{:effective_ancestors [{:name "A", :id true}]
+ :effective_location "/A/"}
+ []]
(with-collection-hierarchy [a b d g]
(api-get-collection-ancestors-and-children d)))
;; for D: If, on the other hand, we remove A, we should see C as the only ancestor and as a root-level Collection.
(expect
- {:items [],
- :effective_ancestors [{:name "C", :id true}]
- :effective_location "/C/"}
+ [{:effective_ancestors [{:name "C", :id true}]
+ :effective_location "/C/"}
+ []]
(with-collection-hierarchy [b c d g]
(api-get-collection-ancestors-and-children d)))
;; for C: if we remove D we should get E and F as effective children
(expect
- {:items [{:name "E", :id true, :description nil, :model "collection"}
- {:name "F", :id true, :description nil, :model "collection"}]
- :effective_ancestors [{:name "A", :id true}]
- :effective_location "/A/"}
+ [{:effective_ancestors [{:name "A", :id true}]
+ :effective_location "/A/"}
+ (map collection-item ["E" "F"])]
(with-collection-hierarchy [a b c e f g]
(api-get-collection-ancestors-and-children c)))
;; Make sure we can collapse multiple generations. For A: removing C and D should move up E and F
(expect
- {:items [{:name "B", :id true, :description nil, :model "collection"}
- {:name "E", :id true, :description nil, :model "collection"}
- {:name "F", :id true, :description nil, :model "collection"}]
- :effective_ancestors []
- :effective_location "/"}
+ [{:effective_ancestors []
+ :effective_location "/"}
+ (map collection-item ["B" "E" "F"])]
(with-collection-hierarchy [a b e f g]
(api-get-collection-ancestors-and-children a)))
;; Let's make sure the 'archived` option works on Collections, nested or not
(expect
- {:items [{:name "B", :id true, :description nil, :model "collection"}]
- :effective_ancestors []
- :effective_location "/"}
+ [{:effective_ancestors []
+ :effective_location "/"}
+ [(collection-item "B")]]
(with-collection-hierarchy [a b c]
(db/update! Collection (u/get-id b) :archived true)
(api-get-collection-ancestors-and-children a :archived true)))
@@ -357,49 +330,42 @@
;;; +----------------------------------------------------------------------------------------------------------------+
;; Check that we can see stuff that isn't in any Collection -- meaning they're in the so-called "Root" Collection
+(expect
+ {:name "Our analytics"
+ :id "root"
+ :can_write true
+ :effective_location nil
+ :effective_ancestors []}
+ (with-some-children-of-collection nil
+ ((user->client :crowberto) :get 200 "collection/root")))
;; Make sure you can see everything for Users that can see everything
(expect
- {:name "Saved items"
- :id "root"
- :items [{:name "Birthday Card", :description nil, :collection_position nil, :favorite false, :model "card"}
- {:name "Crowberto Corv's Personal Collection", :description nil, :model "collection"}
- {:name "Dine & Dashboard", :description nil, :collection_position nil, :model "dashboard"}
- {:name "Electro-Magnetic Pulse", :collection_position nil, :model "pulse"}]
- :can_write true}
+ [(default-item {:name "Birthday Card", :description nil, :favorite false, :model "card"})
+ (collection-item "Crowberto Corv's Personal Collection")
+ (default-item {:name "Dine & Dashboard", :description nil, :model "dashboard"})
+ (default-item {:name "Electro-Magnetic Pulse", :model "pulse"})]
(with-some-children-of-collection nil
- (-> ((user->client :crowberto) :get 200 "collection/root")
- (assoc :items ((user->client :crowberto) :get 200 "collection/root/items"))
- (remove-ids-from-collection-detail :keep-collection-id? true))))
+ (tu/boolean-ids-and-timestamps ((user->client :crowberto) :get 200 "collection/root/items"))))
;; ...but we don't let you see stuff you wouldn't otherwise be allowed to see
(expect
- {:name "Saved items"
- :id "root"
- :items [{:name "Rasta Toucan's Personal Collection", :description nil, :model "collection"}]
- :can_write false}
+ [(collection-item "Rasta Toucan's Personal Collection")]
;; if a User doesn't have perms for the Root Collection then they don't get to see things with no collection_id
(with-some-children-of-collection nil
- (-> ((user->client :rasta) :get 200 "collection/root")
- (assoc :items ((user->client :rasta) :get 200 "collection/root/items"))
- (remove-ids-from-collection-detail :keep-collection-id? true))))
+ (tu/boolean-ids-and-timestamps ((user->client :rasta) :get 200 "collection/root/items"))))
;; ...but if they have read perms for the Root Collection they should get to see them
(expect
- {:name "Saved items"
- :id "root"
- :items [{:name "Birthday Card", :collection_position nil, :description nil, :favorite false, :model "card"}
- {:name "Dine & Dashboard", :collection_position nil, :description nil, :model "dashboard"}
- {:name "Electro-Magnetic Pulse", :collection_position nil, :model "pulse"}
- {:name "Rasta Toucan's Personal Collection", :description nil, :model "collection"}]
- :can_write false}
+ [(default-item {:name "Birthday Card", :description nil, :favorite false, :model "card"})
+ (default-item {:name "Dine & Dashboard", :description nil, :model "dashboard"})
+ (default-item {:name "Electro-Magnetic Pulse", :model "pulse"})
+ (collection-item "Rasta Toucan's Personal Collection")]
(with-some-children-of-collection nil
(tt/with-temp* [PermissionsGroup [group]
PermissionsGroupMembership [_ {:user_id (user->id :rasta), :group_id (u/get-id group)}]]
(perms/grant-permissions! group (perms/collection-read-path {:metabase.models.collection/is-root? true}))
- (-> ((user->client :rasta) :get 200 "collection/root")
- (assoc :items ((user->client :rasta) :get 200 "collection/root/items"))
- (remove-ids-from-collection-detail :keep-collection-id? true)))))
+ (tu/boolean-ids-and-timestamps ((user->client :rasta) :get 200 "collection/root/items")))))
;; So I suppose my Personal Collection should show up when I fetch the Root Collection, shouldn't it...
(expect
@@ -454,35 +420,30 @@
tests below."
[& additional-get-params]
(collection-test/force-create-personal-collections!)
- (-> ((user->client :rasta) :get 200 "collection/root")
- (assoc :items (apply (user->client :rasta) :get 200 "collection/root/items" additional-get-params))
- format-ancestors-and-children))
+ [(format-ancestors-and-children ((user->client :rasta) :get 200 "collection/root"))
+ (tu/boolean-ids-and-timestamps (apply (user->client :rasta) :get 200 "collection/root/items" additional-get-params))])
;; Do top-level collections show up as children of the Root Collection?
(expect
- {:items [{:name "A", :id true, :description nil, :model "collection"}
- {:name "Rasta Toucan's Personal Collection", :id true, :description nil, :model "collection"}]
- :effective_ancestors []
- :effective_location nil}
+ [{:effective_ancestors []
+ :effective_location nil}
+ (map collection-item ["A" "Rasta Toucan's Personal Collection"])]
(with-collection-hierarchy [a b c d e f g]
(api-get-root-collection-ancestors-and-children)))
;; ...and collapsing children should work for the Root Collection as well
(expect
- {:items [{:name "B", :id true, :description nil, :model "collection"}
- {:name "D", :id true, :description nil, :model "collection"}
- {:name "F", :id true, :description nil, :model "collection"}
- {:name "Rasta Toucan's Personal Collection", :id true, :description nil, :model "collection"}]
- :effective_ancestors []
- :effective_location nil}
+ [{:effective_ancestors []
+ :effective_location nil}
+ (map collection-item ["B" "D" "F" "Rasta Toucan's Personal Collection"])]
(with-collection-hierarchy [b d e f g]
(api-get-root-collection-ancestors-and-children)))
;; does `archived` work on Collections as well?
(expect
- {:items [{:name "A", :id true, :description nil, :model "collection"}]
- :effective_ancestors []
- :effective_location nil}
+ [{:effective_ancestors []
+ :effective_location nil}
+ [(collection-item "A")]]
(with-collection-hierarchy [a b d e f g]
(db/update! Collection (u/get-id a) :archived true)
(api-get-root-collection-ancestors-and-children :archived true)))
diff --git a/test/metabase/api/dashboard_test.clj b/test/metabase/api/dashboard_test.clj
index 272b849d48de2356294c4fed56b5c346b698cd5f..107bd4defbe6d5c8a6358b5c9dc769607db0ed79 100644
--- a/test/metabase/api/dashboard_test.clj
+++ b/test/metabase/api/dashboard_test.clj
@@ -18,6 +18,7 @@
[dashboard-test :as dashboard-test]
[permissions :as perms]
[permissions-group :as group]
+ [pulse :refer [Pulse]]
[revision :refer [Revision]]]
[metabase.test.data.users :refer :all]
[metabase.test.util :as tu]
@@ -351,6 +352,164 @@
{:collection_position nil})
(db/select-one-field :collection_position Dashboard :id (u/get-id dashboard))))
+;;; +----------------------------------------------------------------------------------------------------------------+
+;;; | UPDATING DASHBOARD COLLECTION POSITIONS |
+;;; +----------------------------------------------------------------------------------------------------------------+
+
+;; Check that we can update a dashboard's position in a collection of only dashboards
+(expect
+ {"a" 1
+ "c" 2
+ "d" 3
+ "b" 4}
+ (tt/with-temp Collection [collection]
+ (card-api-test/with-ordered-items collection [Dashboard a
+ Dashboard b
+ Dashboard c
+ Dashboard d]
+ (perms/grant-collection-readwrite-permissions! (group/all-users) collection)
+ ((user->client :rasta) :put 200 (str "dashboard/" (u/get-id b))
+ {:collection_position 4})
+ (card-api-test/get-name->collection-position :rasta collection))))
+
+;; Check that updating a dashboard at position 3 to position 1 will increment the positions before 3, not after
+(expect
+ {"c" 1
+ "a" 2
+ "b" 3
+ "d" 4}
+ (tt/with-temp Collection [collection]
+ (card-api-test/with-ordered-items collection [Card a
+ Pulse b
+ Dashboard c
+ Dashboard d]
+ (perms/grant-collection-readwrite-permissions! (group/all-users) collection)
+ ((user->client :rasta) :put 200 (str "dashboard/" (u/get-id c))
+ {:collection_position 1})
+ (card-api-test/get-name->collection-position :rasta collection))))
+
+;; Check that updating position 1 to 3 will cause b and c to be decremented
+(expect
+ {"b" 1
+ "c" 2
+ "a" 3
+ "d" 4}
+ (tt/with-temp Collection [collection]
+ (card-api-test/with-ordered-items collection [Dashboard a
+ Card b
+ Pulse c
+ Dashboard d]
+ (perms/grant-collection-readwrite-permissions! (group/all-users) collection)
+ ((user->client :rasta) :put 200 (str "dashboard/" (u/get-id a))
+ {:collection_position 3})
+ (card-api-test/get-name->collection-position :rasta collection))))
+
+;; Check that updating position 1 to 4 will cause a through c to be decremented
+(expect
+ {"b" 1
+ "c" 2
+ "d" 3
+ "a" 4}
+ (tt/with-temp Collection [collection]
+ (card-api-test/with-ordered-items collection [Dashboard a
+ Card b
+ Pulse c
+ Pulse d]
+ (perms/grant-collection-readwrite-permissions! (group/all-users) collection)
+ ((user->client :rasta) :put 200 (str "dashboard/" (u/get-id a))
+ {:collection_position 4})
+ (card-api-test/get-name->collection-position :rasta collection))))
+
+;; Check that updating position 4 to 1 will cause a through c to be incremented
+(expect
+ {"d" 1
+ "a" 2
+ "b" 3
+ "c" 4}
+ (tt/with-temp Collection [collection]
+ (card-api-test/with-ordered-items collection [Card a
+ Pulse b
+ Card c
+ Dashboard d]
+ (perms/grant-collection-readwrite-permissions! (group/all-users) collection)
+ ((user->client :rasta) :put 200 (str "dashboard/" (u/get-id d))
+ {:collection_position 1})
+ (card-api-test/get-name->collection-position :rasta collection))))
+
+;; Check that moving a dashboard to another collection will fixup both collections
+(expect
+ [{"b" 1
+ "c" 2
+ "d" 3}
+ {"a" 1
+ "e" 2
+ "f" 3
+ "g" 4
+ "h" 5}]
+ (tt/with-temp* [Collection [collection-1]
+ Collection [collection-2]]
+ (card-api-test/with-ordered-items collection-1 [Dashboard a
+ Card b
+ Card c
+ Pulse d]
+ (card-api-test/with-ordered-items collection-2 [Pulse e
+ Pulse f
+ Dashboard g
+ Card h]
+ (perms/grant-collection-readwrite-permissions! (group/all-users) collection-1)
+ (perms/grant-collection-readwrite-permissions! (group/all-users) collection-2)
+ ;; Move the first dashboard in collection-1 to collection-1
+ ((user->client :rasta) :put 200 (str "dashboard/" (u/get-id a))
+ {:collection_position 1, :collection_id (u/get-id collection-2)})
+ ;; "a" should now be gone from collection-1 and all the existing dashboards bumped down in position
+ [(card-api-test/get-name->collection-position :rasta collection-1)
+ ;; "a" is now first, all other dashboards in collection-2 bumped down 1
+ (card-api-test/get-name->collection-position :rasta collection-2)]))))
+
+;; Check that adding a new card at position 3 will cause the existing card at 3 to be incremented
+(expect
+ [{"a" 1
+ "b" 2
+ "d" 3}
+ {"a" 1
+ "b" 2
+ "c" 3
+ "d" 4}]
+ (tt/with-temp Collection [collection]
+ (tu/with-model-cleanup [Dashboard]
+ (card-api-test/with-ordered-items collection [Card a
+ Pulse b
+ Card d]
+ (perms/grant-collection-readwrite-permissions! (group/all-users) collection)
+ [(card-api-test/get-name->collection-position :rasta collection)
+ (do
+ ((user->client :rasta) :post 200 "dashboard" {:name "c"
+ :parameters [{}]
+ :collection_id (u/get-id collection)
+ :collection_position 3})
+ (card-api-test/get-name->collection-position :rasta collection))]))))
+
+;; Check that adding a new card without a position, leaves the existing positions unchanged
+(expect
+ [{"a" 1
+ "b" 2
+ "d" 3}
+ {"a" 1
+ "b" 2
+ "c" nil
+ "d" 3}]
+ (tt/with-temp Collection [collection]
+ (tu/with-model-cleanup [Dashboard]
+ (card-api-test/with-ordered-items collection [Dashboard a
+ Card b
+ Pulse d]
+ (perms/grant-collection-readwrite-permissions! (group/all-users) collection)
+ [(card-api-test/get-name->collection-position :rasta collection)
+ (do
+ ((user->client :rasta) :post 200 "dashboard" {:name "c"
+ :parameters [{}]
+ :collection_id (u/get-id collection)})
+ (card-api-test/get-name->collection-position :rasta collection))]))))
;;; +----------------------------------------------------------------------------------------------------------------+
diff --git a/test/metabase/api/pulse_test.clj b/test/metabase/api/pulse_test.clj
index f556f51a0b68f4d442787491a6fe5e89b6ae1dd4..87475c899b2f84d9c337389e489bd40ef441a7c8 100644
--- a/test/metabase/api/pulse_test.clj
+++ b/test/metabase/api/pulse_test.clj
@@ -10,6 +10,7 @@
[metabase.models
[card :refer [Card]]
[collection :refer [Collection]]
+ [dashboard :refer [Dashboard]]
[database :refer [Database]]
[permissions :as perms]
[permissions-group :as perms-group]
@@ -102,24 +103,28 @@
;;; | POST /api/pulse |
;;; +----------------------------------------------------------------------------------------------------------------+
+(def ^:private default-post-card-ref-validation-error
+ {:errors
+ {:cards (str "value must be an array. Each value must satisfy one of the following requirements: "
+ "1) value must be a map with the following keys "
+ "`(collection_id, description, display, id, include_csv, include_xls, name)` "
+ "2) value must be a map with the keys `id`, `include_csv`, and `include_xls`. The array cannot be empty.")}})
+
(expect
{:errors {:name "value must be a non-blank string."}}
((user->client :rasta) :post 400 "pulse" {}))
(expect
- {:errors {:cards (str "value must be an array. Each value must be a map with the keys `id`, `include_csv`, and "
- "`include_xls`. The array cannot be empty.")}}
+ default-post-card-ref-validation-error
((user->client :rasta) :post 400 "pulse" {:name "abc"}))
(expect
- {:errors {:cards (str "value must be an array. Each value must be a map with the keys `id`, `include_csv`, and "
- "`include_xls`. The array cannot be empty.")}}
+ default-post-card-ref-validation-error
((user->client :rasta) :post 400 "pulse" {:name "abc"
:cards "foobar"}))
(expect
- {:errors {:cards (str "value must be an array. Each value must be a map with the keys `id`, `include_csv`, and "
- "`include_xls`. The array cannot be empty.")}}
+ default-post-card-ref-validation-error
((user->client :rasta) :post 400 "pulse" {:name "abc"
:cards ["abc"]}))
@@ -196,6 +201,42 @@
pulse-response
(update :channels remove-extra-channels-fields))))))
+;; Create a pulse with a HybridPulseCard and a CardRef, PUT accepts this format, we should make sure POST does as well
+(tt/expect-with-temp [Card [card-1]
+ Card [card-2 {:name "The card"
+ :description "Info"
+ :display :table}]]
+ (merge
+ pulse-defaults
+ {:name "A Pulse"
+ :creator_id (user->id :rasta)
+ :creator (user-details (fetch-user :rasta))
+ :cards (for [card [card-1 card-2]]
+ (assoc (pulse-card-details card)
+ :collection_id true))
+ :channels [(merge pulse-channel-defaults
+ {:channel_type "email"
+ :schedule_type "daily"
+ :schedule_hour 12
+ :recipients []})]
+ :collection_id true})
+ (card-api-test/with-cards-in-readable-collection [card-1 card-2]
+ (tt/with-temp Collection [collection]
+ (perms/grant-collection-readwrite-permissions! (perms-group/all-users) collection)
+ (tu/with-model-cleanup [Pulse]
+ (-> ((user->client :rasta) :post 200 "pulse" {:name "A Pulse"
+ :collection_id (u/get-id collection)
+ :cards [{:id (u/get-id card-1)
+ :include_csv false
+ :include_xls false}
+ (-> card-2
+ (select-keys [:id :name :description :display :collection_id])
+ (assoc :include_csv false, :include_xls false))]
+ :channels [daily-email-channel]
+ :skip_if_empty false})
+ pulse-response
+ (update :channels remove-extra-channels-fields))))))
+
;; Create a pulse with a csv and xls
(tt/expect-with-temp [Card [card-1]
Card [card-2]]
@@ -272,23 +313,28 @@
;;; | PUT /api/pulse/:id |
;;; +----------------------------------------------------------------------------------------------------------------+
+(def ^:private default-put-card-ref-validation-error
+ {:errors
+ {:cards (str "value may be nil, or if non-nil, value must be an array. "
+ "Each value must satisfy one of the following requirements: "
+ "1) value must be a map with the following keys "
+ "`(collection_id, description, display, id, include_csv, include_xls, name)` "
+ "2) value must be a map with the keys `id`, `include_csv`, and `include_xls`. The array cannot be empty.")}})
+
(expect
{:errors {:name "value may be nil, or if non-nil, value must be a non-blank string."}}
((user->client :rasta) :put 400 "pulse/1" {:name 123}))
(expect
- {:errors {:cards (str "value may be nil, or if non-nil, value must be an array. Each value must be a map with the "
- "keys `id`, `include_csv`, and `include_xls`. The array cannot be empty.")}}
+ default-put-card-ref-validation-error
((user->client :rasta) :put 400 "pulse/1" {:cards 123}))
(expect
- {:errors {:cards (str "value may be nil, or if non-nil, value must be an array. Each value must be a map with the "
- "keys `id`, `include_csv`, and `include_xls`. The array cannot be empty.")}}
+ default-put-card-ref-validation-error
((user->client :rasta) :put 400 "pulse/1" {:cards "foobar"}))
(expect
- {:errors {:cards (str "value may be nil, or if non-nil, value must be an array. Each value must be a map with the "
- "keys `id`, `include_csv`, and `include_xls`. The array cannot be empty.")}}
+ default-put-card-ref-validation-error
((user->client :rasta) :put 400 "pulse/1" {:cards ["abc"]}))
(expect
@@ -341,6 +387,35 @@
pulse-response
(update :channels remove-extra-channels-fields)))))
+;; Can we add a card to an existing pulse that has a card? Specifically this will include a HybridPulseCard (the
+;; original card associated with the pulse) and a CardRef (the new card)
+(tt/expect-with-temp [Pulse [pulse {:name "Original Pulse Name"}]
+ Card [card-1 {:name "Test"
+ :description "Just Testing"}]
+ PulseCard [_ {:card_id (u/get-id card-1)
+ :pulse_id (u/get-id pulse)}]
+ Card [card-2 {:name "Test2"
+ :description "Just Testing2"}]]
+ (merge
+ pulse-defaults
+ {:name "Original Pulse Name"
+ :creator_id (user->id :rasta)
+ :creator (user-details (fetch-user :rasta))
+ :cards (mapv (comp #(assoc % :collection_id true) pulse-card-details) [card-1 card-2])
+ :channels []
+ :collection_id true})
+ (with-pulses-in-writeable-collection [pulse]
+ (card-api-test/with-cards-in-readable-collection [card-1 card-2]
+ ;; The FE will include the original HybridPulseCard, similar to how the API returns the card via GET
+ (let [pulse-cards (:cards ((user->client :rasta) :get 200 (format "pulse/%d" (u/get-id pulse))))]
+ (-> ((user->client :rasta) :put 200 (format "pulse/%d" (u/get-id pulse))
+ {:cards (concat pulse-cards
+ [{:id (u/get-id card-2)
+ :include_csv false
+ :include_xls false}])})
+ pulse-response
+ (update :channels remove-extra-channels-fields))))))
+
;; Can we update *just* the Collection ID of a Pulse?
(expect
(tt/with-temp* [Pulse [pulse]
@@ -418,6 +493,200 @@
{:collection_position nil})
(db/select-one-field :collection_position Pulse :id (u/get-id pulse))))
+;;; +----------------------------------------------------------------------------------------------------------------+
+;;; | UPDATING PULSE COLLECTION POSITIONS |
+;;; +----------------------------------------------------------------------------------------------------------------+
+
+;; Check that we can update a pulse's position in a collection only pulses
+(expect
+ {"d" 1
+ "a" 2
+ "b" 3
+ "c" 4}
+ (tt/with-temp Collection [{coll-id :id :as collection}]
+ (card-api-test/with-ordered-items collection [Pulse a
+ Pulse b
+ Pulse c
+ Pulse d]
+ (perms/grant-collection-readwrite-permissions! (perms-group/all-users) collection)
+ ((user->client :rasta) :put 200 (str "pulse/" (u/get-id d))
+ {:collection_position 1})
+ (card-api-test/get-name->collection-position :rasta coll-id))))
+
+;; Change the position of b to 4, will dec c and d
+(expect
+ {"a" 1
+ "c" 2
+ "d" 3
+ "b" 4}
+ (tt/with-temp Collection [{coll-id :id :as collection}]
+ (card-api-test/with-ordered-items collection [Card a
+ Pulse b
+ Card c
+ Dashboard d]
+ (perms/grant-collection-readwrite-permissions! (perms-group/all-users) collection)
+ ((user->client :rasta) :put 200 (str "pulse/" (u/get-id b))
+ {:collection_position 4})
+ (card-api-test/get-name->collection-position :rasta coll-id))))
+
+;; Change the position of d to the 2, should inc b and c
+(expect
+ {"a" 1
+ "d" 2
+ "b" 3
+ "c" 4}
+ (tt/with-temp Collection [{coll-id :id :as collection}]
+ (card-api-test/with-ordered-items collection [Card a
+ Card b
+ Dashboard c
+ Pulse d]
+ (perms/grant-collection-readwrite-permissions! (perms-group/all-users) collection)
+ ((user->client :rasta) :put 200 (str "pulse/" (u/get-id d))
+ {:collection_position 2})
+ (card-api-test/get-name->collection-position :rasta coll-id))))
+
+;; Change the position of a to the 4th, will decrement all existing items
+(expect
+ {"b" 1
+ "c" 2
+ "d" 3
+ "a" 4}
+ (tt/with-temp Collection [{coll-id :id :as collection}]
+ (card-api-test/with-ordered-items collection [Pulse a
+ Dashboard b
+ Card c
+ Pulse d]
+ (perms/grant-collection-readwrite-permissions! (perms-group/all-users) collection)
+ ((user->client :rasta) :put 200 (str "pulse/" (u/get-id a))
+ {:collection_position 4})
+ (card-api-test/get-name->collection-position :rasta coll-id))))
+
+;; Change the position of the d to the 1st, will increment all existing items
+(expect
+ {"d" 1
+ "a" 2
+ "b" 3
+ "c" 4}
+ (tt/with-temp Collection [{coll-id :id :as collection}]
+ (card-api-test/with-ordered-items collection [Dashboard a
+ Dashboard b
+ Card c
+ Pulse d]
+ (perms/grant-collection-readwrite-permissions! (perms-group/all-users) collection)
+ ((user->client :rasta) :put 200 (str "pulse/" (u/get-id d))
+ {:collection_position 1})
+ (card-api-test/get-name->collection-position :rasta coll-id))))
+
+;; Check that no position change, but changing collections still triggers a fixup of both collections
+;; Moving `c` from collection-1 to collection-2, `c` is now at position 3 in collection 2
+(expect
+ [{"a" 1
+ "b" 2
+ "d" 3}
+ {"e" 1
+ "f" 2
+ "c" 3
+ "g" 4
+ "h" 5}]
+ (tt/with-temp* [Collection [collection-1]
+ Collection [collection-2]]
+ (card-api-test/with-ordered-items collection-1 [Pulse a
+ Card b
+ Pulse c
+ Dashboard d]
+ (card-api-test/with-ordered-items collection-2 [Card e
+ Card f
+ Dashboard g
+ Dashboard h]
+ (perms/grant-collection-readwrite-permissions! (perms-group/all-users) collection-1)
+ (perms/grant-collection-readwrite-permissions! (perms-group/all-users) collection-2)
+ ((user->client :rasta) :put 200 (str "pulse/" (u/get-id c))
+ {:collection_id (u/get-id collection-2)})
+ [(card-api-test/get-name->collection-position :rasta (u/get-id collection-1))
+ (card-api-test/get-name->collection-position :rasta (u/get-id collection-2))]))))
+
+;; Check that moving a pulse to another collection, with a changed position will fixup both collections
+;; Moving `b` to collection 2, giving it a position of 1
+(expect
+ [{"a" 1
+ "c" 2
+ "d" 3}
+ {"b" 1
+ "e" 2
+ "f" 3
+ "g" 4
+ "h" 5}]
+ (tt/with-temp* [Collection [collection-1]
+ Collection [collection-2]]
+ (card-api-test/with-ordered-items collection-1 [Pulse a
+ Pulse b
+ Dashboard c
+ Card d]
+ (card-api-test/with-ordered-items collection-2 [Card e
+ Card f
+ Pulse g
+ Dashboard h]
+ (perms/grant-collection-readwrite-permissions! (perms-group/all-users) collection-1)
+ (perms/grant-collection-readwrite-permissions! (perms-group/all-users) collection-2)
+ ((user->client :rasta) :put 200 (str "pulse/" (u/get-id b))
+ {:collection_id (u/get-id collection-2), :collection_position 1})
+ [(card-api-test/get-name->collection-position :rasta (u/get-id collection-1))
+ (card-api-test/get-name->collection-position :rasta (u/get-id collection-2))]))))
+
+;; Add a new pulse at position 2, causing existing pulses to be incremented
+(expect
+ [{"a" 1
+ "c" 2
+ "d" 3}
+ {"a" 1
+ "b" 2
+ "c" 3
+ "d" 4}]
+ (tt/with-temp* [Collection [{coll-id :id :as collection}]
+ Card [card-1]]
+ (card-api-test/with-cards-in-readable-collection [card-1]
+ (card-api-test/with-ordered-items collection [Card a
+ Dashboard c
+ Pulse d]
+ (tu/with-model-cleanup [Pulse]
+ (perms/grant-collection-readwrite-permissions! (perms-group/all-users) collection)
+ [(card-api-test/get-name->collection-position :rasta coll-id)
+ (do ((user->client :rasta) :post 200 "pulse" {:name "b"
+ :collection_id (u/get-id collection)
+ :cards [{:id (u/get-id card-1)
+ :include_csv false
+ :include_xls false}]
+ :channels [daily-email-channel]
+ :skip_if_empty false
+ :collection_position 2})
+ (card-api-test/get-name->collection-position :rasta coll-id))])))))
+
+;; Add a new pulse without a position, should leave existing positions unchanged
+(expect
+ [{"a" 1
+ "c" 2
+ "d" 3}
+ {"a" 1
+ "b" nil
+ "c" 2
+ "d" 3}]
+ (tt/with-temp* [Collection [{coll-id :id :as collection}]
+ Card [card-1]]
+ (card-api-test/with-cards-in-readable-collection [card-1]
+ (card-api-test/with-ordered-items collection [Pulse a
+ Card c
+ Dashboard d]
+ (tu/with-model-cleanup [Pulse]
+ (perms/grant-collection-readwrite-permissions! (perms-group/all-users) collection)
+ [(card-api-test/get-name->collection-position :rasta coll-id)
+ (do ((user->client :rasta) :post 200 "pulse" {:name "b"
+ :collection_id (u/get-id collection)
+ :cards [{:id (u/get-id card-1)
+ :include_csv false
+ :include_xls false}]
+ :channels [daily-email-channel]
+ :skip_if_empty false})
+ (card-api-test/get-name->collection-position :rasta coll-id))])))))
;;; +----------------------------------------------------------------------------------------------------------------+
;;; | DELETE /api/pulse/:id |
diff --git a/test/metabase/api/search_test.clj b/test/metabase/api/search_test.clj
index a4f881042571931f5cbe04d4b4afd62feca7dd54..a3e4d4c167f82048aa90f50d97565117994af87f 100644
--- a/test/metabase/api/search_test.clj
+++ b/test/metabase/api/search_test.clj
@@ -226,4 +226,7 @@
:alert_first_only false
:alert_above_goal nil
:name nil}]]
- (filter #(= (u/get-id pulse) (:id %)) ((user->client :crowberto) :get 200 "search")))))
+ (filter (fn [{:keys [model id]}]
+ (and (= id (u/get-id pulse))
+ (= "pulse" model)))
+ ((user->client :crowberto) :get 200 "search")))))
diff --git a/test/metabase/api/user_test.clj b/test/metabase/api/user_test.clj
index 91db0f9ad2dfdb01b10cc6167ea18a261ab62ddb..d2e059683bf5f43ee1a4de3f6674288459eccefc 100644
--- a/test/metabase/api/user_test.clj
+++ b/test/metabase/api/user_test.clj
@@ -322,6 +322,28 @@
((test-users/user->client :crowberto) :put 404 (str "user/" (test-users/user->id :trashbird))
{:email "toucan@metabase.com"}))
+;; Google auth users shouldn't be able to change their own password as we get that from Google
+(expect
+ "You don't have permissions to do that."
+ (tt/with-temp User [user {:email "anemail@metabase.com"
+ :password "def123"
+ :google_auth true}]
+ (let [creds {:username "anemail@metabase.com"
+ :password "def123"}]
+ (http/client creds :put 403 (format "user/%d" (u/get-id user))
+ {:email "adifferentemail@metabase.com"}))))
+
+;; Similar to Google auth accounts, we should not allow LDAP users to change their own email address as we get that
+;; from the LDAP server
+(expect
+ "You don't have permissions to do that."
+ (tt/with-temp User [user {:email "anemail@metabase.com"
+ :password "def123"
+ :ldap_auth true}]
+ (let [creds {:username "anemail@metabase.com"
+ :password "def123"}]
+ (http/client creds :put 403 (format "user/%d" (u/get-id user))
+ {:email "adifferentemail@metabase.com"}))))
;; ## PUT /api/user/:id/password
;; Test that a User can change their password (superuser and non-superuser)
diff --git a/test/metabase/db/migrations_test.clj b/test/metabase/db/migrations_test.clj
new file mode 100644
index 0000000000000000000000000000000000000000..3e4f70ad67184dce85b0c6e55919d878966d32b7
--- /dev/null
+++ b/test/metabase/db/migrations_test.clj
@@ -0,0 +1,62 @@
+(ns metabase.db.migrations-test
+ "Tests to make sure the data migrations actually work as expected and don't break things. Shamefully, we have way less
+ of these than we should... but that doesn't mean we can't write them for our new ones :)"
+ (:require [expectations :refer :all]
+ [medley.core :as m]
+ [metabase.db.migrations :as migrations]
+ [metabase.models
+ [card :refer [Card]]
+ [database :refer [Database]]
+ [user :refer [User]]]
+ [metabase.util :as u]
+ [metabase.util.password :as upass]
+ [toucan.db :as db]
+ [toucan.util.test :as tt]))
+
+;; add-legacy-sql-directive-to-bigquery-sql-cards
+(expect
+ {"Card that should get directive"
+ {:database true
+ :type "native"
+ :native {:query "#legacySQL\nSELECT * FROM [dataset.table];"}}
+ "Card that already has directive"
+ {:database true
+ :type "native"
+ :native {:query "#standardSQL\nSELECT * FROM `dataset.table`;"}}}
+ ;; Create a BigQuery database with 2 SQL Cards, one that already has a directive and one that doesn't.
+ (tt/with-temp* [Database [database {:engine "bigquery"}]
+ Card [card-1 {:name "Card that should get directive"
+ :database_id (u/get-id database)
+ :dataset_query {:database (u/get-id database)
+ :type :native
+ :native {:query "SELECT * FROM [dataset.table];"}}}]
+ Card [card-2 {:name "Card that already has directive"
+ :database_id (u/get-id database)
+ :dataset_query {:database (u/get-id database)
+ :type :native
+ :native {:query "#standardSQL\nSELECT * FROM `dataset.table`;"}}}]]
+ ;; manually running the migration function should cause card-1, which needs a directive, to get updated, but
+ ;; should not affect card-2.
+ (#'migrations/add-legacy-sql-directive-to-bigquery-sql-cards)
+ (->> (db/select-field->field :name :dataset_query Card :id [:in (map u/get-id [card-1 card-2])])
+ (m/map-vals #(update % :database integer?)))))
+
+;; Test clearing of LDAP user local passwords
+(expect
+ [false true]
+ (do
+ (tt/with-temp* [User [ldap-user {:email "ldapuser@metabase.com"
+ :password "something secret"
+ :ldap_auth true}]
+ User [user {:email "notanldapuser@metabase.com"
+ :password "no change"}]]
+ (#'migrations/clear-ldap-user-local-passwords)
+ (let [get-pass-and-salt #(db/select-one [User :password :password_salt] :id (u/get-id %))
+ {ldap-pass :password,
+ ldap-salt :password_salt} (get-pass-and-salt ldap-user)
+ {user-pass :password,
+ user-salt :password_salt} (get-pass-and-salt user)]
+ ;; The LDAP user password should be no good now that it's been cleared and replaced
+ [(upass/verify-password "something secret" ldap-salt ldap-pass)
+ ;; There should be no change for a non ldap user
+ (upass/verify-password "no change" user-salt user-pass)]))))
diff --git a/test/metabase/driver/bigquery_test.clj b/test/metabase/driver/bigquery_test.clj
index 3c1dde3814a8ea542c34d81cb179c4ecd2bd2e3f..2fa7f95947b9d29fc00ef436b36f20d38e2f36dd 100644
--- a/test/metabase/driver/bigquery_test.clj
+++ b/test/metabase/driver/bigquery_test.clj
@@ -1,5 +1,6 @@
(ns metabase.driver.bigquery-test
(:require [expectations :refer :all]
+ [honeysql.core :as hsql]
[metabase
[driver :as driver]
[query-processor :as qp]
@@ -13,7 +14,7 @@
[metabase.test
[data :as data]
[util :as tu]]
- [metabase.test.data.datasets :refer [expect-with-engine do-with-engine]]))
+ [metabase.test.data.datasets :refer [expect-with-engine]]))
(def ^:private col-defaults
{:remapped_to nil, :remapped_from nil})
@@ -23,9 +24,9 @@
[[100]
[99]]
(get-in (qp/process-query
- {:native {:query (str "SELECT [test_data.venues.id] "
- "FROM [test_data.venues] "
- "ORDER BY [test_data.venues.id] DESC "
+ {:native {:query (str "SELECT `test_data.venues`.`id` "
+ "FROM `test_data.venues` "
+ "ORDER BY `test_data.venues`.`id` DESC "
"LIMIT 2;")}
:type :native
:database (data/id)})
@@ -54,10 +55,10 @@
{:name "checkins_id", :display_name "Checkins ID", :base_type :type/Integer}])}
(select-keys (:data (qp/process-query
- {:native {:query (str "SELECT [test_data.checkins.venue_id] AS [venue_id], "
- " [test_data.checkins.user_id] AS [user_id], "
- " [test_data.checkins.id] AS [checkins_id] "
- "FROM [test_data.checkins] "
+ {:native {:query (str "SELECT `test_data.checkins`.`venue_id` AS `venue_id`, "
+ " `test_data.checkins`.`user_id` AS `user_id`, "
+ " `test_data.checkins`.`id` AS `checkins_id` "
+ "FROM `test_data.checkins` "
"LIMIT 2")}
:type :native
:database (data/id)}))
@@ -134,17 +135,17 @@
(tu/db-timezone-id))
-;; make sure that BigQuery properly aliases the names generated for Join Tables. It's important to include the name of
-;; the dataset along, e.g. `test_data.categories__via__category_id` rather than just
-;; `categories__via__category_id`, which is what the other SQL databases do. (#4218)
+;; make sure that BigQuery properly aliases the names generated for Join Tables. It's important to use the right
+;; alias, e.g. something like `categories__via__category_id`, which is considerably different from what other SQL
+;; databases do. (#4218)
(expect-with-engine :bigquery
- (str "SELECT count(*) AS [count],"
- " [test_data.categories__via__category_id.name] AS [test_data.categories__via__category_id.name] "
- "FROM [test_data.venues] "
- "LEFT JOIN [test_data.categories] [test_data.categories__via__category_id]"
- " ON [test_data.venues.category_id] = [test_data.categories__via__category_id.id] "
- "GROUP BY [test_data.categories__via__category_id.name] "
- "ORDER BY [test_data.categories__via__category_id.name] ASC")
+ (str "SELECT count(*) AS `count`,"
+ " `test_data.categories__via__category_id`.`name` AS `categories__via__category_id___name` "
+ "FROM `test_data.venues` "
+ "LEFT JOIN `test_data.categories` `test_data.categories__via__category_id`"
+ " ON `test_data.venues`.`category_id` = `test_data.categories__via__category_id`.`id` "
+ "GROUP BY `categories__via__category_id___name` "
+ "ORDER BY `categories__via__category_id___name` ASC")
;; normally for test purposes BigQuery doesn't support foreign keys so override the function that checks that and
;; make it return `true` so this test proceeds as expected
(with-redefs [qpi/driver-supports? (constantly true)]
@@ -157,3 +158,13 @@
:aggregation [:count]
:breakout [[:fk-> (data/id :venues :category_id) (data/id :categories :name)]]}})]
(get-in results [:data :native_form :query] results)))))
+
+;; Make sure the BigQueryIdentifier class works as expected
+(expect
+ ["SELECT `dataset.table`.`field`"]
+ (hsql/format {:select [(#'bigquery/map->BigQueryIdentifier
+ {:dataset-name "dataset", :table-name "table", :field-name "field"})]}))
+
+(expect
+ ["SELECT `dataset.table`"]
+ (hsql/format {:select [(#'bigquery/map->BigQueryIdentifier {:dataset-name "dataset", :table-name "table"})]}))
diff --git a/test/metabase/integrations/ldap_test.clj b/test/metabase/integrations/ldap_test.clj
index 859dad02e43dfdf0602de86ae6fd5bdd12ec8bee..d0853c0b058aa76d5073f49fc24f72c7cecf2ab6 100644
--- a/test/metabase/integrations/ldap_test.clj
+++ b/test/metabase/integrations/ldap_test.clj
@@ -15,8 +15,12 @@
;; See test_resources/ldap.ldif for fixtures
(expect
- "\\2AJohn \\28Dude\\29 Doe\\5C"
- (#'ldap/escape-value "*John (Dude) Doe\\"))
+ "\\20\\2AJohn \\28Dude\\29 Doe\\5C"
+ (#'ldap/escape-value " *John (Dude) Doe\\"))
+
+(expect
+ "John\\2BSmith@metabase.com"
+ (#'ldap/escape-value "John+Smith@metabase.com"))
;; The connection test should pass with valid settings
(expect-with-ldap-server
diff --git a/test/metabase/models/setting_test.clj b/test/metabase/models/setting_test.clj
index cf617ab39ec60da3fc1759968595fdd9613a7108..c7c55ef06ac6b7eb920b6d8b3b4acf98c50f3def 100644
--- a/test/metabase/models/setting_test.clj
+++ b/test/metabase/models/setting_test.clj
@@ -1,7 +1,15 @@
(ns metabase.models.setting-test
- (:require [expectations :refer :all]
+ (:require [clojure.core.memoize :as memoize]
+ [expectations :refer :all]
+ [honeysql.core :as hsql]
+ [metabase
+ [db :as mdb]
+ [util :as u]]
[metabase.models.setting :as setting :refer [defsetting Setting]]
[metabase.test.util :refer :all]
+ [metabase.util
+ [encryption :as encryption]
+ [encryption-test :as encryption-test]]
[puppetlabs.i18n.core :refer [tru]]
[toucan.db :as db]))
@@ -167,7 +175,12 @@
;; all
(expect
- {:key :test-setting-2, :value "TOUCANS", :description "Test setting - this only shows up in dev (2)", :is_env_setting false, :env_name "MB_TEST_SETTING_2", :default "[Default Value]"}
+ {:key :test-setting-2
+ :value "TOUCANS"
+ :description "Test setting - this only shows up in dev (2)"
+ :is_env_setting false
+ :env_name "MB_TEST_SETTING_2"
+ :default "[Default Value]"}
(do (set-settings! nil "TOUCANS")
(some (fn [setting]
(when (re-find #"^test-setting-2$" (name (:key setting)))
@@ -176,8 +189,18 @@
;; all
(expect
- [{:key :test-setting-1, :value nil, :is_env_setting true, :env_name "MB_TEST_SETTING_1", :description "Test setting - this only shows up in dev (1)", :default "Using $MB_TEST_SETTING_1"}
- {:key :test-setting-2, :value "S2", :is_env_setting false, :env_name "MB_TEST_SETTING_2", :description "Test setting - this only shows up in dev (2)", :default "[Default Value]"}]
+ [{:key :test-setting-1
+ :value nil
+ :is_env_setting true
+ :env_name "MB_TEST_SETTING_1"
+ :description "Test setting - this only shows up in dev (1)"
+ :default "Using $MB_TEST_SETTING_1"}
+ {:key :test-setting-2
+ :value "S2"
+ :is_env_setting false,
+ :env_name "MB_TEST_SETTING_2"
+ :description "Test setting - this only shows up in dev (2)"
+ :default "[Default Value]"}]
(do (set-settings! nil "S2")
(for [setting (setting/all)
:when (re-find #"^test-setting-\d$" (name (:key setting)))]
@@ -264,8 +287,160 @@
;; restore the cache
((resolve 'metabase.models.setting/restore-cache-if-needed!))
;; now set a value for the `toucan-name` setting the wrong way
- (db/insert! setting/Setting {:key "toucan-name", :value "Rasta"})
+ (db/insert! setting/Setting {:key "toucan-name", :value "Reggae"})
;; ok, now try to set the Setting the correct way
(toucan-name "Banana Beak")
;; ok, make sure the setting was set
(toucan-name)))
+
+
+;;; ----------------------------------------------- Encrypted Settings -----------------------------------------------
+
+(defn- actual-value-in-db [setting-key]
+ (-> (db/query {:select [:value]
+ :from [:setting]
+ :where [:= :key (name setting-key)]})
+ first :value u/jdbc-clob->str))
+
+;; If encryption is *enabled*, make sure Settings get saved as encrypted!
+(expect
+ (encryption-test/with-secret-key "ABCDEFGH12345678"
+ (toucan-name "Sad Can")
+ (u/base64-string? (actual-value-in-db :toucan-name))))
+
+;; make sure it can be decrypted as well...
+(expect
+ "Sad Can"
+ (encryption-test/with-secret-key "12345678ABCDEFGH"
+ (toucan-name "Sad Can")
+ (encryption/decrypt (actual-value-in-db :toucan-name))))
+
+;; But if encryption is not enabled, of course Settings shouldn't get saved as encrypted.
+(expect
+ "Sad Can"
+ (encryption-test/with-secret-key nil
+ (toucan-name "Sad Can")
+ (actual-value-in-db :toucan-name)))
+
+
+;;; --------------------------------------------- Cache Synchronization ----------------------------------------------
+
+(def ^:private settings-last-updated-key @(resolve 'metabase.models.setting/settings-last-updated-key))
+
+(defn- clear-settings-last-updated-value-in-db! []
+ (db/simple-delete! Setting {:key settings-last-updated-key}))
+
+(defn- settings-last-updated-value-in-db []
+ (db/select-one-field :value Setting :key settings-last-updated-key))
+
+(defn- clear-cache! []
+ (reset! @(resolve 'metabase.models.setting/cache) nil))
+
+(defn- settings-last-updated-value-in-cache []
+ (get @@(resolve 'metabase.models.setting/cache) settings-last-updated-key))
+
+(defn- update-settings-last-updated-value-in-db!
+ "Simulate a different instance updating the value of `settings-last-updated` in the DB by updating its value without
+ updating our locally cached value.."
+ []
+ (db/update-where! Setting {:key settings-last-updated-key}
+ :value (hsql/raw (case (mdb/db-type)
+ ;; make it one second in the future so we don't end up getting an exact match when we try to test
+ ;; to see if things update below
+ :h2 "cast(dateadd('second', 1, current_timestamp) AS text)"
+ :mysql "cast((current_timestamp + interval 1 second) AS char)"
+ :postgres "cast((current_timestamp + interval '1 second') AS text)"))))
+
+(defn- simulate-another-instance-updating-setting! [setting-name new-value]
+ (db/update-where! Setting {:key (name setting-name)} :value new-value)
+ (update-settings-last-updated-value-in-db!))
+
+(defn- flush-memoized-results-for-should-restore-cache!
+ "Remove any memoized results for `should-restore-cache?`, so we can test `restore-cache-if-needed!` works the way we'd
+ expect."
+ []
+ (memoize/memo-clear! @(resolve 'metabase.models.setting/should-restore-cache?)))
+
+;; When I update a Setting, does it set/update `settings-last-updated`?
+(expect
+ (do
+ (clear-settings-last-updated-value-in-db!)
+ (toucan-name "Bird Can")
+ (string? (settings-last-updated-value-in-db))))
+
+;; ...and is the value updated in the cache as well?
+(expect
+ (do
+ (clear-cache!)
+ (toucan-name "Bird Can")
+ (string? (settings-last-updated-value-in-cache))))
+
+;; ...and if I update it again, will the value be updated?
+(expect
+ (do
+ (clear-settings-last-updated-value-in-db!)
+ (toucan-name "Bird Can")
+ (let [first-value (settings-last-updated-value-in-db)]
+ ;; MySQL only has the resolution of one second on the timestamps here so we should wait that long to make sure
+ ;; the second-value actually ends up being greater than the first
+ (Thread/sleep 1200)
+ (toucan-name "Bird Can")
+ (let [second-value (settings-last-updated-value-in-db)]
+ ;; first & second values should be different, and first value should be "less than" the second value
+ (and (not= first-value second-value)
+ (neg? (compare first-value second-value)))))))
+
+;; If there is no cache, it should be considered out of date!`
+(expect
+ (do
+ (clear-cache!)
+ (#'setting/cache-out-of-date?)))
+
+;; But if I set a setting, it should cause the cache to be populated, and be up-to-date
+(expect
+ false
+ (do
+ (clear-cache!)
+ (toucan-name "Reggae Toucan")
+ (#'setting/cache-out-of-date?)))
+
+;; If another instance updates a Setting, `cache-out-of-date?` should return `true` based on DB comparisons...
+;; be true!
+(expect
+ (do
+ (clear-cache!)
+ (toucan-name "Reggae Toucan")
+ (simulate-another-instance-updating-setting! :toucan-name "Bird Can")
+ (#'setting/cache-out-of-date?)))
+
+;; of course, `restore-cache-if-needed!` should use TTL memoization, and the cache should not get updated right away
+;; even if another instance updates a value...
+(expect
+ "Sam"
+ (do
+ (flush-memoized-results-for-should-restore-cache!)
+ (clear-cache!)
+ (toucan-name "Sam") ; should restore cache, and put in {"toucan-name" "Sam"}
+ ;; since we cleared the memoized value of `should-restore-cache?` call it again to make sure it gets set to
+ ;; `false` as it would IRL if we were calling it again from the same instance
+ (#'setting/should-restore-cache?)
+ ;; now have another instance change the value
+ (simulate-another-instance-updating-setting! :toucan-name "Bird Can")
+ ;; our cache should not be updated yet because it's on a TTL
+ (toucan-name)))
+
+;; ...and when it comes time to check our cache for updating (when calling `restore-cache-if-needed!`, it should get
+;; the updated value. (we're not actually going to wait a minute for the memoized values of `should-restore-cache?` to
+;; be invalidated, so we will manually flush the memoization cache to simulate it happening)
+(expect
+ "Bird Can"
+ (do
+ (clear-cache!)
+ (toucan-name "Reggae Toucan")
+ (simulate-another-instance-updating-setting! :toucan-name "Bird Can")
+ (flush-memoized-results-for-should-restore-cache!)
+ ;; calling `toucan-name` will call `restore-cache-if-needed!`, which will in turn call `should-restore-cache?`.
+ ;; Since memoized value is no longer present, this should call `cache-out-of-date?`, which checks the DB; it will
+ ;; detect a cache out-of-date situation and flush the cache as appropriate, giving us the updated value when we
+ ;; call! :wow:
+ (toucan-name)))
diff --git a/test/metabase/models/user_test.clj b/test/metabase/models/user_test.clj
index 8570ae119f17fe50ed543ae178077d0086a706df..26e67a8e4841172634c2c88c03e8f207d2dc93b8 100644
--- a/test/metabase/models/user_test.clj
+++ b/test/metabase/models/user_test.clj
@@ -12,6 +12,7 @@
[user :as user :refer [User]]]
[metabase.test.data.users :as test-users :refer [user->id]]
[metabase.test.util :as tu]
+ [metabase.util.password :as upass]
[toucan.db :as db]
[toucan.util.test :as tt]))
@@ -162,3 +163,17 @@
(test-users/delete-temp-users!)
(tt/with-temp User [_ {:is_superuser true, :is_active false}]
(invite-user-accept-and-check-inboxes! :google-auth? true))))
+
+;; LDAP users should not persist their passwords. Check that if somehow we get passed an LDAP user password, it gets
+;; swapped with something random
+(expect
+ false
+ (try
+ (user/create-new-ldap-auth-user! {:email "ldaptest@metabase.com"
+ :first_name "Test"
+ :last_name "SomeLdapStuff"
+ :password "should be removed"})
+ (let [{:keys [password password_salt]} (db/select-one [User :password :password_salt] :email "ldaptest@metabase.com")]
+ (upass/verify-password "should be removed" password_salt password))
+ (finally
+ (db/delete! User :email "ldaptest@metabase.com"))))
diff --git a/test/metabase/query_processor/middleware/parameters/sql_test.clj b/test/metabase/query_processor/middleware/parameters/sql_test.clj
index 89c895a33be731c4c61a8de7de45cb1c402d08fc..bb775402c848cce48776b47684b51bf133edecf1 100644
--- a/test/metabase/query_processor/middleware/parameters/sql_test.clj
+++ b/test/metabase/query_processor/middleware/parameters/sql_test.clj
@@ -532,7 +532,7 @@
;; HACK ! I don't have all day to write protocol methods to make this work the "right" way so for BigQuery and
;; Presto we will just hackily return the correct identifier here
(case datasets/*engine*
- :bigquery "[test_data.checkins]"
+ :bigquery "`test_data.checkins`"
:presto "\"default\".\"checkins\""
(let [{table-name :name, schema :schema} (db/select-one ['Table :name :schema], :id (data/id :checkins))]
(str (when (seq schema)
diff --git a/test/metabase/query_processor/util_test.clj b/test/metabase/query_processor/util_test.clj
index 1bb0c29a9fc28564ba54cdb65c574fd007af6a84..d44d27d0ef6d0309328493d4a14fecaf2162e26a 100644
--- a/test/metabase/query_processor/util_test.clj
+++ b/test/metabase/query_processor/util_test.clj
@@ -167,3 +167,43 @@
(expect
nil
(qputil/dissoc-normalized nil :num-toucans))
+
+(defrecord ^:private TestRecord1 [x])
+(defrecord ^:private TestRecord2 [x])
+
+(def ^:private test-tree
+ {:a {:aa (TestRecord1. 1)
+ :ab (TestRecord2. 1)}
+ :b (TestRecord1. 1)
+ :c (TestRecord2. 1)
+ :d [1 2 3 4]})
+
+;; Test that we can change only the items matching the `instance?` predicate
+(expect
+ (-> test-tree
+ (update-in [:a :aa :x] inc)
+ (update-in [:b :x] inc))
+ (qputil/postwalk-pred #(instance? TestRecord1 %)
+ #(update % :x inc)
+ test-tree))
+
+;; If nothing matches, the original tree should be returned
+(expect
+ test-tree
+ (qputil/postwalk-pred set?
+ #(set (map inc %))
+ test-tree))
+
+;; We should be able to collect items matching the predicate
+(expect
+ [(TestRecord1. 1) (TestRecord1. 1)]
+ (qputil/postwalk-collect #(instance? TestRecord1 %)
+ identity
+ test-tree))
+
+;; Not finding any of the items should just return an empty seq
+(expect
+ []
+ (qputil/postwalk-collect set?
+ identity
+ test-tree))
diff --git a/test/metabase/query_processor_test.clj b/test/metabase/query_processor_test.clj
index 043c57f84fea12e266c752758511f8e1a0802975..cf013509dd781e233168f07152a37ae97a74f95f 100644
--- a/test/metabase/query_processor_test.clj
+++ b/test/metabase/query_processor_test.clj
@@ -314,7 +314,8 @@
(format-rows-by format-fns (not :format-nil-values?) rows))
([format-fns format-nil-values? rows]
(cond
- (= (:status rows) :failed) (throw (ex-info (:error rows) rows))
+ (= (:status rows) :failed) (do (println "Error running query:" (u/pprint-to-str 'red rows))
+ (throw (ex-info (:error rows) rows)))
(:data rows) (update-in rows [:data :rows] (partial format-rows-by format-fns))
(:rows rows) (update rows :rows (partial format-rows-by format-fns))
diff --git a/test/metabase/query_processor_test/date_bucketing_test.clj b/test/metabase/query_processor_test/date_bucketing_test.clj
index 8151678a19c39c0418d85214f7c229d840147150..fa7b19e624aa27fadbb8d2e88a8ff81382143ecd 100644
--- a/test/metabase/query_processor_test/date_bucketing_test.clj
+++ b/test/metabase/query_processor_test/date_bucketing_test.clj
@@ -15,33 +15,24 @@
[dataset-definitions :as defs]
[datasets :as datasets :refer [*driver* *engine*]]
[interface :as i]])
- (:import java.util.TimeZone
- [org.joda.time DateTime DateTimeZone]))
-
-;; The below tests cover the various date bucketing/grouping scenarios
-;; that we support. There are are always two timezones in play when
-;; querying using these date bucketing features. The most visible is
-;; how timestamps are returned to the user. With no report timezone
-;; specified, the JVM's timezone is used to represent the timestamps
-;; regardless of timezone of the database. Specifying a report
-;; timezone (if the database supports it) will return the timestamps
-;; in that timezone (manifesting itself as an offset for that
-;; time). Using the JVM timezone that doesn't match the database
-;; timezone (assuming the database doesn't support a report timezone)
-;; can lead to incorrect results.
-;;
-;; The second place timezones can impact this is calculations in the
-;; database. A good example of this is grouping something by day. In
-;; that case, the start (or end) of the day will be different
-;; depending on what timezone the database is in. The start of the day
-;; in pacific time is 7 (or 8) hours earlier than UTC. This means
-;; there might be a different number of results depending on what
-;; timezone we're in. Report timezone lets the user specify that, and
-;; it gets pushed into the database so calculations are made in that
-;; timezone.
-;;
-;; If a report timezone is specified and the database supports it, the
-;; JVM timezone should have no impact on queries or their results.
+ (:import org.joda.time.DateTime))
+
+;; The below tests cover the various date bucketing/grouping scenarios that we support. There are are always two
+;; timezones in play when querying using these date bucketing features. The most visible is how timestamps are
+;; returned to the user. With no report timezone specified, the JVM's timezone is used to represent the timestamps
+;; regardless of timezone of the database. Specifying a report timezone (if the database supports it) will return the
+;; timestamps in that timezone (manifesting itself as an offset for that time). Using the JVM timezone that doesn't
+;; match the database timezone (assuming the database doesn't support a report timezone) can lead to incorrect
+;; results.
+;;
+;; The second place timezones can impact this is calculations in the database. A good example of this is grouping
+;; something by day. In that case, the start (or end) of the day will be different depending on what timezone the
+;; database is in. The start of the day in pacific time is 7 (or 8) hours earlier than UTC. This means there might be
+;; a different number of results depending on what timezone we're in. Report timezone lets the user specify that, and
+;; it gets pushed into the database so calculations are made in that timezone.
+;;
+;; If a report timezone is specified and the database supports it, the JVM timezone should have no impact on queries
+;; or their results.
(defn- ->long-if-number [x]
(if (number? x)
@@ -49,12 +40,10 @@
x))
(defn- oracle-or-redshift?
- "We currently have a bug in how report-timezone is used in
- Oracle. The timeone is applied correctly, but the date operations
- that we use aren't using that timezone. It's written up as
- https://github.com/metabase/metabase/issues/5789. This function is
- used to differentiate Oracle from the other report-timezone
- databases until that bug can get fixed. Redshift also has this issue."
+ "We currently have a bug in how report-timezone is used in Oracle. The timeone is applied correctly, but the date
+ operations that we use aren't using that timezone. It's written up as
+ https://github.com/metabase/metabase/issues/5789. This function is used to differentiate Oracle from the other
+ report-timezone databases until that bug can get fixed. Redshift also has this issue."
[engine]
(contains? #{:oracle :redshift} engine))
@@ -82,28 +71,25 @@
(def ^:private utc-tz (time/time-zone-for-id "UTC"))
(defn- source-date-formatter
- "Create a date formatter, interpretting the datestring as being in `TZ`"
+ "Create a date formatter, interpretting the datestring as being in `tz`"
[tz]
(tformat/with-zone (tformat/formatters :date-hour-minute-second-fraction) tz))
(defn- result-date-formatter
- "Create a formatter for converting a date to `TZ` and in the format
- that the query processor would return"
+ "Create a formatter for converting a date to `tz` and in the format that the query processor would return"
[tz]
(tformat/with-zone (tformat/formatters :date-time) tz))
(def ^:private result-date-formatter-without-tz
- "sqlite and crate return date strings that do not include their
- timezone, this formatter is useful for those DBs"
+ "sqlite and crate return date strings that do not include their timezone, this formatter is useful for those DBs"
(tformat/formatters :mysql))
(def ^:private date-formatter-without-time
- "sqlite and crate return dates that do not include their time, this
- formatter is useful for those DBs"
+ "sqlite and crate return dates that do not include their time, this formatter is useful for those DBs"
(tformat/formatters :date))
(defn- adjust-date
- "Parses `DATES` using `SOURCE-FORMATTER` and convert them to a string via `RESULT-FORMATTER`"
+ "Parses `dates` using `source-formatter` and convert them to a string via `result-formatter`"
[source-formatter result-formatter dates]
(map (comp #(tformat/unparse result-formatter %)
#(tformat/parse source-formatter %))
@@ -116,11 +102,9 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(def ^:private sad-toucan-dates
- "This is the first 10 sad toucan dates when converted from millis
- since epoch in the UTC timezone. The timezone is left off of the
- timezone string so that we can emulate how certain conversions work
- in the code today. As an example, the UTC dates in Oracle are
- interpreted as the reporting timezone when they're UTC"
+ "This is the first 10 sad toucan dates when converted from millis since epoch in the UTC timezone. The timezone is
+ left off of the timezone string so that we can emulate how certain conversions work in the code today. As an
+ example, the UTC dates in Oracle are interpreted as the reporting timezone when they're UTC"
["2015-06-01T10:31:00.000"
"2015-06-01T16:06:00.000"
"2015-06-01T17:23:00.000"
@@ -133,8 +117,8 @@
"2015-06-02T11:11:00.000"])
(defn- sad-toucan-result
- "Creates a sad toucan resultset using the given `SOURCE-FORMATTER`
- and `RESULT-FORMATTER`. Pairs the dates with the record counts."
+ "Creates a sad toucan resultset using the given `source-formatter` and `result-formatter`. Pairs the dates with the
+ record counts."
[source-formatter result-formatter]
(mapv vector
(adjust-date source-formatter result-formatter sad-toucan-dates)
@@ -155,8 +139,8 @@
(supports-report-timezone? *engine*)
(sad-toucan-result (source-date-formatter utc-tz) (result-date-formatter pacific-tz))
- ;; Databases that don't support report timezone will always return the time using the JVM's timezone setting
- ;; Our tests force UTC time, so this should always be UTC
+ ;; Databases that don't support report timezone will always return the time using the JVM's timezone setting Our
+ ;; tests force UTC time, so this should always be UTC
:else
(sad-toucan-result (source-date-formatter utc-tz) (result-date-formatter utc-tz)))
(sad-toucan-incidents-with-bucketing :default pacific-tz))
@@ -181,14 +165,12 @@
(sad-toucan-incidents-with-bucketing :default eastern-tz))
-;; Changes the JVM timezone from UTC to Pacific, this test isn't run
-;; on H2 as the database stores it's timezones in the JVM timezone
-;; (UTC on startup). When we change that timezone, it then assumes the
-;; data was also stored in that timezone. This leads to incorrect
-;; results. In this example it applies the pacific offset twice
+;; Changes the JVM timezone from UTC to Pacific, this test isn't run on H2 as the database stores it's timezones in
+;; the JVM timezone (UTC on startup). When we change that timezone, it then assumes the data was also stored in that
+;; timezone. This leads to incorrect results. In this example it applies the pacific offset twice
;;
-;; The exclusions here are databases that give incorrect answers when
-;; the JVM timezone doesn't match the databases timezone
+;; The exclusions here are databases that give incorrect answers when the JVM timezone doesn't match the databases
+;; timezone
(expect-with-non-timeseries-dbs-except #{:h2 :sqlserver :redshift :sparksql :mongo}
(cond
(contains? #{:sqlite :crate} *engine*)
@@ -213,8 +195,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; This dataset doesn't have multiple events in a minute, the results
-;; are the same as the default grouping
+;; This dataset doesn't have multiple events in a minute, the results are the same as the default grouping
(expect-with-non-timeseries-dbs
(cond
(contains? #{:sqlite :crate} *engine*)
@@ -251,12 +232,10 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(def ^:private sad-toucan-dates-grouped-by-hour
- "This is the first 10 groupings of sad toucan dates at the same hour
- when converted from millis since epoch in the UTC timezone. The
- timezone is left off of the timezone string so that we can emulate
- how certain conversions are broken in the code today. As an example,
- the UTC dates in Oracle are interpreted as the reporting timezone
- when they're UTC"
+ "This is the first 10 groupings of sad toucan dates at the same hour when converted from millis since epoch in the UTC
+ timezone. The timezone is left off of the timezone string so that we can emulate how certain conversions are broken
+ in the code today. As an example, the UTC dates in Oracle are interpreted as the reporting timezone when they're
+ UTC"
["2015-06-01T10:00:00.000"
"2015-06-01T16:00:00.000"
"2015-06-01T17:00:00.000"
@@ -269,8 +248,8 @@
"2015-06-02T13:00:00.000"])
(defn- results-by-hour
- "Creates a sad toucan resultset using the given `SOURCE-FORMATTER`
- and `RESULT-FORMATTER`. Pairs the dates with the the record counts"
+ "Creates a sad toucan resultset using the given `source-formatter` and `result-formatter`. Pairs the dates with the
+ the record counts"
[source-formatter result-formatter]
(mapv vector
(adjust-date source-formatter result-formatter sad-toucan-dates-grouped-by-hour)
@@ -326,14 +305,14 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defn- offset-time
- "Add to `DATE` offset from UTC found in `TZ`"
+ "Add to `date` offset from UTC found in `tz`"
[tz date]
(time/minus date
(time/seconds
(/ (.getOffset tz date) 1000))))
(defn- find-events-in-range
- "Find the number of sad toucan events between `START-DATE-STR` and `END-DATE-STR`"
+ "Find the number of sad toucan events between `start-date-str` and `end-date-str`"
[start-date-str end-date-str]
(-> (data/with-db (data/get-or-create-database! defs/sad-toucan-incidents)
(data/run-query incidents
@@ -349,10 +328,8 @@
(or 0)))
(defn- new-events-after-tz-shift
- "Given a `DATE-STR` and a `TZ`, how many new events would appear if
- the time were shifted by the offset in `TZ`. This function is useful
- for figuring out what the counts would be if the database was in
- that timezone"
+ "Given a `date-str` and a `tz`, how many new events would appear if the time were shifted by the offset in `tz`. This
+ function is useful for figuring out what the counts would be if the database was in that timezone"
[date-str tz]
(let [date-obj (tformat/parse (tformat/formatters :date) date-str)
next-day (time/plus date-obj (time/days 1))
@@ -389,9 +366,8 @@
"2015-06-10"])
(defn- results-by-day
- "Creates a sad toucan resultset using the given `SOURCE-FORMATTER`
- and `RESULT-FORMATTER`. Pairs the dates with the record counts
- supplied in `COUNTS`"
+ "Creates a sad toucan resultset using the given `source-formatter` and `result-formatter`. Pairs the dates with the
+ record counts supplied in `counts`"
[source-formatter result-formatter counts]
(mapv vector
(adjust-date source-formatter result-formatter sad-toucan-events-grouped-by-day)
@@ -465,18 +441,15 @@
(sad-toucan-incidents-with-bucketing :day eastern-tz))
-;; This tests out the JVM timezone's impact on the results. For
-;; databases supporting a report timezone, this should have no affect
-;; on the results. When no report timezone is used it should convert
-;; dates to the JVM's timezone
+;; This tests out the JVM timezone's impact on the results. For databases supporting a report timezone, this should
+;; have no affect on the results. When no report timezone is used it should convert dates to the JVM's timezone
;;
-;; H2 doesn't support us switching timezones after the dates have been
-;; stored. This causes H2 to (incorrectly) apply the timezone shift
-;; twice, so instead of -07:00 it will become -14:00. Leaving out the
-;; test rather than validate wrong results.
+;; H2 doesn't support us switching timezones after the dates have been stored. This causes H2 to (incorrectly) apply
+;; the timezone shift twice, so instead of -07:00 it will become -14:00. Leaving out the test rather than validate
+;; wrong results.
;;
-;; The exclusions here are databases that give incorrect answers when
-;; the JVM timezone doesn't match the databases timezone
+;; The exclusions here are databases that give incorrect answers when the JVM timezone doesn't match the databases
+;; timezone
(expect-with-non-timeseries-dbs-except #{:h2 :sqlserver :redshift :sparksql :mongo}
(cond
(contains? #{:sqlite :crate} *engine*)
@@ -560,9 +533,8 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defn- results-by-week
- "Creates a sad toucan resultset using the given `SOURCE-FORMATTER`
- and `RESULT-FORMATTER`. Pairs the dates with the record counts
- supplied in `COUNTS`"
+ "Creates a sad toucan resultset using the given `source-formatter` and `result-formatter`. Pairs the dates with the
+ record counts supplied in `counts`"
[source-formatter result-formatter counts]
(mapv vector
(adjust-date source-formatter result-formatter ["2015-05-31"
@@ -584,7 +556,7 @@
(sad-toucan-incidents-with-bucketing :week utc-tz))
(defn- new-weekly-events-after-tz-shift
- "Finds the change in sad toucan events if the timezone is shifted to `TZ`"
+ "Finds the change in sad toucan events if the timezone is shifted to `tz`"
[date-str tz]
(let [date-obj (tformat/parse (tformat/formatters :date) date-str)
next-week (time/plus date-obj (time/days 7))
@@ -595,21 +567,18 @@
;; Subtract the number of events that we will loose with the timezone shift
(find-events-in-range (unparse-utc date-obj) (unparse-utc (offset-time tz date-obj))))))
-;; This test helps in debugging why event counts change with a given
-;; timezone. It queries only a UTC H2 datatabase to find how those
-;; counts would change if time was in pacific time. The results of
-;; this test are also in the UTC test above and pacific test below,
-;; but this is still useful for debugging as it doesn't involve changing
-;; timezones or database settings
+;; This test helps in debugging why event counts change with a given timezone. It queries only a UTC H2 datatabase to
+;; find how those counts would change if time was in pacific time. The results of this test are also in the UTC test
+;; above and pacific test below, but this is still useful for debugging as it doesn't involve changing timezones or
+;; database settings
(datasets/expect-with-engines #{:h2}
[3 0 -1 -2 0]
(map #(new-weekly-events-after-tz-shift % pacific-tz)
["2015-05-31" "2015-06-07" "2015-06-14" "2015-06-21" "2015-06-28"]))
-;; Sad toucan incidents by week. Databases in UTC that don't support
-;; report timezones will be the same as the UTC test above. Databases
-;; that support report timezone will have different counts as the week
-;; starts and ends 7 hours earlier
+;; Sad toucan incidents by week. Databases in UTC that don't support report timezones will be the same as the UTC test
+;; above. Databases that support report timezone will have different counts as the week starts and ends 7 hours
+;; earlier
(expect-with-non-timeseries-dbs
(cond
(contains? #{:sqlite :crate} *engine*)
@@ -634,16 +603,14 @@
(sad-toucan-incidents-with-bucketing :week pacific-tz))
-;; Similar to above this test finds the difference in event counts for
-;; each week if we were in the eastern timezone
+;; Similar to above this test finds the difference in event counts for each week if we were in the eastern timezone
(datasets/expect-with-engines #{:h2}
[1 1 -1 -1 0]
(map #(new-weekly-events-after-tz-shift % eastern-tz)
["2015-05-31" "2015-06-07" "2015-06-14" "2015-06-21" "2015-06-28"]))
-;; Tests eastern timezone grouping by week, UTC databases don't
-;; change, databases with reporting timezones need to account for the
-;; 4-5 hour difference
+;; Tests eastern timezone grouping by week, UTC databases don't change, databases with reporting timezones need to
+;; account for the 4-5 hour difference
(expect-with-non-timeseries-dbs
(cond
(contains? #{:sqlite :crate} *engine*)
@@ -668,12 +635,11 @@
(sad-toucan-incidents-with-bucketing :week eastern-tz))
-;; Setting the JVM timezone will change how the datetime results are
-;; displayed but don't impact the calculation of the begin/end of the
-;; week
+;; Setting the JVM timezone will change how the datetime results are displayed but don't impact the calculation of the
+;; begin/end of the week
;;
-;; The exclusions here are databases that give incorrect answers when
-;; the JVM timezone doesn't match the databases timezone
+;; The exclusions here are databases that give incorrect answers when the JVM timezone doesn't match the databases
+;; timezone
(expect-with-non-timeseries-dbs-except #{:h2 :sqlserver :redshift :sparksql :mongo}
(cond
(contains? #{:sqlite :crate} *engine*)
@@ -725,10 +691,8 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; All of the sad toucan events in the test data fit in June. The
-;; results are the same on all databases and the only difference is
-;; how the beginning of hte month is represented, since we always
-;; return times with our dates
+;; All of the sad toucan events in the test data fit in June. The results are the same on all databases and the only
+;; difference is how the beginning of hte month is represented, since we always return times with our dates
(expect-with-non-timeseries-dbs
[[(cond
(contains? #{:sqlite :crate} *engine*)
@@ -846,11 +810,12 @@
(apply ql/relative-datetime relative-datetime-args)))))
first-row first int))
-;; HACK - Don't run these tests against BigQuery because the databases need to be loaded every time the tests are ran and loading data into BigQuery is mind-bogglingly slow.
-;; Don't worry, I promise these work though!
+;; HACK - Don't run these tests against BigQuery because the databases need to be loaded every time the tests are ran
+;; and loading data into BigQuery is mind-bogglingly slow. Don't worry, I promise these work though!
-;; Don't run the minute tests against Oracle because the Oracle tests are kind of slow and case CI to fail randomly when it takes so long to load the data that the times are
-;; no longer current (these tests pass locally if your machine isn't as slow as the CircleCI ones)
+;; Don't run the minute tests against Oracle because the Oracle tests are kind of slow and case CI to fail randomly
+;; when it takes so long to load the data that the times are no longer current (these tests pass locally if your
+;; machine isn't as slow as the CircleCI ones)
(expect-with-non-timeseries-dbs-except #{:bigquery :oracle} 4 (count-of-grouping (checkins:4-per-minute) :minute "current"))
(expect-with-non-timeseries-dbs-except #{:bigquery :oracle} 4 (count-of-grouping (checkins:4-per-minute) :minute -1 "minute"))
@@ -883,10 +848,9 @@
(ql/filter (ql/time-interval $timestamp :last :week))))
first-row first int))
-;; Make sure that when referencing the same field multiple times with different units we return the one
-;; that actually reflects the units the results are in.
-;; eg when we breakout by one unit and filter by another, make sure the results and the col info
-;; use the unit used by breakout
+;; Make sure that when referencing the same field multiple times with different units we return the one that actually
+;; reflects the units the results are in. eg when we breakout by one unit and filter by another, make sure the results
+;; and the col info use the unit used by breakout
(defn- date-bucketing-unit-when-you [& {:keys [breakout-by filter-by with-interval]
:or {with-interval :current}}]
(let [results (data/with-temp-db [_ (checkins:1-per-day)]
@@ -918,7 +882,8 @@
{:rows 1, :unit :hour}
(date-bucketing-unit-when-you :breakout-by "hour", :filter-by "day"))
-;; make sure if you use a relative date bucket in the past (e.g. "past 2 months") you get the correct amount of rows (#3910)
+;; make sure if you use a relative date bucket in the past (e.g. "past 2 months") you get the correct amount of rows
+;; (#3910)
(expect-with-non-timeseries-dbs-except #{:bigquery}
{:rows 2, :unit :day}
(date-bucketing-unit-when-you :breakout-by "day", :filter-by "day", :with-interval -2))
diff --git a/test/metabase/test/data/bigquery.clj b/test/metabase/test/data/bigquery.clj
index d4d87f37c8aa65b786ed30a90817e76a5b9f4980..65833494aa337e3e7fc07f67962a843943adbb4f 100644
--- a/test/metabase/test/data/bigquery.clj
+++ b/test/metabase/test/data/bigquery.clj
@@ -11,12 +11,14 @@
[datasets :as datasets]
[interface :as i]]
[metabase.util :as u]
- [metabase.util.date :as du]
- [metabase.util.schema :as su]
+ [metabase.util
+ [date :as du]
+ [schema :as su]]
[schema.core :as s])
(:import com.google.api.client.util.DateTime
com.google.api.services.bigquery.Bigquery
- [com.google.api.services.bigquery.model Dataset DatasetReference QueryRequest Table TableDataInsertAllRequest TableDataInsertAllRequest$Rows TableFieldSchema TableReference TableRow TableSchema]
+ [com.google.api.services.bigquery.model Dataset DatasetReference QueryRequest Table TableDataInsertAllRequest
+ TableDataInsertAllRequest$Rows TableFieldSchema TableReference TableRow TableSchema]
java.sql.Time
metabase.driver.bigquery.BigQueryDriver))
@@ -143,7 +145,7 @@
:type/Time :TIME})
(defn- fielddefs->field-name->base-type
- "Convert FIELD-DEFINITIONS to a format appropriate for passing to `create-table!`."
+ "Convert `field-definitions` to a format appropriate for passing to `create-table!`."
[field-definitions]
(into
{"id" :INTEGER}
@@ -153,15 +155,14 @@
(throw (Exception. (format "Don't know what BigQuery type to use for base type: %s" base-type))))})))
(defn- time->string
- "Coerces `T` to a Joda DateTime object and returns it's String
- representation."
+ "Coerces `t` to a Joda DateTime object and returns it's String representation."
[t]
(->> t
tcoerce/to-date-time
(tformat/unparse #'bigquery/bigquery-time-format)))
(defn- tabledef->prepared-rows
- "Convert TABLE-DEFINITION to a format approprate for passing to `insert-data!`."
+ "Convert `table-definition` to a format approprate for passing to `insert-data!`."
[{:keys [field-definitions rows]}]
{:pre [(every? map? field-definitions) (sequential? rows) (seq rows)]}
(let [field-names (map :field-name field-definitions)]
diff --git a/test/metabase/util/encryption_test.clj b/test/metabase/util/encryption_test.clj
index a858a6b1243f5060b8291ecc9ac9000e685d2155..026a6388ff4f6d8397b7652ea098ab706eddb507 100644
--- a/test/metabase/util/encryption_test.clj
+++ b/test/metabase/util/encryption_test.clj
@@ -5,6 +5,18 @@
[metabase.test.util :as tu]
[metabase.util.encryption :as encryption]))
+(defn do-with-secret-key [^String secret-key, f]
+ (with-redefs [encryption/default-secret-key (when (seq secret-key)
+ (encryption/secret-key->hash secret-key))]
+ (f)))
+
+(defmacro with-secret-key
+ "Run `body` with the encryption secret key temporarily bound to `secret-key`. Useful for testing how functions behave
+ with and without encryption disabled."
+ {:style/indent 1}
+ [^String secret-key, & body]
+ `(do-with-secret-key ~secret-key (fn [] ~@body)))
+
(def ^:private secret (encryption/secret-key->hash "Orw0AAyzkO/kPTLJRxiyKoBHXa/d6ZcO+p+gpZO/wSQ="))
(def ^:private secret-2 (encryption/secret-key->hash "0B9cD6++AME+A7/oR7Y2xvPRHX3cHA2z7w+LbObd/9Y="))
@@ -49,7 +61,7 @@
(expect
(some (fn [[_ _ message]]
- (str/includes? message (str "Cannot decrypt encrypted details. Have you changed or forgot to set "
+ (str/includes? message (str "Cannot decrypt encrypted credentials. Have you changed or forgot to set "
"MB_ENCRYPTION_SECRET_KEY? Message seems corrupt or manipulated.")))
(tu/with-log-messages
(encryption/maybe-decrypt secret-2 (encryption/encrypt secret "WOW")))))
diff --git a/yarn.lock b/yarn.lock
index 547b0fc686f4ae726b53368f6a22fc44fab5c5f7..6ec964bce23ceae51b6f70847afc9d88cbdf7bbb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -258,6 +258,10 @@ ansi-styles@^3.2.1:
dependencies:
color-convert "^1.9.0"
+ansi-styles@~1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178"
+
ansi-wrap@0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
@@ -458,6 +462,10 @@ assign-symbols@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+ast-types@0.11.3:
+ version "0.11.3"
+ resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.11.3.tgz#c20757fe72ee71278ea0ff3d87e5c2ca30d9edf8"
+
async-each@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
@@ -1193,7 +1201,7 @@ babel-polyfill@^6.26.0, babel-polyfill@^6.6.1:
core-js "^2.5.0"
regenerator-runtime "^0.10.5"
-babel-preset-es2015@^6.16.0, babel-preset-es2015@^6.6.0:
+babel-preset-es2015@^6.16.0, babel-preset-es2015@^6.6.0, babel-preset-es2015@^6.9.0:
version "6.24.1"
resolved "https://registry.yarnpkg.com/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz#d44050d6bc2c9feea702aaf38d727a0210538939"
dependencies:
@@ -1253,7 +1261,7 @@ babel-preset-stage-0@^6.16.0, babel-preset-stage-0@^6.5.0:
babel-plugin-transform-function-bind "^6.22.0"
babel-preset-stage-1 "^6.24.1"
-babel-preset-stage-1@^6.24.1:
+babel-preset-stage-1@^6.24.1, babel-preset-stage-1@^6.5.0:
version "6.24.1"
resolved "https://registry.yarnpkg.com/babel-preset-stage-1/-/babel-preset-stage-1-6.24.1.tgz#7692cd7dcd6849907e6ae4a0a85589cfb9e2bfb0"
dependencies:
@@ -1280,7 +1288,7 @@ babel-preset-stage-3@^6.24.1:
babel-plugin-transform-exponentiation-operator "^6.24.1"
babel-plugin-transform-object-rest-spread "^6.22.0"
-babel-register@^6.11.6, babel-register@^6.26.0:
+babel-register@^6.11.6, babel-register@^6.26.0, babel-register@^6.9.0:
version "6.26.0"
resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
dependencies:
@@ -1369,6 +1377,10 @@ babylon@^6.11.0, babylon@^6.17.0, babylon@^6.17.2, babylon@^6.18.0:
version "6.18.0"
resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
+babylon@^7.0.0-beta.30:
+ version "7.0.0-beta.47"
+ resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.47.tgz#6d1fa44f0abec41ab7c780481e62fd9aafbdea80"
+
backo2@1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
@@ -1917,6 +1929,14 @@ chalk@^2.0.1:
escape-string-regexp "^1.0.5"
supports-color "^5.3.0"
+chalk@~0.4.0:
+ version "0.4.0"
+ resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"
+ dependencies:
+ ansi-styles "~1.0.0"
+ has-color "~0.1.0"
+ strip-ansi "~0.1.0"
+
change-emitter@^0.1.2:
version "0.1.6"
resolved "https://registry.yarnpkg.com/change-emitter/-/change-emitter-0.1.6.tgz#e8b2fe3d7f1ab7d69a32199aff91ea6931409515"
@@ -2198,6 +2218,16 @@ color-convert@^1.9.1:
dependencies:
color-name "^1.1.1"
+color-diff@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/color-diff/-/color-diff-1.1.0.tgz#983ae7f936679e94e365dfe44a16aa153bdae88e"
+
+color-harmony@^0.3.0:
+ version "0.3.0"
+ resolved "https://registry.yarnpkg.com/color-harmony/-/color-harmony-0.3.0.tgz#3e19aea2e0baf6aa49563448678fec3b4f37905e"
+ dependencies:
+ onecolor "^2.5.0"
+
color-name@^1.0.0, color-name@^1.1.1:
version "1.1.3"
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
@@ -3660,7 +3690,7 @@ esprima@^3.1.3:
version "3.1.3"
resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
-esprima@^4.0.0:
+esprima@^4.0.0, esprima@~4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
@@ -4065,6 +4095,10 @@ flow-bin@^0.37.4:
version "0.37.4"
resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.37.4.tgz#3d8da2ef746e80e730d166e09040f4198969b76b"
+flow-parser@^0.*:
+ version "0.75.0"
+ resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.75.0.tgz#9a1891c48051c73017b6b5cc07b3681fda3fdfb0"
+
flush-write-stream@^1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.2.tgz#c81b90d8746766f1a609a46809946c45dd8ae417"
@@ -4582,6 +4616,10 @@ has-binary@0.1.7:
dependencies:
isarray "0.0.1"
+has-color@~0.1.0:
+ version "0.1.7"
+ resolved "https://registry.yarnpkg.com/has-color/-/has-color-0.1.7.tgz#67144a5260c34fc3cca677d041daf52fe7b78b2f"
+
has-cors@1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
@@ -5902,6 +5940,26 @@ jsbn@~0.1.0:
version "0.1.1"
resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+jscodeshift@0.5.0:
+ version "0.5.0"
+ resolved "https://registry.yarnpkg.com/jscodeshift/-/jscodeshift-0.5.0.tgz#bdb7b6cc20dd62c16aa728c3fa2d2fe66ca7c748"
+ dependencies:
+ babel-plugin-transform-flow-strip-types "^6.8.0"
+ babel-preset-es2015 "^6.9.0"
+ babel-preset-stage-1 "^6.5.0"
+ babel-register "^6.9.0"
+ babylon "^7.0.0-beta.30"
+ colors "^1.1.2"
+ flow-parser "^0.*"
+ lodash "^4.13.1"
+ micromatch "^2.3.7"
+ neo-async "^2.5.0"
+ node-dir "0.1.8"
+ nomnom "^1.8.1"
+ recast "^0.14.1"
+ temp "^0.8.1"
+ write-file-atomic "^1.2.0"
+
jsdom@^9.11.0:
version "9.12.0"
resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-9.12.0.tgz#e8c546fffcb06c00d4833ca84410fed7f8a097d4"
@@ -7126,6 +7184,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"
+
next-tick@1:
version "1.0.0"
resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
@@ -7140,6 +7202,10 @@ no-case@^2.2.0:
dependencies:
lower-case "^1.1.1"
+node-dir@0.1.8:
+ version "0.1.8"
+ resolved "https://registry.yarnpkg.com/node-dir/-/node-dir-0.1.8.tgz#55fb8deb699070707fb67f91a460f0448294c77d"
+
node-fetch-npm@^2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz#7258c9046182dca345b4208eda918daf33697ff7"
@@ -7238,6 +7304,13 @@ node-uuid@~1.4.7:
version "1.4.8"
resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907"
+nomnom@^1.8.1:
+ version "1.8.1"
+ resolved "https://registry.yarnpkg.com/nomnom/-/nomnom-1.8.1.tgz#2151f722472ba79e50a76fc125bb8c8f2e4dc2a7"
+ dependencies:
+ chalk "~0.4.0"
+ underscore "~1.6.0"
+
"nopt@2 || 3":
version "3.0.6"
resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
@@ -7658,6 +7731,10 @@ once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0, once@~1.4.0:
dependencies:
wrappy "1"
+onecolor@^2.5.0:
+ version "2.5.0"
+ resolved "https://registry.yarnpkg.com/onecolor/-/onecolor-2.5.0.tgz#2256b651dc807c101f00aedbd49925c57a4431c1"
+
onecolor@~2.4.0:
version "2.4.2"
resolved "https://registry.yarnpkg.com/onecolor/-/onecolor-2.4.2.tgz#a53ec3ff171c3446016dd5210d1a1b544bf7d874"
@@ -8653,7 +8730,7 @@ pretty-format@^19.0.0:
dependencies:
ansi-styles "^3.0.0"
-private@^0.1.6, private@^0.1.7:
+private@^0.1.6, private@^0.1.7, private@~0.1.5:
version "0.1.8"
resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
@@ -9322,6 +9399,15 @@ readline2@^1.0.1:
is-fullwidth-code-point "^1.0.0"
mute-stream "0.0.5"
+recast@^0.14.1:
+ version "0.14.7"
+ resolved "https://registry.yarnpkg.com/recast/-/recast-0.14.7.tgz#4f1497c2b5826d42a66e8e3c9d80c512983ff61d"
+ dependencies:
+ ast-types "0.11.3"
+ esprima "~4.0.0"
+ private "~0.1.5"
+ source-map "~0.6.1"
+
rechoir@^0.6.2:
version "0.6.2"
resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
@@ -9831,6 +9917,10 @@ rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.
dependencies:
glob "^7.0.5"
+rimraf@~2.2.6:
+ version "2.2.8"
+ resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582"
+
ripemd160@^2.0.0, ripemd160@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.1.tgz#0f4584295c53a3628af7e6d79aca21ce57d1c6e7"
@@ -10114,7 +10204,7 @@ slice-ansi@0.0.4:
version "0.0.4"
resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
-slide@^1.1.3, slide@^1.1.6, slide@~1.1.3, slide@~1.1.6:
+slide@^1.1.3, slide@^1.1.5, slide@^1.1.6, slide@~1.1.3, slide@~1.1.6:
version "1.1.6"
resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
@@ -10545,6 +10635,10 @@ strip-ansi@^4.0.0, strip-ansi@~4.0.0:
dependencies:
ansi-regex "^3.0.0"
+strip-ansi@~0.1.0:
+ version "0.1.1"
+ resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.1.1.tgz#39e8a98d044d150660abe4a6808acf70bb7bc991"
+
strip-bom-stream@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz#e7144398577d51a6bed0fa1994fa05f43fd988ee"
@@ -10748,6 +10842,13 @@ tar@^4.4.0:
safe-buffer "^5.1.1"
yallist "^3.0.2"
+temp@^0.8.1:
+ version "0.8.3"
+ resolved "https://registry.yarnpkg.com/temp/-/temp-0.8.3.tgz#e0c6bc4d26b903124410e4fed81103014dfc1f59"
+ dependencies:
+ os-tmpdir "^1.0.0"
+ rimraf "~2.2.6"
+
term-size@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69"
@@ -11083,6 +11184,10 @@ underscore@^1.8.3:
version "1.8.3"
resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"
+underscore@~1.6.0:
+ version "1.6.0"
+ resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8"
+
underscore@~1.7.0:
version "1.7.0"
resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.7.0.tgz#6bbaf0877500d36be34ecaa584e0db9fef035209"
@@ -11737,6 +11842,14 @@ wrappy@1, wrappy@~1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+write-file-atomic@^1.2.0:
+ version "1.3.4"
+ resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-1.3.4.tgz#f807a4f0b1d9e913ae7a48112e6cc3af1991b45f"
+ dependencies:
+ graceful-fs "^4.1.11"
+ imurmurhash "^0.1.4"
+ slide "^1.1.5"
+
write-file-atomic@^2.0.0, write-file-atomic@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab"