Skip to content

Commit

Permalink
fix: redux-forms import resolved.
Browse files Browse the repository at this point in the history
  • Loading branch information
yaldram committed Apr 22, 2022
1 parent 15d9d99 commit 9e00e2c
Show file tree
Hide file tree
Showing 98 changed files with 150 additions and 105 deletions.
2 changes: 1 addition & 1 deletion app/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
"react-window": "^1.8.6",
"react-zoom-pan-pinch": "^1.6.1",
"redux": "^4.0.1",
"redux-form": "^8.2.6",
"redux-form": "^8.3.8",
"redux-saga": "^1.1.3",
"remixicon-react": "^1.0.0",
"reselect": "^4.0.0",
Expand Down
2 changes: 1 addition & 1 deletion app/client/src/ce/configs/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export const getConfigsFromEnvVars = (): INJECTED_CONFIGS => {
(process.env.REACT_APP_CLIENT_LOG_LEVEL as
| "debug"
| "error"
| undefined) || "error",
| undefined) || "debug",
google: process.env.REACT_APP_GOOGLE_MAPS_API_KEY || "",
enableTNCPP: process.env.REACT_APP_TNC_PP
? process.env.REACT_APP_TNC_PP.length > 0
Expand Down
6 changes: 5 additions & 1 deletion app/client/src/ce/pages/UserAuth/Login.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import React from "react";
import { Link, Redirect, useLocation } from "react-router-dom";
import { connect, useSelector } from "react-redux";
import { InjectedFormProps, reduxForm, formValueSelector } from "redux-form";
import {
InjectedFormProps,
reduxForm,
formValueSelector,
} from "redux-form/dist/redux-form";
import {
LOGIN_FORM_NAME,
LOGIN_FORM_EMAIL_FIELD_NAME,
Expand Down
6 changes: 5 additions & 1 deletion app/client/src/ce/pages/UserAuth/SignUp.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import React, { useEffect } from "react";
import { reduxForm, InjectedFormProps, formValueSelector } from "redux-form";
import {
reduxForm,
InjectedFormProps,
formValueSelector,
} from "redux-form/dist/redux-form";
import { AUTH_LOGIN_URL } from "constants/routes";
import { SIGNUP_FORM_NAME } from "constants/forms";
import {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from "react";

import { reduxForm } from "redux-form";
import { reduxForm } from "redux-form/dist/redux-form";

import FormGroup from "components/ads/formFields/FormGroup";
import FormTextField from "components/ads/formFields/TextField";
Expand Down
2 changes: 1 addition & 1 deletion app/client/src/comments/CommentsShowcaseCarousel/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import ProgressiveImage, {
import styled, { withTheme } from "styled-components";
import { Theme } from "constants/DefaultTheme";
import { useDispatch, useSelector } from "react-redux";
import { getFormSyncErrors, getFormValues } from "redux-form";
import { getFormSyncErrors, getFormValues } from "redux-form/dist/redux-form";

import { isIntroCarouselVisibleSelector } from "selectors/commentsSelectors";
import { getCurrentUser } from "selectors/usersSelectors";
Expand Down
2 changes: 1 addition & 1 deletion app/client/src/comments/inlineComments/AddCommentInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import {

import { setShowAppInviteUsersDialog } from "actions/applicationActions";
import { useDispatch, useSelector } from "react-redux";
import { change } from "redux-form";
import { change } from "redux-form/dist/redux-form";

import { INVITE_USERS_TO_ORG_FORM } from "constants/forms";

Expand Down
2 changes: 1 addition & 1 deletion app/client/src/components/ads/formFields/CopyUrlForm.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useEffect } from "react";
import { InjectedFormProps, reduxForm } from "redux-form";
import { InjectedFormProps, reduxForm } from "redux-form/dist/redux-form";
import { HelpIcons } from "icons/HelpIcons";
import UneditableField from "components/ads/formFields/UneditableField";
import styled from "styled-components";
Expand Down
2 changes: 1 addition & 1 deletion app/client/src/components/ads/formFields/TextAreaField.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import { Field, WrappedFieldMetaProps } from "redux-form";
import { Field, WrappedFieldMetaProps } from "redux-form/dist/redux-form";
import { Intent } from "constants/DefaultTheme";
import FormFieldError from "components/ads/formFields/FieldError";
import {
Expand Down
2 changes: 1 addition & 1 deletion app/client/src/components/ads/formFields/TextField.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
Field,
WrappedFieldMetaProps,
WrappedFieldInputProps,
} from "redux-form";
} from "redux-form/dist/redux-form";
import InputComponent, { InputType } from "../TextInput";
import { Intent } from "constants/DefaultTheme";
import FormFieldError from "./FieldError";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { render } from "test/testUtils";
import React from "react";
import UneditableField from "./UneditableField";
import { REDIRECT_URL_FORM } from "constants/forms";
import { reduxForm } from "redux-form";
import { reduxForm } from "redux-form/dist/redux-form";

let container: any = null;
const setting = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
Field,
WrappedFieldMetaProps,
WrappedFieldInputProps,
} from "redux-form";
} from "redux-form/dist/redux-form";
import InputComponent, { InputType } from "../TextInput";
import { Intent } from "constants/DefaultTheme";
import { Colors } from "constants/Colors";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import React from "react";
import Select, { InputActionMeta } from "react-select";
import { WrappedFieldInputProps, WrappedFieldMetaProps } from "redux-form";
import {
WrappedFieldInputProps,
WrappedFieldMetaProps,
} from "redux-form/dist/redux-form";

