fix: all backlog fixes for ads v2 (#24012)
## Description 1. [Text shift](https://www.notion.so/appsmith/Text-shifts-when-we-click-on-the-JS-Toggle-button-7b6b0d91a0d04bbd980762cc9f84931e) https://github.com/appsmithorg/appsmith/assets/13763558/cbc1e668-83db-4b52-9691-67ce0f2c8e15 2. [Evaluated Value popup copy button compressed](https://theappsmith.slack.com/archives/C0293DVQACW/p1685949223985949) https://github.com/appsmithorg/appsmith/assets/13763558/6cdbd0af-a509-4df2-8fe5-128716ef9013 3. [Select placeholder in git merge](https://github.com/appsmithorg/appsmith/issues/24091) https://github.com/appsmithorg/appsmith/assets/13763558/a78fc5b2-eebb-4e53-834c-757102bb3f81 4. [Replace gif in Pagination](https://github.com/appsmithorg/appsmith/issues/24096) https://github.com/appsmithorg/appsmith/assets/13763558/2e1d3962-24cf-40a4-88ff-718614e87c87 5. [Toast stays put on hover](https://github.com/appsmithorg/appsmith/issues/24222) fixed by https://github.com/appsmithorg/design-system/pull/492 on design-system https://github.com/appsmithorg/appsmith/assets/13763558/f562f151-f569-46a7-8cc2-1d2b48d332ea 6. [spacing between widget name and entity name](https://github.com/appsmithorg/appsmith/issues/24092) before:  after:  #### Type of change - Bug fix (non-breaking change which fixes an issue) > ## Testing > #### How Has This Been Tested? > Please describe the tests that you ran to verify your changes. Also list any relevant details for your test configuration. > Delete anything that is not relevant - [ ] Manual - [ ] Jest - [ ] Cypress > > #### Test Plan > Add Testsmith test cases links that relate to this PR > > #### Issues raised during DP testing > Link issues raised during DP testing for better visiblity and tracking (copy link from comments dropped on this PR) > > > ## Checklist: #### Dev activity - [ ] My code follows the style guidelines of this project - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [ ] 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/Test-plan-implementation#speedbreaker-features-to-consider-for-every-change) have been covered - [ ] Test plan covers all impacted features and [areas of interest](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans/_edit#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 --------- Co-authored-by: Aswath K <aswath.sana@gmail.com> Co-authored-by: Rajat Agrawal <rajat@appsmith.com> Co-authored-by: Anagh Hegde <anagh@appsmith.com> Co-authored-by: Pawan Kumar <pawan.stardust@gmail.com> Co-authored-by: Satish Gandham <satish.iitg@gmail.com> Co-authored-by: Satish Gandham <hello@satishgandham.com> Co-authored-by: Ankita Kinger <ankita@appsmith.com> Co-authored-by: Trisha Anand <trisha@appsmith.com> Co-authored-by: Nidhi <nidhi@appsmith.com> Co-authored-by: Arpit Mohan <mohanarpit@users.noreply.github.com> Co-authored-by: Sumit Kumar <sumit@appsmith.com> Co-authored-by: ChandanBalajiBP <104058110+ChandanBalajiBP@users.noreply.github.com> Co-authored-by: Aishwarya-U-R <91450662+Aishwarya-U-R@users.noreply.github.com> Co-authored-by: balajisoundar <balaji@appsmith.com> Co-authored-by: Aishwarya UR <aishwarya@appsmith.com> Co-authored-by: sidhantgoel <sidhant@hexcod.in> Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com> Co-authored-by: Nilesh Sarupriya <nilesh@appsmith.com> Co-authored-by: Nilesh Sarupriya <20905988+nsarupr@users.noreply.github.com> Co-authored-by: nilansh <nilansh@appsmith.com> Co-authored-by: Ayangade Adeoluwa <37867493+Irongade@users.noreply.github.com> Co-authored-by: akash-codemonk <67054171+akash-codemonk@users.noreply.github.com> Co-authored-by: Vijetha-Kaja <119562824+Vijetha-Kaja@users.noreply.github.com> Co-authored-by: Manish Kumar <107841575+sondermanish@users.noreply.github.com> Co-authored-by: Sumesh Pradhan <sumesh@appsmith.com> Co-authored-by: Rishabh Rathod <rishabh.rathod@appsmith.com> Co-authored-by: Shrikant Sharat Kandula <shrikantsharat.k@gmail.com> Co-authored-by: Somangshu Goswami <somangshu.goswami1508@gmail.com> Co-authored-by: Tolulope Adetula <31691737+Tooluloope@users.noreply.github.com> Co-authored-by: Saroj <43822041+sarojsarab@users.noreply.github.com> Co-authored-by: Nayan <nayan@appsmith.com> Co-authored-by: Arsalan <arsalanyaldram0211@outlook.com> Co-authored-by: ashit-rath <ashit@appsmith.com> Co-authored-by: Rimil Dey <rimil@appsmith.com> Co-authored-by: Druthi Polisetty <druthi@appsmith.com> Co-authored-by: Sangeeth Sivan <74818788+berzerkeer@users.noreply.github.com> Co-authored-by: subratadeypappu <subrata@appsmith.com> Co-authored-by: Ayush Pahwa <ayush@appsmith.com> Co-authored-by: Abhijeet <41686026+abhvsn@users.noreply.github.com> Co-authored-by: Aman Agarwal <aman@appsmith.com> Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local> Co-authored-by: Anand Srinivasan <66776129+eco-monk@users.noreply.github.com> Co-authored-by: Anand Srinivasan <anand.a.srinivasan@outlook.com> Co-authored-by: Goutham Pratapa <goutham@appsmith.com> Co-authored-by: manish kumar <manish@appsmith.com> Co-authored-by: Dipyaman Biswas <dipyaman@appsmith.com> Co-authored-by: Ayush Pahwa <ayushpahwa96@gmail.com> Co-authored-by: Rohit Agarwal <rohit_agarwal@live.in> Co-authored-by: Ankit Srivastava <67647761+ankitsrivas14@users.noreply.github.com> Co-authored-by: tkAppsmith <131347120+tkAppsmith@users.noreply.github.com> Co-authored-by: Jaikanth J <31009437+jaikanthjay46@users.noreply.github.com> Co-authored-by: arunvjn <32433245+arunvjn@users.noreply.github.com> Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com> Co-authored-by: Mihir Joshi <mihir67mj@gmail.com> Co-authored-by: Mihir <mihir.joshi@senpiper.com> Co-authored-by: Vishnu Gp <vishnu@appsmith.com> Co-authored-by: Vemparala Surya Vamsi <121419957+vsvamsi1@users.noreply.github.com> Co-authored-by: Appsmith Bot <74705725+appsmith-bot@users.noreply.github.com> Co-authored-by: Valera Melnikov <valera@appsmith.com> Co-authored-by: Valera Melnikov <melnikov.vv@greendatasoft.ru> Co-authored-by: Dhruvik Neharia <dhruvik@appsmith.com> Co-authored-by: vadim <vadim@appsmith.com> Co-authored-by: Harshit Pandey <harshitpandey0426@gmail.com> Co-authored-by: Hetu Nandu <hetu@appsmith.com> Co-authored-by: SatVeer Singh <developer.satveer@gmail.com> Co-authored-by: Vijetha-Kaja <vijetha@appsmith.com>
This commit is contained in:
Tanvi Bhakta
GitHub
parent
cbd57450ca
commit
bbd083c3d4
|
|
@ -91,7 +91,7 @@
|
|||
"cypress-log-to-output": "^1.1.2",
|
||||
"dayjs": "^1.10.6",
|
||||
"deep-diff": "^1.0.2",
|
||||
"design-system": "npm:@appsmithorg/design-system@2.1.11",
|
||||
"design-system": "npm:@appsmithorg/design-system@2.1.11-alpha.4",
|
||||
"design-system-old": "npm:@appsmithorg/design-system-old@1.1.8",
|
||||
"downloadjs": "^1.4.7",
|
||||
"fast-deep-equal": "^3.1.3",
|
||||
|
|
|
|||
BIN
app/client/src/assets/icons/gifs/config_pagination.gif
Normal file
BIN
app/client/src/assets/icons/gifs/config_pagination.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 222 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 80 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 82 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.3 KiB |
BIN
app/client/src/assets/icons/gifs/thumbnail.png
Normal file
BIN
app/client/src/assets/icons/gifs/thumbnail.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.6 KiB |
|
|
@ -71,8 +71,8 @@ const ContentWrapper = styled.div<{ colorTheme: EditorTheme }>`
|
|||
`;
|
||||
|
||||
const CopyIconWrapper = styled(Button)`
|
||||
position: absolute;
|
||||
right: 0;
|
||||
position: absolute !important;
|
||||
right: var(--ads-v2-spaces-2);
|
||||
top: var(--ads-v2-spaces-2);
|
||||
cursor: pointer;
|
||||
padding: 0;
|
||||
|
|
|
|||
|
|
@ -93,7 +93,6 @@ export const EditorWrapper = styled.div<{
|
|||
: props.theme.colors.textDefault} !important;
|
||||
}
|
||||
.cm-s-duotone-light.CodeMirror {
|
||||
padding: 0 6px;
|
||||
border-radius: var(--ads-v2-border-radius);
|
||||
/* ${(props) =>
|
||||
props.isFocused &&
|
||||
|
|
|
|||
|
|
@ -7,15 +7,11 @@ import { PaginationType } from "entities/Action";
|
|||
import RadioFieldGroup from "components/editorComponents/form/fields/RadioGroupField";
|
||||
import { Classes, Text, TextType } from "design-system-old";
|
||||
import { Button } from "design-system";
|
||||
import {
|
||||
CodeEditorBorder,
|
||||
EditorTheme,
|
||||
} from "components/editorComponents/CodeEditor/EditorConfig";
|
||||
import type { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig";
|
||||
import { CodeEditorBorder } from "components/editorComponents/CodeEditor/EditorConfig";
|
||||
import { GifPlayer } from "design-system-old";
|
||||
import lightmodeGif from "assets/icons/gifs/config_pagination_lightmode.gif";
|
||||
import darkmodeGif from "assets/icons/gifs/config_pagination_darkmode.gif";
|
||||
import lightmodeThumbnail from "assets/icons/gifs/lightmode_thumbnail.png";
|
||||
import darkmodeThumbnail from "assets/icons/gifs/darkmode_thumbnail.png";
|
||||
import thumbnail from "assets/icons/gifs/thumbnail.png";
|
||||
import configPagination from "assets/icons/gifs/config_pagination.gif";
|
||||
|
||||
interface PaginationProps {
|
||||
actionName: string;
|
||||
|
|
@ -144,18 +140,7 @@ export default function Pagination(props: PaginationProps) {
|
|||
</BindingKey>
|
||||
</div>
|
||||
<GifContainer>
|
||||
<GifPlayer
|
||||
gif={
|
||||
props.theme === EditorTheme.LIGHT
|
||||
? lightmodeGif
|
||||
: darkmodeGif
|
||||
}
|
||||
thumbnail={
|
||||
props.theme === EditorTheme.LIGHT
|
||||
? lightmodeThumbnail
|
||||
: darkmodeThumbnail
|
||||
}
|
||||
/>
|
||||
<GifPlayer gif={configPagination} thumbnail={thumbnail} />
|
||||
<Text type={TextType.P3}>
|
||||
1. How to configure table for pagination
|
||||
</Text>
|
||||
|
|
@ -228,18 +213,7 @@ export default function Pagination(props: PaginationProps) {
|
|||
</PaginationFieldWrapper>
|
||||
</div>
|
||||
<GifContainer>
|
||||
<GifPlayer
|
||||
gif={
|
||||
props.theme === EditorTheme.LIGHT
|
||||
? lightmodeGif
|
||||
: darkmodeGif
|
||||
}
|
||||
thumbnail={
|
||||
props.theme === EditorTheme.LIGHT
|
||||
? lightmodeThumbnail
|
||||
: darkmodeThumbnail
|
||||
}
|
||||
/>
|
||||
<GifPlayer gif={configPagination} thumbnail={thumbnail} />
|
||||
<Text type={TextType.P3}>
|
||||
1. How to configure table for pagination
|
||||
</Text>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ import { PROPERTY_SEARCH_INPUT_PLACEHOLDER } from "@appsmith/constants/messages"
|
|||
|
||||
const Container = styled.div`
|
||||
position: sticky;
|
||||
top: 42px;
|
||||
top: 44px;
|
||||
z-index: 3;
|
||||
margin-bottom: 2px;
|
||||
background: var(--ads-v2-color-white);
|
||||
|
|
|
|||
|
|
@ -59,8 +59,6 @@ const Row = styled.div`
|
|||
align-items: center;
|
||||
`;
|
||||
|
||||
const DEFAULT_OPTION = "--Select--";
|
||||
|
||||
function MergeSuccessIndicator() {
|
||||
const theme = useTheme() as Theme;
|
||||
|
||||
|
|
@ -98,10 +96,10 @@ export default function Merge() {
|
|||
const [showMergeSuccessIndicator, setShowMergeSuccessIndicator] =
|
||||
useState(false);
|
||||
|
||||
const [selectedBranchOption, setSelectedBranchOption] = useState({
|
||||
label: DEFAULT_OPTION,
|
||||
value: DEFAULT_OPTION,
|
||||
});
|
||||
const [selectedBranchOption, setSelectedBranchOption] = useState<{
|
||||
label: string;
|
||||
value: string;
|
||||
}>();
|
||||
|
||||
/**
|
||||
* Removes the current branch from the list
|
||||
|
|
@ -160,18 +158,18 @@ export default function Merge() {
|
|||
AnalyticsUtil.logEvent("GS_MERGE_CHANGES_BUTTON_CLICK", {
|
||||
source: "GIT_MERGE_MODAL",
|
||||
});
|
||||
if (currentBranch && selectedBranchOption.value) {
|
||||
if (currentBranch && selectedBranchOption?.value) {
|
||||
dispatch(
|
||||
mergeBranchInit({
|
||||
payload: {
|
||||
sourceBranch: currentBranch,
|
||||
destinationBranch: selectedBranchOption.value,
|
||||
destinationBranch: selectedBranchOption?.value,
|
||||
},
|
||||
onSuccessCallback: handleMergeSuccess,
|
||||
}),
|
||||
);
|
||||
}
|
||||
}, [currentBranch, selectedBranchOption.value, dispatch]);
|
||||
}, [currentBranch, selectedBranchOption?.value, dispatch]);
|
||||
|
||||
useEffect(() => {
|
||||
dispatch(fetchGitStatusInit());
|
||||
|
|
@ -183,25 +181,18 @@ export default function Merge() {
|
|||
|
||||
useEffect(() => {
|
||||
// when user selects a branch to merge
|
||||
if (
|
||||
selectedBranchOption.value !== DEFAULT_OPTION &&
|
||||
currentBranch &&
|
||||
selectedBranchOption.value
|
||||
) {
|
||||
if (currentBranch && selectedBranchOption?.value) {
|
||||
dispatch(
|
||||
fetchMergeStatusInit({
|
||||
sourceBranch: currentBranch,
|
||||
destinationBranch: selectedBranchOption.value,
|
||||
destinationBranch: selectedBranchOption?.value,
|
||||
}),
|
||||
);
|
||||
setShowMergeSuccessIndicator(false);
|
||||
}
|
||||
}, [currentBranch, selectedBranchOption.value, dispatch]);
|
||||
}, [currentBranch, selectedBranchOption?.value, dispatch]);
|
||||
|
||||
const mergeBtnDisabled =
|
||||
DEFAULT_OPTION === selectedBranchOption.value ||
|
||||
isFetchingMergeStatus ||
|
||||
!isMergeAble;
|
||||
const mergeBtnDisabled = isFetchingMergeStatus || !isMergeAble;
|
||||
|
||||
let status = MERGE_STATUS_STATE.NONE;
|
||||
if (isFetchingGitStatus) {
|
||||
|
|
|
|||
|
|
@ -9638,7 +9638,7 @@ __metadata:
|
|||
cypress-xpath: ^1.6.0
|
||||
dayjs: ^1.10.6
|
||||
deep-diff: ^1.0.2
|
||||
design-system: "npm:@appsmithorg/design-system@2.1.11"
|
||||
design-system: "npm:@appsmithorg/design-system@2.1.11-alpha.4"
|
||||
design-system-old: "npm:@appsmithorg/design-system-old@1.1.8"
|
||||
diff: ^5.0.0
|
||||
dotenv: ^8.1.0
|
||||
|
|
@ -13675,9 +13675,9 @@ __metadata:
|
|||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"design-system@npm:@appsmithorg/design-system@2.1.11":
|
||||
version: 2.1.11
|
||||
resolution: "@appsmithorg/design-system@npm:2.1.11"
|
||||
"design-system@npm:@appsmithorg/design-system@2.1.11-alpha.4":
|
||||
version: 2.1.11-alpha.4
|
||||
resolution: "@appsmithorg/design-system@npm:2.1.11-alpha.4"
|
||||
dependencies:
|
||||
"@radix-ui/react-dialog": ^1.0.2
|
||||
"@radix-ui/react-dropdown-menu": ^2.0.4
|
||||
|
|
@ -13702,7 +13702,7 @@ __metadata:
|
|||
react-dom: ^17.0.2
|
||||
react-router-dom: ^5.0.0
|
||||
styled-components: ^5.3.6
|
||||
checksum: d2dab007f1a943067928dd019e64dd89648b94246320a3a54d1620d8b696baf74311e256e1176be9e2eef1b13f4f433549a023e8335c326c1438f3361bc76146
|
||||
checksum: 66014d3ccfd789c0c86b0b6697ec35e77fe133d52e30706ef6a248b350c14e281898bb326fbe4f521edd39b2c892b39b028f5bc45b70a2fd74331a183f8055ca
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user