Skip to content

Commit

Permalink
Merge branch 'master' into bugfix/freshInstallCorpUserError
Browse files Browse the repository at this point in the history
  • Loading branch information
@RyanHolstien
RyanHolstien committed Feb 16, 2022
2 parents 0a40962 + d17f2bf commit ae71846
Show file tree
Hide file tree
Showing 5 changed files with 104 additions and 64 deletions.
11 changes: 11 additions & 0 deletions datahub-web-react/craco.config.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
require('dotenv').config();
const CracoAntDesignPlugin = require('craco-antd');
const path = require('path');
const CopyWebpackPlugin = require('copy-webpack-plugin');

const themeConfig = require(`./src/conf/theme/${process.env.REACT_APP_THEME_CONFIG}`);

Expand All @@ -13,6 +14,16 @@ function addLessPrefixToKeys(styles) {
}

module.exports = {
webpack: {
plugins: {
add: [
// Self host images by copying them to the build directory
new CopyWebpackPlugin({
patterns: [{ from: 'src/images', to: 'platforms' }],
}),
],
},
},
plugins: [
{
plugin: CracoAntDesignPlugin,
Expand Down
1 change: 1 addition & 0 deletions datahub-web-react/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@
"@typescript-eslint/eslint-plugin": "^4.25.0",
"@typescript-eslint/parser": "^4.25.0",
"babel-loader": "8.2.2",
"copy-webpack-plugin": "6.4.1",
"eslint": "^7.27.0",
"eslint-config-airbnb-typescript": "^12.3.1",
"eslint-config-prettier": "^8.3.0",
Expand Down
32 changes: 30 additions & 2 deletions datahub-web-react/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5900,6 +5900,23 @@ copy-to-clipboard@^3.2.0:
dependencies:
toggle-selection "^1.0.6"

copy-webpack-plugin@6.4.1:
version "6.4.1"
resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-6.4.1.tgz#138cd9b436dbca0a6d071720d5414848992ec47e"
integrity sha512-MXyPCjdPVx5iiWyl40Va3JGh27bKzOTNY3NjUTrosD2q7dR/cLD0013uqJ3BpFbUjyONINjb6qI7nDIJujrMbA==
dependencies:
cacache "^15.0.5"
fast-glob "^3.2.4"
find-cache-dir "^3.3.1"
glob-parent "^5.1.1"
globby "^11.0.1"
loader-utils "^2.0.0"
normalize-path "^3.0.0"
p-limit "^3.0.2"
schema-utils "^3.0.0"
serialize-javascript "^5.0.1"
webpack-sources "^1.4.3"

core-js-compat@^3.6.2, core-js-compat@^3.9.0, core-js-compat@^3.9.1:
version "3.13.0"
resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.13.0.tgz#a88f5fa81d8e9b15d7f98abc4447a4dfca2a358f"
Expand Down Expand Up @@ -7775,6 +7792,17 @@ fast-glob@^3.1.1:
micromatch "^4.0.2"
picomatch "^2.2.1"

fast-glob@^3.2.4:
version "3.2.11"
resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9"
integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==
dependencies:
"@nodelib/fs.stat" "^2.0.2"
"@nodelib/fs.walk" "^1.2.3"
glob-parent "^5.1.2"
merge2 "^1.3.0"
micromatch "^4.0.4"

fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
Expand Down Expand Up @@ -8262,7 +8290,7 @@ glob-parent@^3.1.0:
is-glob "^3.1.0"
path-dirname "^1.0.0"

glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@~5.1.0:
glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@^5.1.1, glob-parent@^5.1.2, glob-parent@~5.1.0:
version "5.1.2"
resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
Expand Down Expand Up @@ -11303,7 +11331,7 @@ micromatch@^3.1.10, micromatch@^3.1.4:
snapdragon "^0.8.1"
to-regex "^3.0.2"

micromatch@^4.0.2:
micromatch@^4.0.2, micromatch@^4.0.4:
version "4.0.4"
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
Expand Down
54 changes: 27 additions & 27 deletions metadata-ingestion/examples/mce_files/data_platforms.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"name": "adlsGen1",
"displayName": "Azure Data Lake (Gen 1)",
"type": "FILE_SYSTEM",
"logoUrl": "https://raw.githubusercontent.com/linkedin/datahub/master/datahub-web-react/src/images/adlslogo.png"
"logoUrl": "/assets/platforms/adlslogo.png"
}
}
]
Expand All @@ -31,7 +31,7 @@
"name": "adlsGen2",
"displayName": "Azure Data Lake (Gen 2)",
"type": "FILE_SYSTEM",
"logoUrl": "https://raw.githubusercontent.com/linkedin/datahub/master/datahub-web-react/src/images/adlslogo.png"
"logoUrl": "/assets/platforms/adlslogo.png"
}
}
]
Expand Down Expand Up @@ -70,7 +70,7 @@
"name": "couchbase",
"displayName": "Couchbase",
"type": "KEY_VALUE_STORE",
"logoUrl": "https://raw.githubusercontent.com/linkedin/datahub/master/datahub-web-react/src/images/couchbaselogo.png"
"logoUrl": "/assets/platforms/couchbaselogo.png"
}
}
]
Expand Down Expand Up @@ -109,7 +109,7 @@
"name": "hdfs",
"displayName": "HDFS",
"type": "FILE_SYSTEM",
"logoUrl": "https://raw.githubusercontent.com/linkedin/datahub/master/datahub-web-react/src/images/hadooplogo.png"
"logoUrl": "/assets/platforms/hadooplogo.png"
}
}
]
Expand All @@ -129,7 +129,7 @@
"name": "hive",
"displayName": "Hive",
"type": "FILE_SYSTEM",
"logoUrl": "https://raw.githubusercontent.com/linkedin/datahub/master/datahub-web-react/src/images/hivelogo.png"
"logoUrl": "/assets/platforms/hivelogo.png"
}
}
]
Expand All @@ -149,7 +149,7 @@
"name": "s3",
"displayName": "AWS S3",
"type": "FILE_SYSTEM",
"logoUrl": "https://raw.githubusercontent.com/linkedin/datahub/master/datahub-web-react/src/images/s3.png"
"logoUrl": "/assets/platforms/s3.png"
}
}
]
Expand All @@ -169,7 +169,7 @@
"name": "kafka",
"displayName": "Kafka",
"type": "MESSAGE_BROKER",
"logoUrl": "https://raw.githubusercontent.com/linkedin/datahub/master/datahub-web-react/src/images/kafkalogo.png"
"logoUrl": "/assets/platforms/kafkalogo.png"
}
}
]
Expand All @@ -189,7 +189,7 @@
"name": "kusto",
"displayName": "Kusto",
"type": "OLAP_DATASTORE",
"logoUrl": "https://raw.githubusercontent.com/linkedin/datahub/master/datahub-web-react/src/images/kustologo.png"
"logoUrl": "/assets/platforms/kustologo.png"
}
}
]
Expand All @@ -209,7 +209,7 @@
"name": "mode",
"displayName": "Mode",
"type": "KEY_VALUE_STORE",
"logoUrl": "https://raw.githubusercontent.com/linkedin/datahub/master/datahub-web-react/src/images/modelogo.png"
"logoUrl": "/assets/platforms/modelogo.png"
}
}
]
Expand All @@ -229,7 +229,7 @@
"name": "mongodb",
"displayName": "MongoDB",
"type": "KEY_VALUE_STORE",
"logoUrl": "https://raw.githubusercontent.com/linkedin/datahub/master/datahub-web-react/src/images/mongodblogo.png"
"logoUrl": "/assets/platforms/mongodblogo.png"
}
}
]
Expand All @@ -249,7 +249,7 @@
"name": "mysql",
"displayName": "MySQL",
"type": "RELATIONAL_DB",
"logoUrl": "https://raw.githubusercontent.com/linkedin/datahub/master/datahub-web-react/src/images/mysqllogo.png"
"logoUrl": "/assets/platforms/mysqllogo.png"
}
}
]
Expand All @@ -269,7 +269,7 @@
"name": "oracle",
"displayName": "Oracle",
"type": "RELATIONAL_DB",
"logoUrl": "https://raw.githubusercontent.com/linkedin/datahub/master/datahub-web-react/src/images/oraclelogo.png"
"logoUrl": "/assets/platforms/oraclelogo.png"
}
}
]
Expand All @@ -289,7 +289,7 @@
"name": "pinot",
"displayName": "Pinot",
"type": "OLAP_DATASTORE",
"logoUrl": "https://raw.githubusercontent.com/linkedin/datahub/master/datahub-web-react/src/images/pinotlogo.png"
"logoUrl": "/assets/platforms/pinotlogo.png"
}
}
]
Expand All @@ -309,7 +309,7 @@
"name": "postgres",
"displayName": "PostgreSQL",
"type": "RELATIONAL_DB",
"logoUrl": "https://raw.githubusercontent.com/linkedin/datahub/master/datahub-web-react/src/images/postgreslogo.png"
"logoUrl": "/assets/platforms/postgreslogo.png"
}
}
]
Expand All @@ -329,7 +329,7 @@
"name": "presto",
"displayName": "Presto",
"type": "QUERY_ENGINE",
"logoUrl": "https://raw.githubusercontent.com/linkedin/datahub/master/datahub-web-react/src/images/prestologo.png"
"logoUrl": "/assets/platforms/prestologo.png"
}
}
]
Expand All @@ -349,7 +349,7 @@
"name": "teradata",
"displayName": "Teradata",
"type": "RELATIONAL_DB",
"logoUrl": "https://raw.githubusercontent.com/linkedin/datahub/master/datahub-web-react/src/images/teradatalogo.png"
"logoUrl": "/assets/platforms/teradatalogo.png"
}
}
]
Expand Down Expand Up @@ -388,7 +388,7 @@
"name": "snowflake",
"displayName": "Snowflake",
"type": "RELATIONAL_DB",
"logoUrl": "https://raw.githubusercontent.com/linkedin/datahub/master/datahub-web-react/src/images/snowflakelogo.png"
"logoUrl": "/assets/platforms/snowflakelogo.png"
}
}
]
Expand All @@ -408,7 +408,7 @@
"name": "redshift",
"displayName": "Redshift",
"type": "RELATIONAL_DB",
"logoUrl": "https://raw.githubusercontent.com/linkedin/datahub/master/datahub-web-react/src/images/redshiftlogo.png"
"logoUrl": "/assets/platforms/redshiftlogo.png"
}
}
]
Expand All @@ -428,7 +428,7 @@
"name": "mssql",
"displayName": "SQL Server",
"type": "RELATIONAL_DB",
"logoUrl": "https://raw.githubusercontent.com/linkedin/datahub/master/datahub-web-react/src/images/mssqllogo.png"
"logoUrl": "/assets/platforms/mssqllogo.png"
}
}
]
Expand All @@ -448,7 +448,7 @@
"name": "bigquery",
"displayName": "BigQuery",
"type": "RELATIONAL_DB",
"logoUrl": "https://raw.githubusercontent.com/linkedin/datahub/master/datahub-web-react/src/images/bigquerylogo.png"
"logoUrl": "/assets/platforms/bigquerylogo.png"
}
}
]
Expand All @@ -468,7 +468,7 @@
"name": "druid",
"displayName": "Druid",
"type": "OLAP_DATASTORE",
"logoUrl": "https://raw.githubusercontent.com/linkedin/datahub/master/datahub-web-react/src/images/druidlogo.png"
"logoUrl": "/assets/platforms/druidlogo.png"
}
}
]
Expand All @@ -488,7 +488,7 @@
"name": "looker",
"displayName": "Looker",
"type": "OTHERS",
"logoUrl": "https://raw.githubusercontent.com/linkedin/datahub/master/datahub-web-react/src/images/lookerlogo.png"
"logoUrl": "/assets/platforms/lookerlogo.png"
}
}
]
Expand All @@ -508,7 +508,7 @@
"name": "feast",
"displayName": "Feast",
"type": "OTHERS",
"logoUrl": "https://raw.githubusercontent.com/linkedin/datahub/master/datahub-web-react/src/images/feastlogo.png"
"logoUrl": "/assets/platforms/feastlogo.png"
}
}
]
Expand All @@ -528,7 +528,7 @@
"name": "sagemaker",
"displayName": "SageMaker",
"type": "OTHERS",
"logoUrl": "https://raw.githubusercontent.com/linkedin/datahub/master/datahub-web-react/src/images/sagemakerlogo.png"
"logoUrl": "/assets/platforms/sagemakerlogo.png"
}
}
]
Expand All @@ -548,7 +548,7 @@
"name": "glue",
"displayName": "Glue",
"type": "OTHERS",
"logoUrl": "https://raw.githubusercontent.com/linkedin/datahub/master/datahub-web-react/src/images/gluelogo.png"
"logoUrl": "/assets/platforms/gluelogo.png"
}
}
]
Expand All @@ -568,7 +568,7 @@
"name": "redash",
"displayName": "Redash",
"type": "OTHERS",
"logoUrl": "https://raw.githubusercontent.com/linkedin/datahub/master/datahub-web-react/src/images/redashlogo.png"
"logoUrl": "/assets/platforms/redashlogo.png"
}
}
]
Expand All @@ -588,7 +588,7 @@
"name": "tableau",
"displayName": "Tableau",
"type": "OTHERS",
"logoUrl": "https://raw.githubusercontent.com/linkedin/datahub/master/datahub-web-react/src/images/tableaulogo.png"
"logoUrl": "/assets/platforms/tableaulogo.png"
}
}
]
Expand Down
Loading

0 comments on commit ae71846

Please sign in to comment.