fix: alignment of the image seen on no search results on application page (#13950)
* fix: 12861 trim unnecessary re-render in select widget in server side rendering (#12865)
* add debounce to search and remove state var
* increase debounce time
* fix: updated the condition to show expiry key (#13092)
* Add index for git (#13133)
* fix: Fixed compile time errors
* fix: Unable to see apps in home page after git connect fails (#13387)
* Fix Redis installation in Dockerfile (#13428) (#13430)
Conflicts:
Dockerfile
* fix: only execute pageload actions after successfully fetching actions and jscollections in view mode (#13521)
* prevent execution of onPageLoad actions before sucessful actions fetch
* Perform url update before fetching actions and jscollections
(cherry picked from commit 7261834fe5)
* fix: NPE check when datasource createdAt is null
(cherry picked from commit beafb371b24180dce2e351f1dea6d9d34db2a204)
* fixed image alignment for no search results on applications page
* deleted duplicate file
* reload to Refresh script update
* Adding sleep - script fix
Co-authored-by: Preet Sidhu <preetsidhu.bits@gmail.com>
Co-authored-by: Aman Agarwal <aman@appsmith.com>
Co-authored-by: Abhijeet <41686026+abhvsn@users.noreply.github.com>
Co-authored-by: Nidhi <nidhi.nair93@gmail.com>
Co-authored-by: Somangshu Goswami <somangshu.goswami1508@gmail.com>
Co-authored-by: Rimil Dey <rimildeyjsr@gmail.com>
Co-authored-by: Anagh Hegde <anagh@appsmith.com>
Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
Co-authored-by: Arpit Mohan <mohanarpit@users.noreply.github.com>
Co-authored-by: Favour Ohanekwu <fohanekwu@gmail.com>
Co-authored-by: Trisha Anand <trisha@appsmith.com>
Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
This commit is contained in:
parent
845d5b2ad4
commit
fa45282b0a
|
|
@ -143,7 +143,7 @@ describe("JSObjects OnLoad Actions tests", function() {
|
|||
agHelper.ClickButton("No");
|
||||
agHelper.ValidateToastMessage("Failed to execute actions during page load"); //When Confirmation is NO
|
||||
table.WaitForTableEmpty();
|
||||
cy.reload();
|
||||
agHelper.RefreshPage();
|
||||
agHelper.AssertElementPresence(jsEditor._dialog("Confirmation Dialog"));
|
||||
agHelper.AssertElementPresence(
|
||||
jsEditor._dialogBody((jsName as string) + ".getId"),
|
||||
|
|
@ -510,7 +510,7 @@ describe("JSObjects OnLoad Actions tests", function() {
|
|||
|
||||
it("12. Tc #1646 - Honouring the order of execution & Bug 13826 + Bug 13646 - Delpoy page", () => {
|
||||
agHelper.DeployApp();
|
||||
|
||||
agHelper.Sleep(2000);
|
||||
agHelper.AssertElementPresence(jsEditor._dialogBody("getBooks"));
|
||||
agHelper.ClickButton("No");
|
||||
agHelper.ValidateToastMessage('The action "getBooks" has failed');
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ export class AggregateHelper {
|
|||
).then((dslDumpResp) => {
|
||||
//cy.log("Pages resposne is : " + dslDumpResp.body);
|
||||
expect(dslDumpResp.status).equal(200);
|
||||
cy.reload();
|
||||
this.RefreshPage();
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
@ -476,6 +476,7 @@ export class AggregateHelper {
|
|||
|
||||
public RefreshPage() {
|
||||
cy.reload();
|
||||
this.Sleep(2000)
|
||||
}
|
||||
|
||||
public ActionContextMenuWithInPane(
|
||||
|
|
|
|||
|
|
@ -1,77 +0,0 @@
|
|||
import React, { useEffect, useState } from "react";
|
||||
import {
|
||||
Field,
|
||||
WrappedFieldMetaProps,
|
||||
WrappedFieldInputProps,
|
||||
} from "redux-form";
|
||||
import Dropdown from "components/ads/Dropdown";
|
||||
|
||||
type DropdownWrapperProps = {
|
||||
placeholder: string;
|
||||
input?: {
|
||||
value?: string;
|
||||
onChange?: (value?: string) => void;
|
||||
};
|
||||
options: Array<{ id: string; value: string; label?: string }>;
|
||||
fillOptions?: boolean;
|
||||
};
|
||||
|
||||
function DropdownWrapper(props: DropdownWrapperProps) {
|
||||
const [selectedOption, setSelectedOption] = useState({
|
||||
value: props.placeholder,
|
||||
});
|
||||
const onSelectHandler = (value?: string) => {
|
||||
props.input && props.input.onChange && props.input.onChange(value);
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
if (props.input && props.input.value) {
|
||||
setSelectedOption({ value: props.input.value });
|
||||
} else if (props.placeholder) {
|
||||
setSelectedOption({ value: props.placeholder });
|
||||
}
|
||||
}, [props.input, props.placeholder]);
|
||||
|
||||
return (
|
||||
<Dropdown
|
||||
fillOptions={props.fillOptions}
|
||||
onSelect={onSelectHandler}
|
||||
options={props.options}
|
||||
selected={selectedOption}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
const renderComponent = (
|
||||
componentProps: SelectFieldProps & {
|
||||
meta: Partial<WrappedFieldMetaProps>;
|
||||
input: Partial<WrappedFieldInputProps>;
|
||||
},
|
||||
) => {
|
||||
return <DropdownWrapper {...componentProps} />;
|
||||
};
|
||||
|
||||
type SelectFieldProps = {
|
||||
name: string;
|
||||
placeholder: string;
|
||||
options: Array<{ id: string; value: string; label?: string }>;
|
||||
size?: "large" | "small";
|
||||
outline?: boolean;
|
||||
fillOptions?: boolean;
|
||||
};
|
||||
|
||||
export function SelectField(props: SelectFieldProps) {
|
||||
return (
|
||||
<Field
|
||||
component={renderComponent}
|
||||
fillOptions={props.fillOptions}
|
||||
name={props.name}
|
||||
options={props.options}
|
||||
outline={props.outline}
|
||||
placeholder={props.placeholder}
|
||||
size={props.size}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
export default SelectField;
|
||||
|
|
@ -624,7 +624,6 @@ function ApplicationsSection(props: any) {
|
|||
<CenteredWrapper
|
||||
style={{
|
||||
flexDirection: "column",
|
||||
marginTop: "-150px",
|
||||
position: "static",
|
||||
}}
|
||||
>
|
||||
|
|
|
|||
|
|
@ -454,6 +454,32 @@ export function* initializeAppViewerSaga(
|
|||
//Delay page load actions till all actions are retrieved.
|
||||
yield put(fetchPublishedPageSuccess([executePageLoadActions()]));
|
||||
|
||||
if (toLoadPageId) {
|
||||
yield put(fetchPublishedPage(toLoadPageId, true));
|
||||
|
||||
const resultOfFetchPage: {
|
||||
success: boolean;
|
||||
failure: boolean;
|
||||
} = yield race({
|
||||
success: take(ReduxActionTypes.FETCH_PUBLISHED_PAGE_SUCCESS),
|
||||
failure: take(ReduxActionErrorTypes.FETCH_PUBLISHED_PAGE_ERROR),
|
||||
});
|
||||
|
||||
if (resultOfFetchPage.failure) {
|
||||
yield put({
|
||||
type: ReduxActionTypes.SAFE_CRASH_APPSMITH_REQUEST,
|
||||
payload: {
|
||||
code: get(
|
||||
resultOfFetchPage,
|
||||
"failure.payload.error.code",
|
||||
ERROR_CODES.SERVER_ERROR,
|
||||
),
|
||||
},
|
||||
});
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
yield put(fetchCommentThreadsInit());
|
||||
|
||||
yield put({
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user