import { theme } from "constants/DefaultTheme";
import { SelectComponents } from "react-select/src/components";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from "react";
import Select from "react-select";

import { WrappedFieldInputProps } from "redux-form";
import { WrappedFieldInputProps } from "redux-form/dist/redux-form";
import { SelectComponentsConfig } from "react-select/src/components";
import { LayersContext } from "constants/Layers";
import { Colors } from "constants/Colors";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import React, { Component } from "react";
import styled from "styled-components";
import { WrappedFieldInputProps, WrappedFieldMetaProps } from "redux-form";
import {
WrappedFieldInputProps,
WrappedFieldMetaProps,
} from "redux-form/dist/redux-form";
import {
IconName,
IInputGroupProps,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import "codemirror/addon/lint/lint.css";

import { getDataTreeForAutocomplete } from "selectors/dataTreeSelectors";
import EvaluatedValuePopup from "components/editorComponents/CodeEditor/EvaluatedValuePopup";
import { WrappedFieldInputProps } from "redux-form";
import { WrappedFieldInputProps } from "redux-form/dist/redux-form";
import _, { isString } from "lodash";
import {
DataTree,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
IItemListRendererProps,
} from "@blueprintjs/select";
import { ButtonVariantTypes, DropdownOption } from "components/constants";
import { WrappedFieldInputProps } from "redux-form";
import { WrappedFieldInputProps } from "redux-form/dist/redux-form";

interface ButtonWrapperProps {
height?: string;
Expand Down
2 changes: 1 addition & 1 deletion app/client/src/components/editorComponents/Form.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Form } from "redux-form";
import { Form } from "redux-form/dist/redux-form";
import styled from "styled-components";

const StyledForm = styled(Form)`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from "react";
import styled from "styled-components";
import { Intent as BlueprintIntent, InputGroup } from "@blueprintjs/core";
import { Intent, BlueprintInputTransform } from "constants/DefaultTheme";
import { WrappedFieldInputProps } from "redux-form";
import { WrappedFieldInputProps } from "redux-form/dist/redux-form";

const StyledInputGroup = styled(InputGroup)`
&&& {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
Field,
WrappedFieldMetaProps,
WrappedFieldInputProps,
} from "redux-form";
} from "redux-form/dist/redux-form";
import InputComponent, {
InputType,
} from "components/editorComponents/InputComponent";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
import { ControlProps } from "components/formControls/BaseControl";
import { connect } from "react-redux";
import { AnyAction, bindActionCreators, Dispatch } from "redux";
import { change } from "redux-form";
import { change } from "redux-form/dist/redux-form";

