From 1d5ce423f29bd2599ba6880e8f60a5f1fe4b4598 Mon Sep 17 00:00:00 2001 From: Raj Babu Das Date: Sat, 26 Jun 2021 18:10:23 +0530 Subject: [PATCH 1/5] Fixing github workflow push pipeline (#190) * adding download env step in github workflow Signed-off-by: rajdas98 * adding download env step in github workflow Signed-off-by: rajdas98 --- .github/workflows/push.yaml | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 2adc8bbfd9..8b5cd4a78e 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -37,7 +37,7 @@ jobs: uses: actions/upload-artifact@v2 with: name: env_artifact - path: signoz/env-vars + path: env-vars build-and-push-frontend: runs-on: ubuntu-latest @@ -47,17 +47,17 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - - name: Downloading image artficate + - name: Downloading image artifact uses: actions/download-artifact@v2 with: name: env_artifact - path: signoz - name: Build frontend docker image shell: bash run: | + source env-vars cd frontend - docker build . -f Dockerfile + docker build . -f Dockerfile -t ${{ secrets.REPONAME }}/${FRONTEND_IMAGE}:${IMG_TAG} - name: Login to DockerHub uses: docker/login-action@v1 @@ -84,17 +84,17 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - - name: Downloading image artficate + - name: Downloading image artifact uses: actions/download-artifact@v2 with: name: env_artifact - path: signoz - name: Build query-service image shell: bash run: | + source env-vars cd pkg/query-service - docker build . -f Dockerfile + docker build . -f Dockerfile -t ${{ secrets.REPONAME }}/${QUERY_SERVICE}:${IMG_TAG} - name: Login to DockerHub uses: docker/login-action@v1 @@ -121,23 +121,17 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - - name: Downloading image artficate + - name: Downloading image artifact uses: actions/download-artifact@v2 with: name: env_artifact - path: signoz - name: Build flattener docker image shell: bash run: | + source env-vars cd pkg/processors/flattener - docker build . -f Dockerfile - - - name: Build flattener processor docker image - shell: bash - run: | - cd pkg/query-service - docker build . -f Dockerfile + docker build . -f Dockerfile -t ${{ secrets.REPONAME }}/${FLATTENER_PROCESSOR}:${IMG_TAG} - name: Login to DockerHub uses: docker/login-action@v1 From c07f68333e5f794f2b2376152802ccf5234f6945 Mon Sep 17 00:00:00 2001 From: Ankit Nayan Date: Sun, 27 Jun 2021 12:26:50 +0530 Subject: [PATCH 2/5] removing unnecessary files --- .../environment_tiny/common_test | 26 ------------------- 1 file changed, 26 deletions(-) delete mode 100644 deploy/docker/druid-kafka-setup/environment_tiny/common_test diff --git a/deploy/docker/druid-kafka-setup/environment_tiny/common_test b/deploy/docker/druid-kafka-setup/environment_tiny/common_test deleted file mode 100644 index b5d8534f22..0000000000 --- a/deploy/docker/druid-kafka-setup/environment_tiny/common_test +++ /dev/null @@ -1,26 +0,0 @@ -# For S3 storage - -druid_extensions_loadList=["druid-histogram", "druid-datasketches", "druid-lookups-cached-global", "postgresql-metadata-storage", "druid-kafka-indexing-service", "druid-s3-extensions"] - - -druid_storage_type=s3 -druid_storage_bucket=solvzy-test3 -druid_storage_baseKey=druid/segments - -AWS_ACCESS_KEY_ID=AKIARKCF5OX3CMI3XRXC -AWS_SECRET_ACCESS_KEY=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 -AWS_REGION=us-east-2 - -druid_indexer_logs_type=s3 -druid_indexer_logs_s3Bucket=solvzy-test3 -druid_indexer_logs_s3Prefix=druid/indexing-logs - -# ----------------------------------------------------------- -# For local storage -# druid_extensions_loadList=["druid-histogram", "druid-datasketches", "druid-lookups-cached-global", "postgresql-metadata-storage", "druid-kafka-indexing-service"] - -# druid_storage_type=local -# druid_storage_storageDirectory=/opt/data/segments -# druid_indexer_logs_type=file -# druid_indexer_logs_directory=/opt/data/indexing-logs - From af68ca52ba91ffabdabba35484e9fc6eb9c00ab6 Mon Sep 17 00:00:00 2001 From: NIDHI TANDON Date: Sun, 27 Jun 2021 23:23:55 +0530 Subject: [PATCH 3/5] feat(FE): add eslint (#192) * feat: add eslint * refactor(package.json): remove extra eslint config --- frontend/eslintrc.js | 24 ++++++++++ frontend/package.json | 11 ++--- frontend/yarn.lock | 106 +++++++++++++++++++++++++++--------------- 3 files changed, 95 insertions(+), 46 deletions(-) create mode 100644 frontend/eslintrc.js diff --git a/frontend/eslintrc.js b/frontend/eslintrc.js new file mode 100644 index 0000000000..203297ce17 --- /dev/null +++ b/frontend/eslintrc.js @@ -0,0 +1,24 @@ +module.exports = { + files: ["**/*.{ts,tsx}"], + parser: "@typescript-eslint/parser", + plugins: ["@typescript-eslint/eslint-plugin"], + rules: { + "react/jsx-filename-extension": [ + "error", + { + extensions: [".tsx"], + }, + ], + "react/prop-types": "off", + "@typescript-eslint/explicit-function-return-type": "error", + }, + extends: [ + "plugin:@typescript-eslint/recommended", + "plugin:@typescript-eslint/eslint-recommended", + "prettier/@typescript-eslint", + ], + env: { + browser: true, + jest: true, + }, +}; diff --git a/frontend/package.json b/frontend/package.json index 834f8355cd..ba382496cd 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -7,7 +7,8 @@ "dev": "NODE_ENV=development webpack serve", "start": "node scripts/start.js", "build": "webpack --config=webpack.config.prod.js", - "prettify": "prettier --write ." + "prettify": "prettier --write .", + "lint": "eslint src" }, "engines": { "node": ">=12.13.0" @@ -54,7 +55,7 @@ "d3-tip": "^0.9.1", "dotenv": "8.2.0", "dotenv-expand": "5.1.0", - "eslint": "^7.11.0", + "eslint": "^7.29.0", "eslint-config-react-app": "^6.0.0", "eslint-plugin-flowtype": "^5.2.0", "eslint-plugin-import": "^2.22.1", @@ -110,12 +111,6 @@ "webpack-manifest-plugin": "2.2.0", "workbox-webpack-plugin": "5.1.4" }, - "eslintConfig": { - "extends": [ - "react-app", - "react-app/jest" - ] - }, "browserslist": { "production": [ ">0.2%", diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 98cc2d8949..da3d7e8dfb 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -1298,19 +1298,18 @@ resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed" integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg== -"@eslint/eslintrc@^0.3.0": - version "0.3.0" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.3.0.tgz#d736d6963d7003b6514e6324bec9c602ac340318" - integrity sha512-1JTKgrOKAHVivSvOYw+sJOunkBjUOvjqWk1DPja7ZFhIS2mX/4EgTT8M7eTK9jrKhL/FvXXEbQwIs3pg1xp3dg== +"@eslint/eslintrc@^0.4.2": + version "0.4.2" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.2.tgz#f63d0ef06f5c0c57d76c4ab5f63d3835c51b0179" + integrity sha512-8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg== dependencies: ajv "^6.12.4" debug "^4.1.1" espree "^7.3.0" - globals "^12.1.0" + globals "^13.9.0" ignore "^4.0.6" import-fresh "^3.2.1" js-yaml "^3.13.1" - lodash "^4.17.20" minimatch "^3.0.4" strip-json-comments "^3.1.1" @@ -2687,10 +2686,10 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^7.0.2: - version "7.1.1" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-7.1.1.tgz#1e6b37a454021fa9941713f38b952fc1c8d32a84" - integrity sha512-ga/aqDYnUy/o7vbsRTFhhTsNeXiYb5JWDIcRIeZfwRNCefwjNTVYCGdGSUrEmiu3yDK3vFvNbgJxvrQW4JXrYQ== +ajv@^8.0.1: + version "8.6.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.0.tgz#60cc45d9c46a477d80d92c48076d972c342e5720" + integrity sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ== dependencies: fast-deep-equal "^3.1.1" json-schema-traverse "^1.0.0" @@ -5739,6 +5738,11 @@ escape-string-regexp@^1.0.5: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= +escape-string-regexp@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== + escodegen@^1.14.1: version "1.14.3" resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503" @@ -5890,29 +5894,31 @@ eslint-webpack-plugin@^2.1.0: micromatch "^4.0.2" schema-utils "^3.0.0" -eslint@^7.11.0: - version "7.20.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.20.0.tgz#db07c4ca4eda2e2316e7aa57ac7fc91ec550bdc7" - integrity sha512-qGi0CTcOGP2OtCQBgWZlQjcTuP0XkIpYFj25XtRTQSHC+umNnp7UMshr2G8SLsRFYDdAPFeHOsiteadmMH02Yw== +eslint@^7.29.0: + version "7.29.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.29.0.tgz#ee2a7648f2e729485e4d0bd6383ec1deabc8b3c0" + integrity sha512-82G/JToB9qIy/ArBzIWG9xvvwL3R86AlCjtGw+A29OMZDqhTybz/MByORSukGxeI+YPCR4coYyITKk8BFH9nDA== dependencies: "@babel/code-frame" "7.12.11" - "@eslint/eslintrc" "^0.3.0" + "@eslint/eslintrc" "^0.4.2" ajv "^6.10.0" chalk "^4.0.0" cross-spawn "^7.0.2" debug "^4.0.1" doctrine "^3.0.0" enquirer "^2.3.5" + escape-string-regexp "^4.0.0" eslint-scope "^5.1.1" eslint-utils "^2.1.0" eslint-visitor-keys "^2.0.0" espree "^7.3.1" esquery "^1.4.0" esutils "^2.0.2" - file-entry-cache "^6.0.0" + fast-deep-equal "^3.1.3" + file-entry-cache "^6.0.1" functional-red-black-tree "^1.0.1" - glob-parent "^5.0.0" - globals "^12.1.0" + glob-parent "^5.1.2" + globals "^13.6.0" ignore "^4.0.6" import-fresh "^3.0.0" imurmurhash "^0.1.4" @@ -5920,7 +5926,7 @@ eslint@^7.11.0: js-yaml "^3.13.1" json-stable-stringify-without-jsonify "^1.0.1" levn "^0.4.1" - lodash "^4.17.20" + lodash.merge "^4.6.2" minimatch "^3.0.4" natural-compare "^1.4.0" optionator "^0.9.1" @@ -5929,7 +5935,7 @@ eslint@^7.11.0: semver "^7.2.1" strip-ansi "^6.0.0" strip-json-comments "^3.1.0" - table "^6.0.4" + table "^6.0.9" text-table "^0.2.0" v8-compile-cache "^2.0.3" @@ -6202,7 +6208,7 @@ fancy-log@^1.3.2, fancy-log@^1.3.3: parse-node-version "^1.0.0" time-stamp "^1.0.0" -fast-deep-equal@^3.1.1: +fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== @@ -6272,10 +6278,10 @@ figures@^3.2.0: dependencies: escape-string-regexp "^1.0.5" -file-entry-cache@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.0.tgz#7921a89c391c6d93efec2169ac6bf300c527ea0a" - integrity sha512-fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA== +file-entry-cache@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" + integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg== dependencies: flat-cache "^3.0.4" @@ -6694,13 +6700,20 @@ 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.1: +glob-parent@^5.1.0, glob-parent@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229" integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ== dependencies: is-glob "^4.0.1" +glob-parent@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== + dependencies: + is-glob "^4.0.1" + glob-stream@^6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-6.1.0.tgz#7045c99413b3eb94888d83ab46d0b404cc7bdde4" @@ -6796,12 +6809,12 @@ globals@^11.1.0: resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== -globals@^12.1.0: - version "12.4.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8" - integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg== +globals@^13.6.0, globals@^13.9.0: + version "13.9.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.9.0.tgz#4bf2bf635b334a173fb1daf7c5e6b218ecdc06cb" + integrity sha512-74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA== dependencies: - type-fest "^0.8.1" + type-fest "^0.20.2" globby@11.0.1: version "11.0.1" @@ -8765,6 +8778,11 @@ lodash.clone@^4.3.2: resolved "https://registry.yarnpkg.com/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6" integrity sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y= +lodash.clonedeep@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" + integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= + lodash.defaults@^4.0.1: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" @@ -8775,7 +8793,7 @@ lodash.flatten@^4.2.0: resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8= -lodash.merge@^4.4.0: +lodash.merge@^4.4.0, lodash.merge@^4.6.2: version "4.6.2" resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== @@ -8815,6 +8833,11 @@ lodash.throttle@^4.1.1: resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4" integrity sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ= +lodash.truncate@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" + integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM= + lodash.uniq@^4.3.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" @@ -12785,15 +12808,17 @@ symbol-tree@^3.2.4: resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== -table@^6.0.4: - version "6.0.7" - resolved "https://registry.yarnpkg.com/table/-/table-6.0.7.tgz#e45897ffbcc1bcf9e8a87bf420f2c9e5a7a52a34" - integrity sha512-rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g== +table@^6.0.9: + version "6.7.1" + resolved "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz#ee05592b7143831a8c94f3cee6aae4c1ccef33e2" + integrity sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg== dependencies: - ajv "^7.0.2" - lodash "^4.17.20" + ajv "^8.0.1" + lodash.clonedeep "^4.5.0" + lodash.truncate "^4.4.2" slice-ansi "^4.0.0" string-width "^4.2.0" + strip-ansi "^6.0.0" tapable@^1.0.0: version "1.1.3" @@ -13179,6 +13204,11 @@ type-fest@^0.11.0: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1" integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ== +type-fest@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" + integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== + type-fest@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1" From d09c63331db19802437b910dcf0ff7aa8b9b9269 Mon Sep 17 00:00:00 2001 From: NIDHI TANDON Date: Sun, 27 Jun 2021 23:25:18 +0530 Subject: [PATCH 4/5] fix(tabs): add gutter between tabs (#196) --- frontend/src/modules/Metrics/ServiceMetrics.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/modules/Metrics/ServiceMetrics.tsx b/frontend/src/modules/Metrics/ServiceMetrics.tsx index 185e303f85..946ede6cd5 100644 --- a/frontend/src/modules/Metrics/ServiceMetrics.tsx +++ b/frontend/src/modules/Metrics/ServiceMetrics.tsx @@ -93,7 +93,7 @@ const _ServiceMetrics = (props: ServicesMetricsProps) => { }; return ( - + From 6f2b66c286d5b00518414aff73a71965f2ffef56 Mon Sep 17 00:00:00 2001 From: NIDHI TANDON Date: Mon, 28 Jun 2021 21:32:41 +0530 Subject: [PATCH 5/5] refactor(SelectedSpanDetails): add styled components, minor refactoring (#191) --- .../modules/Traces/SelectedSpanDetails.tsx | 138 +++++++++--------- 1 file changed, 72 insertions(+), 66 deletions(-) diff --git a/frontend/src/modules/Traces/SelectedSpanDetails.tsx b/frontend/src/modules/Traces/SelectedSpanDetails.tsx index 96a350e7d2..735a1361e4 100644 --- a/frontend/src/modules/Traces/SelectedSpanDetails.tsx +++ b/frontend/src/modules/Traces/SelectedSpanDetails.tsx @@ -1,95 +1,101 @@ import React from "react"; import { Card, Space, Tabs, Typography } from "antd"; import styled from "styled-components"; -import { pushDStree } from "../../store/actions"; +import { pushDStree } from "Src/store/actions"; const { TabPane } = Tabs; -const { Text } = Typography; +const { Text, Title, Paragraph } = Typography; interface SelectedSpanDetailsProps { - data: pushDStree + data: pushDStree; } -const Title = styled(Text)` - color: "#2D9CDB", - fontSize: '12px', +// Check this discussion for antd with styled components +// https://gist.github.com/newswim/fa916c66477ddd5952f7d6548e6a0605 + +const CustomTitle = styled(Title)` + &&& { + color: #f2f2f2; + font-size: 14px; + } +`; + +const CustomText = styled(Text)` + &&& { + color: #2d9cdb; + font-size: 14px; + } +`; + +const CustomSubTitle = styled(Title)` + &&& { + color: #bdbdbd; + font-size: 14px; + margin-bottom: 8px; + } +`; + +const CustomSubText = styled(Paragraph)` + &&& { + background: #4f4f4f; + color: #2d9cdb; + font-size: 12px; + padding: 6px 8px; + word-break: break-all; + margin-bottom: 16px; + } `; const SelectedSpanDetails = (props: SelectedSpanDetailsProps) => { - - let spanTags = props.data.tags; - let service = props.data?.name?.split(":")[0]; - let operation = props.data?.name?.split(":")[1]; + const spanTags = props.data.tags; + const service = props.data?.name?.split(":")[0]; + const operation = props.data?.name?.split(":")[1]; return ( - + - Details for selected Span - - Service - - - {service} - + Service + {service} - - Operation - - - {operation} - + Operation + {operation} - {spanTags && spanTags.map((tags, index) => { - return ( - <> - {tags.value && ( - <> - - {tags.key} - -
- {tags.key === "error" ? "true" : tags.value} -
- - )} - - ); - })} + {spanTags && + spanTags.map((tags, index) => { + return ( + <> + {tags.value && ( + <> + {tags.key} + + {tags.key === "error" ? "true" : tags.value} + + + )} + + ); + })} - {spanTags && spanTags - .filter((tags) => tags.key === "error") - .map((error) => ( - <> - - {error.key} - -
- true -
- - ))} + {spanTags && + spanTags + .filter((tags) => tags.key === "error") + .map((error) => ( + <> + {error.key} + true + + ))}