From e4a03ca56f6f7bc28f013c6d1a09a8cd47557c75 Mon Sep 17 00:00:00 2001 From: Ankita Kinger Date: Wed, 1 Nov 2023 11:16:53 +0530 Subject: [PATCH] chore: Updating DS version to use apps-line icon from DS (#28524) ## Description Updating DS version to use apps-line icon from DS #### PR fixes following issue(s) Fixes [#28525](https://github.com/appsmithorg/appsmith/issues/28525) #### Type of change - Chore (housekeeping or task changes that don't impact user perception) ## Testing #### How Has This Been Tested? - [x] Manual - [ ] JUnit - [ ] Jest - [x] Cypress ## Checklist: #### Dev activity - [x] My code follows the style guidelines of this project - [x] I have performed a self-review of my own code - [x] I have commented my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [x] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [x] New and existing unit tests pass locally with my changes - [ ] PR is being merged under a feature flag #### QA activity: - [ ] [Speedbreak features](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#speedbreakers-) have been covered - [ ] Test plan covers all impacted features and [areas of interest](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#areas-of-interest-) - [ ] Test plan has been peer reviewed by project stakeholders and other QA members - [ ] Manually tested functionality on DP - [ ] We had an implementation alignment call with stakeholders post QA Round 2 - [ ] Cypress test cases have been added and approved by SDET/manual QA - [ ] Added `Test Plan Approved` label after Cypress tests were reviewed - [ ] Added `Test Plan Approved` label after JUnit tests were reviewed --- app/client/package.json | 4 +- .../editorComponents/GlobalSearch/utils.tsx | 8 +- .../Branding/previews/AppPreview.tsx | 8 +- .../components/BackToAppsButton.tsx | 11 +-- app/client/yarn.lock | 83 +++++++++++++------ 5 files changed, 67 insertions(+), 47 deletions(-) diff --git a/app/client/package.json b/app/client/package.json index 081fee45e8..64fe98f2cc 100644 --- a/app/client/package.json +++ b/app/client/package.json @@ -97,8 +97,8 @@ "cypress-log-to-output": "^1.1.2", "dayjs": "^1.10.6", "deep-diff": "^1.0.2", - "design-system": "npm:@appsmithorg/design-system@2.1.25", - "design-system-old": "npm:@appsmithorg/design-system-old@1.1.13", + "design-system": "npm:@appsmithorg/design-system@2.1.26", + "design-system-old": "npm:@appsmithorg/design-system-old@1.1.14", "downloadjs": "^1.4.7", "echarts": "^5.4.2", "echarts-gl": "^2.0.9", diff --git a/app/client/src/components/editorComponents/GlobalSearch/utils.tsx b/app/client/src/components/editorComponents/GlobalSearch/utils.tsx index 212321bad8..1483f86bee 100644 --- a/app/client/src/components/editorComponents/GlobalSearch/utils.tsx +++ b/app/client/src/components/editorComponents/GlobalSearch/utils.tsx @@ -27,11 +27,7 @@ import { curlImportPageURL } from "@appsmith/RouteBuilder"; import { isMacOrIOS, modText, shiftText } from "utils/helpers"; import { FocusEntity } from "navigation/FocusEntity"; import AnalyticsUtil from "utils/AnalyticsUtil"; -import { importRemixIcon } from "design-system-old"; - -const AddLineIcon = importRemixIcon( - async () => import("remixicon-react/AddLineIcon"), -); +import { Icon } from "design-system"; export type SelectEvent = | React.MouseEvent @@ -338,7 +334,7 @@ export const generateCreateNewDSOption = ( title: "New datasource", icon: ( - + ), kind: SEARCH_ITEM_TYPES.actionOperation, diff --git a/app/client/src/pages/AdminSettings/Branding/previews/AppPreview.tsx b/app/client/src/pages/AdminSettings/Branding/previews/AppPreview.tsx index 8d2af7e721..cdb143d21b 100644 --- a/app/client/src/pages/AdminSettings/Branding/previews/AppPreview.tsx +++ b/app/client/src/pages/AdminSettings/Branding/previews/AppPreview.tsx @@ -3,11 +3,7 @@ import React from "react"; import type { PreviewsProps } from "."; import PreviewBox from "./PreviewBox"; -import { importRemixIcon } from "design-system-old"; - -const AppsIcon = importRemixIcon( - async () => import("remixicon-react/AppsLineIcon"), -); +import { Icon } from "design-system"; const AppPreview = (props: PreviewsProps) => { const { logo, shades } = props; @@ -23,7 +19,7 @@ const AppPreview = (props: PreviewsProps) => {
- + Branding Logo import("remixicon-react/AppsLineIcon"), -); +import { Icon, Tooltip } from "design-system"; interface BackToAppsButtonProps { currentApplicationDetails?: ApplicationPayload; @@ -26,7 +21,7 @@ interface BackToAppsButtonProps { isMinimal?: boolean; } -const StyledAppIcon = styled(AppsLineIcon)<{ +const StyledAppIcon = styled(Icon)<{ primaryColor: string; navColorStyle: NavigationSetting["colorStyle"]; }>` @@ -64,8 +59,10 @@ const BackToAppsButton = (props: BackToAppsButtonProps) => { className="h-8 t--app-viewer-back-to-apps-button" icon={ } insideSidebar={insideSidebar} diff --git a/app/client/yarn.lock b/app/client/yarn.lock index 3e1d4b2b36..e6d4e6d6e5 100644 --- a/app/client/yarn.lock +++ b/app/client/yarn.lock @@ -5393,6 +5393,19 @@ __metadata: languageName: node linkType: hard +"@rc-component/context@npm:^1.4.0": + version: 1.4.0 + resolution: "@rc-component/context@npm:1.4.0" + dependencies: + "@babel/runtime": ^7.10.1 + rc-util: ^5.27.0 + peerDependencies: + react: ">=16.9.0" + react-dom: ">=16.9.0" + checksum: 3771237de1e82a453cfff7b5f0ca0dcc370a2838be8ecbfe172c26dec2e94dc2354a8b3061deaff7e633e418fc1b70ce3d10d770603f12dc477fe03f2ada7059 + languageName: node + linkType: hard + "@rc-component/portal@npm:^1.1.0": version: 1.1.1 resolution: "@rc-component/portal@npm:1.1.1" @@ -10529,8 +10542,8 @@ __metadata: cypress-xpath: ^1.6.0 dayjs: ^1.10.6 deep-diff: ^1.0.2 - design-system: "npm:@appsmithorg/design-system@2.1.25" - design-system-old: "npm:@appsmithorg/design-system-old@1.1.13" + design-system: "npm:@appsmithorg/design-system@2.1.26" + design-system-old: "npm:@appsmithorg/design-system-old@1.1.14" diff: ^5.0.0 dotenv: ^8.1.0 downloadjs: ^1.4.7 @@ -14590,9 +14603,9 @@ __metadata: languageName: node linkType: hard -"design-system-old@npm:@appsmithorg/design-system-old@1.1.13": - version: 1.1.13 - resolution: "@appsmithorg/design-system-old@npm:1.1.13" +"design-system-old@npm:@appsmithorg/design-system-old@1.1.14": + version: 1.1.14 + resolution: "@appsmithorg/design-system-old@npm:1.1.14" dependencies: emoji-mart: 3.0.1 peerDependencies: @@ -14612,13 +14625,13 @@ __metadata: remixicon-react: ^1.0.0 styled-components: 5.3.6 tinycolor2: ^1.4.2 - checksum: 29ea9053188b6c898761b05c20642e6f43085b0b6a32831d1fbd12cdcddbc241c84dd52bcf959882f30afd770cdbe0580148e9ece06c63626354283ea2d3a2b1 + checksum: d03121f726fd9a2b61305f52caaa450ea61af8cd394c1af51926cf2b3cba3a98296496ae22eb69c5b6ed72f561814ff426a4e7ee645aa72e18ed5955e5d3a993 languageName: node linkType: hard -"design-system@npm:@appsmithorg/design-system@2.1.25": - version: 2.1.25 - resolution: "@appsmithorg/design-system@npm:2.1.25" +"design-system@npm:@appsmithorg/design-system@2.1.26": + version: 2.1.26 + resolution: "@appsmithorg/design-system@npm:2.1.26" dependencies: "@radix-ui/react-dialog": ^1.0.2 "@radix-ui/react-dropdown-menu": ^2.0.4 @@ -14638,6 +14651,7 @@ __metadata: date-fns: ^2.29.3 loglevel: ^1.8.1 rc-select: ^14.4.3 + rc-table: ^7.35.2 rc-tooltip: ^5.3.1 react-datepicker: ^4.10.0 react-toastify: 9.0.3 @@ -14646,7 +14660,7 @@ __metadata: react-dom: ^17.0.2 react-router-dom: ^5.0.0 styled-components: ^5.3.6 - checksum: 9358f3cf634edff36cb5d62cec43215cbfd23b27259a1031b957fb691091744b52ed4e043cebc7f62c835e356123c583b7a73c1b79f2c159be70fdbbe0811208 + checksum: afc3448a9edfbd1f149982acc2fe878fcce19ecd214ee20ac0810efa0932980c6be85ac5497b63f596b3f7c6872a7fc25159d20aa932343c9afffa00dfa6cdcd languageName: node linkType: hard @@ -25880,18 +25894,18 @@ __metadata: languageName: node linkType: hard -"rc-resize-observer@npm:^1.0.0, rc-resize-observer@npm:^1.3.1": - version: 1.3.1 - resolution: "rc-resize-observer@npm:1.3.1" +"rc-resize-observer@npm:^1.0.0, rc-resize-observer@npm:^1.1.0, rc-resize-observer@npm:^1.3.1": + version: 1.4.0 + resolution: "rc-resize-observer@npm:1.4.0" dependencies: "@babel/runtime": ^7.20.7 classnames: ^2.2.1 - rc-util: ^5.27.0 + rc-util: ^5.38.0 resize-observer-polyfill: ^1.5.1 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: cc952e5d3071543e990103ea64b20310e3a09c950a473bf89a3a7e6063bd060c6c041f0333085640676d176c7edd58676a3b3d64dfa17461ea6f3a62f79c4d65 + checksum: e6ee24fd887ea440b07e0326c3fc60b240274fa43ea87cf8f86ca9e0741a2c817e47a182f336b00d7246b4fd21b3536f4d3aacd7f0db5ae673f106630cd348ba languageName: node linkType: hard @@ -25931,6 +25945,23 @@ __metadata: languageName: node linkType: hard +"rc-table@npm:^7.35.2": + version: 7.35.2 + resolution: "rc-table@npm:7.35.2" + dependencies: + "@babel/runtime": ^7.10.1 + "@rc-component/context": ^1.4.0 + classnames: ^2.2.5 + rc-resize-observer: ^1.1.0 + rc-util: ^5.37.0 + rc-virtual-list: ^3.11.1 + peerDependencies: + react: ">=16.9.0" + react-dom: ">=16.9.0" + checksum: eb9c7dc7844354f53a907f626493a89443e6b33e9a87875315b66fdd1cee8089f1725b67b55dee89031a898b486fab66a8df88025327cd4fa7ff7477379b874e + languageName: node + linkType: hard + "rc-tooltip@npm:^5.3.1": version: 5.3.1 resolution: "rc-tooltip@npm:5.3.1" @@ -25993,31 +26024,31 @@ __metadata: languageName: node linkType: hard -"rc-util@npm:^5.15.0, rc-util@npm:^5.16.1, rc-util@npm:^5.19.2, rc-util@npm:^5.2.1, rc-util@npm:^5.24.4, rc-util@npm:^5.27.0, rc-util@npm:^5.29.2, rc-util@npm:^5.3.0, rc-util@npm:^5.5.1": - version: 5.30.0 - resolution: "rc-util@npm:5.30.0" +"rc-util@npm:^5.16.1, rc-util@npm:^5.19.2, rc-util@npm:^5.2.1, rc-util@npm:^5.24.4, rc-util@npm:^5.27.0, rc-util@npm:^5.29.2, rc-util@npm:^5.3.0, rc-util@npm:^5.36.0, rc-util@npm:^5.37.0, rc-util@npm:^5.38.0, rc-util@npm:^5.5.1": + version: 5.38.0 + resolution: "rc-util@npm:5.38.0" dependencies: "@babel/runtime": ^7.18.3 - react-is: ^16.12.0 + react-is: ^18.2.0 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: d7bf508bd3236cbb2abebbf16d271c50ab05be12cd3be46981979608b0b6d304735cc081650ab2f967f99a144c23189a6f682d52956c0eb4b6e4f41064b8a4ae + checksum: 97a3e1dd94e199c12e69eed1f69e9a9be39b383f2b0d9e1d52d6fcdf676e91e6499fa7be4c48f37b08b6500747f2dc41014f9be54351a39f23b3b5087360690c languageName: node linkType: hard -"rc-virtual-list@npm:^3.2.0, rc-virtual-list@npm:^3.4.13, rc-virtual-list@npm:^3.4.8": - version: 3.4.13 - resolution: "rc-virtual-list@npm:3.4.13" +"rc-virtual-list@npm:^3.11.1, rc-virtual-list@npm:^3.2.0, rc-virtual-list@npm:^3.4.13, rc-virtual-list@npm:^3.4.8": + version: 3.11.2 + resolution: "rc-virtual-list@npm:3.11.2" dependencies: "@babel/runtime": ^7.20.0 classnames: ^2.2.6 rc-resize-observer: ^1.0.0 - rc-util: ^5.15.0 + rc-util: ^5.36.0 peerDependencies: react: "*" react-dom: "*" - checksum: 590baca20aa209bdc7038c4cdbedef78100e8f8762966b8ae556d0c7154ce8a4f26737a5bd59580ee1ed446c79a8eb627e3fb003e1ee0de38f1bb9a7b3cd7e78 + checksum: b642e55ca2c4b56fb2048b5151a17e2f0f1c15cf3f4d8a26a4f1f370c95a6f4476743886b6633f083f107c82fbe86c5548bbf37b7e2f8b79615d90b62777824e languageName: node linkType: hard @@ -26485,7 +26516,7 @@ __metadata: languageName: node linkType: hard -"react-is@npm:^18.0.0": +"react-is@npm:^18.0.0, react-is@npm:^18.2.0": version: 18.2.0 resolution: "react-is@npm:18.2.0" checksum: e72d0ba81b5922759e4aff17e0252bd29988f9642ed817f56b25a3e217e13eea8a7f2322af99a06edb779da12d5d636e9fda473d620df9a3da0df2a74141d53e