type Props = {
viewType: ViewTypes;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Checkbox, { CheckboxProps } from "components/ads/Checkbox";
import React from "react";
import { Field, BaseFieldProps } from "redux-form";
import { Field, BaseFieldProps } from "redux-form/dist/redux-form";

type RenderComponentProps = CheckboxProps & {
input?: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
BaseDropdown,
DropdownProps,
} from "components/designSystems/appsmith/Dropdown";
import { Field } from "redux-form";
import { Field } from "redux-form/dist/redux-form";
import { replayHighlightClass } from "globalStyles/portals";

interface DropdownFieldProps {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Dropdown from "components/ads/Dropdown";
import { Colors } from "constants/Colors";
import React, { useEffect, useState } from "react";
import { WrappedFieldInputProps } from "redux-form";
import { WrappedFieldInputProps } from "redux-form/dist/redux-form";

type DropdownWrapperProps = {
placeholder: string;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import { Field, BaseFieldProps } from "redux-form";
import { Field, BaseFieldProps } from "redux-form/dist/redux-form";
import DropdownComponent from "components/editorComponents/DropdownComponent";
import { DropdownOption } from "components/constants";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import { Field, BaseFieldProps } from "redux-form";
import { Field, BaseFieldProps } from "redux-form/dist/redux-form";
import CodeEditor, {
EditorStyleProps,
} from "components/editorComponents/CodeEditor";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
Field,
formValueSelector,
WrappedFieldInputProps,
} from "redux-form";
} from "redux-form/dist/redux-form";
import CodeEditor, {
EditorProps,
} from "components/editorComponents/CodeEditor";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useEffect } from "react";
import { FieldArray, WrappedFieldArrayProps } from "redux-form";
import { FieldArray, WrappedFieldArrayProps } from "redux-form/dist/redux-form";
import styled from "styled-components";
import DynamicTextField from "./DynamicTextField";
import FormRow from "components/editorComponents/FormRow";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import { Field, BaseFieldProps } from "redux-form";
import { Field, BaseFieldProps } from "redux-form/dist/redux-form";
import TextInput, { TextInputProps } from "components/ads/TextInput";

type RenderComponentProps = TextInputProps & {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from "react";
import _ from "lodash";
import { Field } from "redux-form";
import { Field } from "redux-form/dist/redux-form";
import RadioGroupWrapper, { RadioGroupWrapperProps } from "./RadioGroupWrapper";

interface RadioFieldProps {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import RadioComponent from "components/ads/Radio";
import React, { useEffect, useState } from "react";
import { WrappedFieldInputProps } from "redux-form";
import { WrappedFieldInputProps } from "redux-form/dist/redux-form";

export type RadioGroupWrapperProps = {
placeholder: string;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from "react";
import _ from "lodash";
import { Field, WrappedFieldProps } from "redux-form";
import { Field, WrappedFieldProps } from "redux-form/dist/redux-form";
import DropdownFieldWrapper from "components/editorComponents/form/fields/DropdownFieldWrapper";

interface RequestDropdownProps {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
Field,
WrappedFieldMetaProps,
WrappedFieldInputProps,
} from "redux-form";
} from "redux-form/dist/redux-form";
import DropdownWrapper from "./DropdownWrapper";

const renderComponent = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
Field,
WrappedFieldMetaProps,
WrappedFieldInputProps,
} from "redux-form";
} from "redux-form/dist/redux-form";
import TagInputComponent from "components/ads/TagInputComponent";
import { Intent } from "constants/DefaultTheme";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import { Field, BaseFieldProps } from "redux-form";
import { Field, BaseFieldProps } from "redux-form/dist/redux-form";
import {
BaseTextInput,
TextInputProps,
Expand Down
2 changes: 1 addition & 1 deletion app/client/src/components/formControls/CheckboxControl.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
Field,
WrappedFieldInputProps,
WrappedFieldMetaProps,
} from "redux-form";
} from "redux-form/dist/redux-form";
import styled from "styled-components";

