Skip to content

Commit 8078675

Browse files
alfespa17stanleyz
alfespa17
authored and
stanleyz
committed
fix: Replace SiMicrosoftazure reference using VscAzure in react-icons 5.4.0 (AzBuilder#1637)
1 parent f0566d0 commit 8078675

File tree

13 files changed

+57
-42
lines changed

13 files changed

+57
-42
lines changed

‎ui/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"dependencies": {
66
"@ant-design/icons": "^5.5.1",
77
"@babel/core": "^7.26.0",
8+
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
89
"@babel/preset-env": "^7.26.0",
910
"@babel/standalone": "^7.26.2",
1011
"@monaco-editor/react": "^4.6.0",

‎ui/src/ActionLoader.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ const importAntdIcons = async (icons) => {
129129

130130
// List of react-icons to consider for dynamic importing
131131
const reactIcons = [
132-
"SiMicrosoftazure",
132+
"VscAzure",
133133
"SiAmazonaws",
134134
"SiGithub",
135135
"SiGrafana",

‎ui/src/domain/Modules/Create.jsx

+4-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ import {
1616
} from "../../config/actionTypes";
1717
import axiosInstance from "../../config/axiosConfig";
1818
import { GithubOutlined, GitlabOutlined } from "@ant-design/icons";
19-
import { SiBitbucket, SiAzuredevops } from "react-icons/si";
19+
import { SiBitbucket } from "react-icons/si";
20+
import { VscAzureDevops } from "react-icons/vsc";
2021
import { IconContext } from "react-icons";
2122
import { SiGit } from "react-icons/si";
2223
import { useNavigate, Link } from "react-router-dom";
@@ -102,7 +103,7 @@ export const CreateModule = () => {
102103
case "AZURE_DEVOPS":
103104
return (
104105
<IconContext.Provider value={{ size: "20px" }}>
105-
<SiAzuredevops />
106+
<VscAzureDevops />
106107
&nbsp;&nbsp;
107108
</IconContext.Provider>
108109
);
@@ -358,7 +359,7 @@ export const CreateModule = () => {
358359
&nbsp;&nbsp;Bitbucket
359360
</Button>
360361
<Button
361-
icon={<SiAzuredevops />}
362+
icon={<VscAzureDevops />}
362363
onClick={() => {
363364
handleVCSClick("AZURE_DEVOPS");
364365
}}

‎ui/src/domain/Modules/Details.jsx

+6-4
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,11 @@ import {
2929
import { GitlabOutlined, GithubOutlined } from "@ant-design/icons";
3030
import {
3131
SiBitbucket,
32-
SiAzuredevops,
33-
SiMicrosoftazure,
3432
} from "react-icons/si";
33+
import {
34+
VscAzure,
35+
VscAzureDevops,
36+
} from "react-icons/vsc";
3537
import { FaAws } from "react-icons/fa";
3638
import { BiBookBookmark } from "react-icons/bi";
3739
import { RiFolderHistoryLine } from "react-icons/ri";
@@ -74,7 +76,7 @@ export const ModuleDetails = ({ setOrganizationName, organizationName }) => {
7476
case "azurerm":
7577
return (
7678
<IconContext.Provider value={{ color: "#008AD7", size: "1.5em" }}>
77-
<SiMicrosoftazure />
79+
<VscAzure />
7880
</IconContext.Provider>
7981
);
8082
case "aws":
@@ -272,7 +274,7 @@ export const ModuleDetails = ({ setOrganizationName, organizationName }) => {
272274
case "AZURE_DEVOPS":
273275
return (
274276
<IconContext.Provider value={{ size: "18px" }}>
275-
<SiAzuredevops />
277+
<VscAzureDevops />
276278
&nbsp;
277279
</IconContext.Provider>
278280
);

‎ui/src/domain/Modules/List.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717
ClockCircleOutlined,
1818
DownloadOutlined,
1919
} from "@ant-design/icons";
20-
import { SiMicrosoftazure } from "react-icons/si";
20+
import { VscAzure } from "react-icons/vsc";
2121
import { FaAws } from "react-icons/fa";
2222
import { RiFolderHistoryLine } from "react-icons/ri";
2323
import { IconContext } from "react-icons";
@@ -114,7 +114,7 @@ export const ModuleList = ({ setOrganizationName, organizationName }) => {
114114
case "azurerm":
115115
return (
116116
<IconContext.Provider value={{ color: "#008AD7", size: "1.5em" }}>
117-
<SiMicrosoftazure />
117+
<VscAzure />
118118
</IconContext.Provider>
119119
);
120120
case "aws":

‎ui/src/domain/Organizations/Details.jsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ import {
2828
ImportOutlined,
2929
} from "@ant-design/icons";
3030
import { BiTerminal } from "react-icons/bi";
31-
import { SiTerraform, SiBitbucket, SiAzuredevops } from "react-icons/si";
31+
import { SiTerraform, SiBitbucket } from "react-icons/si";
32+
import { VscAzureDevops } from "react-icons/vsc";
3233
import { IconContext } from "react-icons";
3334
import axiosInstance, { axiosGraphQL } from "../../config/axiosConfig";
3435
import { useParams, useNavigate } from "react-router-dom";
@@ -100,7 +101,7 @@ export const OrganizationDetails = ({
100101
return (
101102
<IconContext.Provider value={{ size: "18px" }}>
102103
<Tooltip title="Azure Devops">
103-
<SiAzuredevops />
104+
<VscAzureDevops />
104105
</Tooltip>
105106
</IconContext.Provider>
106107
);

‎ui/src/domain/Settings/AddVCS.jsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ import {
1717
GitlabOutlined,
1818
DownOutlined,
1919
} from "@ant-design/icons";
20-
import { SiBitbucket, SiAzuredevops } from "react-icons/si";
20+
import { SiBitbucket } from "react-icons/si";
21+
import { VscAzureDevops } from "react-icons/vsc";
2122
import { HiOutlineExternalLink } from "react-icons/hi";
2223
import axiosInstance from "../../config/axiosConfig";
2324
import { useParams } from "react-router-dom";
@@ -806,7 +807,7 @@ export const AddVCS = ({ setMode, loadVCS }) => {
806807
<Dropdown menu={{ items: azDevOpsItems }}>
807808
<Button size="large">
808809
<Space>
809-
<SiAzuredevops /> Azure Devops <DownOutlined />
810+
<VscAzureDevops /> Azure Devops <DownOutlined />
810811
</Space>
811812
</Button>
812813
</Dropdown>

‎ui/src/domain/Settings/VCS.jsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ import { GithubOutlined, GitlabOutlined } from "@ant-design/icons";
1414
import { AddVCS } from "./AddVCS";
1515
import { useParams } from "react-router-dom";
1616
import { DeleteOutlined, EditOutlined } from "@ant-design/icons";
17-
import { SiBitbucket, SiAzuredevops } from "react-icons/si";
17+
import { SiBitbucket } from "react-icons/si";
18+
import { VscAzureDevops } from "react-icons/vsc";
1819
import axiosInstance from "../../config/axiosConfig";
1920
import { IconContext } from "react-icons";
2021
import { ORGANIZATION_NAME } from "../../config/actionTypes";
@@ -42,7 +43,7 @@ export const VCSSettings = ({ vcsMode }) => {
4243
case "AZURE_DEVOPS":
4344
return (
4445
<IconContext.Provider value={{ size: "20px" }}>
45-
<SiAzuredevops />
46+
<VscAzureDevops />
4647
</IconContext.Provider>
4748
);
4849
default:

‎ui/src/domain/Workspaces/Create.jsx

+4-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ import {
2323
import { React, useEffect, useState, version } from "react";
2424
import { IconContext } from "react-icons";
2525
import { BiBookBookmark, BiTerminal, BiUpload } from "react-icons/bi";
26-
import { SiAzuredevops, SiBitbucket, SiGit } from "react-icons/si";
26+
import { SiBitbucket, SiGit } from "react-icons/si";
27+
import { VscAzureDevops } from "react-icons/vsc";
2728
import { Link, useNavigate } from "react-router-dom";
2829
import { v7 as uuid } from "uuid";
2930
import {
@@ -208,7 +209,7 @@ export const CreateWorkspace = () => {
208209
case "AZURE_DEVOPS":
209210
return (
210211
<IconContext.Provider value={{ size: "20px" }}>
211-
<SiAzuredevops />
212+
<VscAzureDevops />
212213
&nbsp;
213214
</IconContext.Provider>
214215
);
@@ -632,7 +633,7 @@ export const CreateWorkspace = () => {
632633
<Dropdown menu={{ items: azDevOpsItems }}>
633634
<Button size="large">
634635
<Space>
635-
<SiAzuredevops /> Azure Devops <DownOutlined />
636+
<VscAzureDevops /> Azure Devops <DownOutlined />
636637
</Space>
637638
</Button>
638639
</Dropdown>

‎ui/src/domain/Workspaces/Details.jsx

+2-3
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ import { IconContext } from "react-icons";
3737
import { BiTerminal } from "react-icons/bi";
3838
import { FiGitCommit } from "react-icons/fi";
3939
import { HiOutlineExternalLink } from "react-icons/hi";
40-
import { SiAzuredevops, SiBitbucket, SiTerraform } from "react-icons/si";
40+
import { SiBitbucket, SiTerraform } from "react-icons/si";
41+
import { VscAzureDevops } from "react-icons/vsc";
4142
import { Link, useNavigate, useParams } from "react-router-dom";
4243
import { v7 as uuid } from "uuid";
4344
import ActionLoader from "../../ActionLoader.jsx";
@@ -660,8 +661,6 @@ export const WorkspaceDetails = ({ setOrganizationName, selectedTab }) => {
660661
// deleteWebhook();
661662
// });
662663

663-
// };
664-
665664
return (
666665
<Content style={{ padding: "0 50px" }}>
667666
<Breadcrumb

‎ui/src/domain/Workspaces/Import.jsx

+4-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ import {
2626
GitlabOutlined,
2727
DownOutlined,
2828
} from "@ant-design/icons";
29-
import { SiBitbucket, SiAzuredevops } from "react-icons/si";
29+
import { SiBitbucket } from "react-icons/si";
30+
import { VscAzureDevops } from "react-icons/vsc";
3031
import { useNavigate, Link } from "react-router-dom";
3132
import parse from "html-react-parser";
3233
const { Content } = Layout;
@@ -221,7 +222,7 @@ export const ImportWorkspace = () => {
221222
case "AZURE_DEVOPS":
222223
return (
223224
<IconContext.Provider value={{ size: "20px" }}>
224-
<SiAzuredevops />
225+
<VscAzureDevops />
225226
&nbsp;
226227
</IconContext.Provider>
227228
);
@@ -573,7 +574,7 @@ export const ImportWorkspace = () => {
573574
<Dropdown menu={{ items: azDevOpsItems }}>
574575
<Button size="large">
575576
<Space>
576-
<SiAzuredevops /> Azure Devops <DownOutlined />
577+
<VscAzureDevops /> Azure Devops <DownOutlined />
577578
</Space>
578579
</Button>
579580
</Dropdown>

‎ui/src/domain/Workspaces/Workspaces.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { GithubOutlined, GitlabOutlined } from "@ant-design/icons";
22
import { message } from "antd";
33
import { IconContext } from "react-icons";
4-
import { SiAzuredevops, SiBitbucket, SiTerraform } from "react-icons/si";
4+
import { SiBitbucket, SiTerraform } from "react-icons/si";
55
import axiosInstance from "../../config/axiosConfig";
66

77
export const genericHeader = {
@@ -43,7 +43,7 @@ export const renderVCSLogo = (vcs) => {
4343
case "AZURE_DEVOPS":
4444
return (
4545
<IconContext.Provider value={{ size: "18px" }}>
46-
<SiAzuredevops />
46+
<VscAzureDevops />
4747
&nbsp;
4848
</IconContext.Provider>
4949
);

‎ui/yarn.lock

+22-15
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@
189189
"@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
190190
"@babel/helper-split-export-declaration" "^7.18.6"
191191

192-
"@babel/helper-create-class-features-plugin@^7.25.9":
192+
"@babel/helper-create-class-features-plugin@^7.21.0", "@babel/helper-create-class-features-plugin@^7.25.9":
193193
version "7.25.9"
194194
resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.9.tgz#7644147706bb90ff613297d49ed5266bde729f83"
195195
integrity sha512-UTZQMvt0d/rSz6KI+qdu7GQze5TIajwTS++GUozlw8VBJDEOAqSXwm1WvmYEZwqdqSGQshRocPDqrt4HBZB3fQ==
@@ -509,6 +509,16 @@
509509
resolved "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz"
510510
integrity sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==
511511

512+
"@babel/plugin-proposal-private-property-in-object@^7.21.11":
513+
version "7.21.11"
514+
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.11.tgz#69d597086b6760c4126525cfa154f34631ff272c"
515+
integrity sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw==
516+
dependencies:
517+
"@babel/helper-annotate-as-pure" "^7.18.6"
518+
"@babel/helper-create-class-features-plugin" "^7.21.0"
519+
"@babel/helper-plugin-utils" "^7.20.2"
520+
"@babel/plugin-syntax-private-property-in-object" "^7.14.5"
521+
512522
"@babel/plugin-syntax-async-generators@^7.8.4":
513523
version "7.8.4"
514524
resolved "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz"
@@ -621,6 +631,13 @@
621631
dependencies:
622632
"@babel/helper-plugin-utils" "^7.8.0"
623633

634+
"@babel/plugin-syntax-private-property-in-object@^7.14.5":
635+
version "7.14.5"
636+
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad"
637+
integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==
638+
dependencies:
639+
"@babel/helper-plugin-utils" "^7.14.5"
640+
624641
"@babel/plugin-syntax-top-level-await@^7.8.3":
625642
version "7.14.5"
626643
resolved "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz"
@@ -3567,20 +3584,10 @@ caniuse-api@^3.0.0:
35673584
lodash.memoize "^4.1.2"
35683585
lodash.uniq "^4.5.0"
35693586

3570-
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001317, caniuse-lite@^1.0.30001400:
3571-
version "1.0.30001442"
3572-
resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001442.tgz"
3573-
integrity sha512-239m03Pqy0hwxYPYR5JwOIxRJfLTWtle9FV8zosfV5pHg+/51uD4nxcUlM8+mWWGfwKtt8lJNHnD3cWw9VZ6ow==
3574-
3575-
caniuse-lite@^1.0.30001646:
3576-
version "1.0.30001653"
3577-
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001653.tgz#b8af452f8f33b1c77f122780a4aecebea0caca56"
3578-
integrity sha512-XGWQVB8wFQ2+9NZwZ10GxTYC5hk0Fa+q8cSkr0tgvMhYhMHP/QC+WTgrePMDBWiWc/pV+1ik82Al20XOK25Gcw==
3579-
3580-
caniuse-lite@^1.0.30001663:
3581-
version "1.0.30001667"
3582-
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001667.tgz#99fc5ea0d9c6e96897a104a8352604378377f949"
3583-
integrity sha512-7LTwJjcRkzKFmtqGsibMeuXmvFDfZq/nzIjnmgCGzKKRVzjD72selLDK1oPF/Oxzmt4fNcPvTDvGqSDG4tCALw==
3587+
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001317, caniuse-lite@^1.0.30001400, caniuse-lite@^1.0.30001646, caniuse-lite@^1.0.30001663:
3588+
version "1.0.30001689"
3589+
resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001689.tgz"
3590+
integrity sha512-CmeR2VBycfa+5/jOfnp/NpWPGd06nf1XYiefUvhXFfZE4GkRc9jv+eGPS4nT558WS/8lYCzV8SlANCIPvbWP1g==
35843591

35853592
case-sensitive-paths-webpack-plugin@^2.4.0:
35863593
version "2.4.0"

0 commit comments

Comments
 (0)