yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-08-23 16:38:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: icon change issue on click of dbtmodal tab (#1779)

Browse Source
This commit is contained in:
Shailesh Parmar 2021-12-16 00:34:52 +05:30 committed by GitHub
parent 4beb053421
commit 1b66d9f4b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openmetadata-ui/src/main/resources/ui/src/assets/svg/dbt-model-primery.svg Normal file
View File

@ -0,0 +1,3 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M15.1283 0.301135C14.948 0.177814 14.7456 0.0905024 14.5321 0.044003C14.3132 -0.00416205 14.0875 -0.0128697 13.8655 0.0182899C13.6329 0.0507678 13.4074 0.122583 13.1988 0.230662L12.2256 0.767781L11.2504 1.30395L10.2742 1.84011L9.299 2.38104C9.08776 2.50466 8.86143 2.60068 8.62571 2.66674C8.39757 2.73291 8.16138 2.76752 7.92386 2.7696C7.68673 2.7725 7.45034 2.74334 7.22099 2.68294C6.9844 2.62027 6.75707 2.52678 6.54486 2.40485L5.5992 1.89059L4.65352 1.37632L3.70785 0.863966L2.76122 0.349704C2.41055 0.125855 1.99107 0.0356039 1.57937 0.0954293C1.19941 0.154507 0.847092 0.329837 0.570845 0.597312C0.292334 0.861311 0.102941 1.20548 0.0289639 1.58203C-0.0470509 1.99031 0.0277371 2.41231 0.239431 2.7696L0.570845 3.37719L1.30129 4.71046L2.03173 6.04374L2.3641 6.65133C2.48759 6.86035 2.58362 7.0844 2.6498 7.31797C2.71253 7.54631 2.74456 7.78203 2.74503 8.01889C2.7446 8.25635 2.71258 8.49267 2.6498 8.72168C2.59097 8.96277 2.50034 9.195 2.38029 9.41214L1.86126 10.3807L1.34129 11.3464L0.821308 12.3111L0.301333 13.2768C0.213972 13.435 0.146785 13.6036 0.101342 13.7787C0.0584778 13.944 0.0392401 14.1146 0.0442013 14.2853C0.0505832 14.453 0.0827031 14.6187 0.139435 14.7767C0.196674 14.9423 0.279587 15.0978 0.385139 15.2376C0.513694 15.4143 0.673453 15.566 0.856548 15.6852C1.03851 15.8061 1.2403 15.8941 1.45271 15.9452C1.67066 15.9986 1.89635 16.0132 2.11934 15.988C2.352 15.9613 2.57787 15.8926 2.78599 15.7852L3.79832 15.23L4.80971 14.6757L5.82109 14.1205L6.83245 13.5653C6.52829 13.3468 6.24716 13.098 5.99346 12.8225C5.73916 12.5456 5.50583 12.2502 5.2954 11.9387C5.08302 11.6263 4.88875 11.3006 4.70876 10.9692C4.54781 10.674 4.3983 10.375 4.25449 10.0778C4.50876 10.554 5.05636 11.0597 5.76776 11.5673C6.63307 12.1628 7.53477 12.7035 8.46765 13.1863C9.44854 13.7082 10.4552 14.2015 11.3246 14.6376C12.1941 15.0738 12.9313 15.4519 13.3684 15.7404C13.7213 15.9493 14.1406 16.0154 14.5407 15.9252C14.9117 15.8329 15.2446 15.6272 15.493 15.3367C15.7532 15.0419 15.9222 14.678 15.9797 14.2891C16.0396 13.878 15.9548 13.4588 15.7397 13.1034L15.1416 12.0216L13.8322 9.64075L12.5227 7.2599L11.9313 6.1904C11.8046 5.9771 11.667 5.77048 11.5189 5.57138C11.3719 5.37601 11.2128 5.18994 11.0428 5.01426C10.8737 4.83933 10.693 4.6761 10.5019 4.52571C10.3075 4.37267 10.1018 4.2345 9.88665 4.11239C10.2209 4.26477 10.5609 4.42285 10.8942 4.59332C11.23 4.76251 11.5568 4.94911 11.8732 5.15235C12.1892 5.35484 12.4885 5.58221 12.7684 5.83232C13.0508 6.08657 13.3046 6.37078 13.5255 6.6799L14.0636 5.69518L14.6017 4.71046L15.1416 3.72384L15.6797 2.73912C15.7694 2.59109 15.8368 2.43064 15.8797 2.26295C15.9225 2.09663 15.9417 1.92512 15.9368 1.75345C15.9304 1.58016 15.8983 1.40879 15.8416 1.2449C15.784 1.07716 15.7001 0.91964 15.593 0.778256C15.471 0.590158 15.3131 0.428012 15.1283 0.301135ZM2.64885 14.0948C2.66276 14.2961 2.58972 14.4937 2.44823 14.6376C2.30675 14.7814 2.11038 14.8577 1.90888 14.8471C1.49705 14.8505 1.16043 14.5195 1.15701 14.1076C1.15359 13.6958 1.48467 13.3592 1.8965 13.3558C2.0977 13.3416 2.29532 13.4144 2.43922 13.5557C2.58312 13.6971 2.65945 13.8934 2.64885 14.0948ZM1.17368 1.93439C1.15976 1.7331 1.2328 1.5355 1.3743 1.39165C1.51578 1.24779 1.71215 1.17148 1.91364 1.18205C2.11494 1.16814 2.31254 1.24118 2.4564 1.38267C2.60025 1.52415 2.67656 1.72052 2.66599 1.92201C2.6799 2.12331 2.60686 2.32091 2.46537 2.46477C2.32389 2.60863 2.12752 2.68493 1.92602 2.67437C1.72473 2.68827 1.52713 2.61523 1.38327 2.47375C1.23942 2.33226 1.16311 2.1359 1.17368 1.93439ZM14.8188 14.072C14.8218 14.3741 14.6425 14.6483 14.3645 14.7666C14.0864 14.8849 13.7646 14.8239 13.549 14.6122C13.3334 14.4004 13.2668 14.0797 13.38 13.7996C13.4934 13.5195 13.7643 13.3352 14.0665 13.333C14.2676 13.3187 14.4653 13.3916 14.6092 13.5329C14.753 13.6742 14.8294 13.8705 14.8188 14.072ZM9.77137 7.7322C9.55141 7.37222 9.18855 7.23133 8.75333 7.23609C8.1589 7.25594 7.63315 7.62739 7.41581 8.18104C7.19853 8.73476 7.33117 9.36459 7.75339 9.78359C7.28162 9.7235 6.85357 9.47692 6.56491 9.09896C6.27625 8.72101 6.15104 8.24321 6.21726 7.77224C6.35725 6.8285 7.2953 6.09516 8.2381 6.22754C9.03619 6.36277 9.69238 6.93512 9.7695 7.7322H9.77137ZM14.8721 1.87154C14.8618 2.27371 14.5347 2.5954 14.1324 2.599C13.7301 2.60259 13.3973 2.2868 13.3798 1.88488C13.3901 1.4827 13.7172 1.16101 14.1195 1.15742C14.5218 1.15382 14.8546 1.46962 14.8721 1.87154Z" fill="#7147E8"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

2
openmetadata-ui/src/main/resources/ui/src/components/DatasetDetails/DatasetDetails.component.tsx
View File

@ -157,7 +157,7 @@ const DatasetDetails: React.FC<DatasetDetailsProps> = ({
alt: 'dbt-model',
name: 'dbtmodel-light-grey',
title: 'DBT',
selectedName: 'icon-schemacolor',
selectedName: 'dbtmodel-primery',
},
isProtected: false,
isHidden: !dataModel?.sql,

6
openmetadata-ui/src/main/resources/ui/src/components/Modals/UserDetailsModal/UserDetailsModal.tsx
View File

@ -78,9 +78,7 @@ const UserDetailsModal = ({
<span className="tw-ml-1">{userData.email}</span>
</p>
<p className="tw-mb-4 tw-font-normal">
<span className="tw-italic">
{userData.isAdmin ? 'Admin' : 'User'}
</span>
Role: {userData.isAdmin ? 'Admin' : 'User'}
</p>
{userData.teams && <div className="tw-filter-seperator tw-w-5/6" />}
<p className="tw-w-4/5 tw-mx-auto">
@ -115,7 +113,7 @@ const UserDetailsModal = ({
type="submit"
variant="contained"
onClick={onSave}>
{userData.isAdmin ? 'Dismiss as admin' : 'Make admin'}
{userData.isAdmin ? 'Revoke Admin Privileges' : 'Make Admin'}
</Button>
</div>
</div>

6
openmetadata-ui/src/main/resources/ui/src/utils/SvgUtils.tsx
View File

@ -26,6 +26,7 @@ import IconDashboard from '../assets/svg/dashboard.svg';
import IconAsstest from '../assets/svg/data-assets.svg';
import IconDBTModelGrey from '../assets/svg/dbt-model-grey.svg';
import IconDBTModelLightGrey from '../assets/svg/dbt-model-light-grey.svg';
import IconDBTModelPrimeryColor from '../assets/svg/dbt-model-primery.svg';
import IconDBTModel from '../assets/svg/dbt-model.svg';
import IconDeploy from '../assets/svg/deploy-icon.svg';
import IconDoc from '../assets/svg/doc.svg';
@ -178,6 +179,7 @@ export const Icons = {
PIPELINE_GREY: 'pipeline-grey',
DBTMODEL_GREY: 'dbtmodel-grey',
DBTMODEL_LIGHT_GREY: 'dbtmodel-light-grey',
DBTMODEL_PRIMERY: 'dbtmodel-primery',
DBTMODEL: 'dbtmodel',
VERSION: 'icon-version',
VERSION_WHITE: 'icon-version-white',
@ -516,6 +518,10 @@ const SVGIcons: FunctionComponent<Props> = ({
case Icons.DBTMODEL:
IconComponent = IconDBTModel;
break;
case Icons.DBTMODEL_PRIMERY:
IconComponent = IconDBTModelPrimeryColor;
break;
case Icons.TAG:
IconComponent = IconTag;