const StyledCheckbox = styled(Checkbox)``;
Expand Down
2 changes: 1 addition & 1 deletion app/client/src/components/formControls/DropDownControl.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
Field,
WrappedFieldInputProps,
WrappedFieldMetaProps,
} from "redux-form";
} from "redux-form/dist/redux-form";
import { connect } from "react-redux";
import { AppState } from "reducers";
import { getDynamicFetchedValues } from "selectors/formSelectors";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from "react";
import { render, screen } from "test/testUtils";
import DynamicInputTextControl from "./DynamicInputTextControl";
import { reduxForm } from "redux-form";
import { reduxForm } from "redux-form/dist/redux-form";
import { mockCodemirrorRender } from "test/__mocks__/CodeMirrorEditorMock";
import userEvent from "@testing-library/user-event";
import { waitFor } from "@testing-library/dom";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import BaseControl, { ControlProps } from "./BaseControl";
import { ControlType } from "constants/PropertyControlConstants";
import DynamicTextField from "components/editorComponents/form/fields/DynamicTextField";
import { AppState } from "reducers";
import { formValueSelector } from "redux-form";
import { formValueSelector } from "redux-form/dist/redux-form";
import { QUERY_EDITOR_FORM_NAME } from "constants/forms";
import { connect } from "react-redux";
import { actionPathFromName } from "components/formControls/utils";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from "react";
import { render, screen } from "test/testUtils";
import DynamicTextFieldControl from "./DynamicTextFieldControl";
import { reduxForm } from "redux-form";
import { reduxForm } from "redux-form/dist/redux-form";
import { mockCodemirrorRender } from "test/__mocks__/CodeMirrorEditorMock";
import { PluginType } from "entities/Action";
import { waitFor } from "@testing-library/dom";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import { formValueSelector, change } from "redux-form";
import { formValueSelector, change } from "redux-form/dist/redux-form";
import { connect } from "react-redux";
import BaseControl, { ControlProps } from "./BaseControl";
import { ControlType } from "constants/PropertyControlConstants";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Text, { TextType } from "components/ads/Text";
import Icon, { IconSize } from "components/ads/Icon";
import { Classes } from "components/ads/common";
import styled from "styled-components";
import { FieldArray } from "redux-form";
import { FieldArray } from "redux-form/dist/redux-form";
import { ControlProps } from "./BaseControl";

const CenteredIcon = styled(Icon)`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
Field,
WrappedFieldInputProps,
WrappedFieldMetaProps,
} from "redux-form";
} from "redux-form/dist/redux-form";
import DialogComponent from "components/ads/DialogComponent";
import { useEffect, useCallback } from "react";
import { replayHighlightClass } from "globalStyles/portals";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
Field,
WrappedFieldMetaProps,
WrappedFieldInputProps,
} from "redux-form";
} from "redux-form/dist/redux-form";

export const StyledInfo = styled.span`
font-weight: normal;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
WrappedFieldArrayProps,
WrappedFieldMetaProps,
WrappedFieldInputProps,
} from "redux-form";
} from "redux-form/dist/redux-form";
import styled from "styled-components";
import { Icon } from "@blueprintjs/core";
import { FormIcons } from "icons/FormIcons";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { JSXElementConstructor, useEffect } from "react";
import { FieldArray, WrappedFieldArrayProps } from "redux-form";
import { FieldArray, WrappedFieldArrayProps } from "redux-form/dist/redux-form";
import styled from "styled-components";
import { Icon } from "@blueprintjs/core";
import { FormIcons } from "icons/FormIcons";
Expand Down
Loading

0 comments on commit 9e00e2c

Please sign in to comment.