* Delete CommonComponentProps, Classes, import them from design-system * Delete Icon.test.tsx * Remove color utils, add import from design-system * Remove Variant, add import from design-system * Remove unused toast parameters from common * use design-system version 28-alpha-7 * Move ThemeProp from ads/common to widgets/constants * fix import * Delete index.ts * feat: migrated form group from ads folder to design system repository (#17400) * feat: migrated form group from ads folder to design system repo * fix: formGroup label color fix * DS version updated * Updated Label Config * chore: Flapdoodle version upgrade to 3.5.0 (#17609) * chore: code split tenant API CE (#17596) ## Description We shouldn't expose tenant config on CE , so on CE, we should only return the necessary user permissions hard coded on the saga. ## Type of change - New feature (non-breaking change which adds functionality) ## How Has This Been Tested? - Manual ## Checklist: - [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 * chore: BaseAppsmithRepo code split (#17614) * chore: Updating the tenant API to return the complete object instead of just the configuration (#17615) * Fix sandbox iframe default setting (#17618) * feat: upgrade hooks | audit logs (#17525) * feat: Text Widget Reskinning (#17298) * feat: Use truncate button color from theme * fix: Update Truncate Button Color validation regex * feat: Maintain Focus and Context Phase 1 (#16317) * fix: update regex and test case for organisation website (#17612) * chore: Add properties to analytics event (#17621) * feat: enabled setTimeout/clearTimeout APIs (#17445) * Update top contributors * fix: ms sql default port updated to 1433 (#17342) * fix: removed global style from design system dropdown component (#17392) * bug: removed global style from design system dropdown component * changed design system package version * fix: Dropdown background fix - design system * design-system - dropdown background color fix * DS version updated * chore: Fixing broken client build (#17634) ## Description EE client build is broken due to not following proper code splitting strategy; one file in particularly didn't get split earlier and changes to that file broke the client build on EE. This PR fixes the issues. * Fix/16994 refactor common datatype handling (#17429) * fix:Add array datatype to execute request * feat: Consume and store type of array elements in Param class (#16994) * Append param instead of clientDataType in varargs (#16994) * Refactor common data type handling w.r.t newer structure (#16994) This commit takes care of the following items: - It minimizes the number of usage to the older stringToKnownDataTypeConverter method - Modifies the existing test cases to conform to the newer structure - Marks stringToKnownDataTypeConverter method as deprecated to discourage further use * Remove comma delimited numbers from valid test cases (#16994) * Fix extracting clientDataType from varargs in MySQL (#16994) * Pass param as a dedicated parameter in json smart replacement (#16994) * Remove varargs from json smart replacement method (#16994) * Move BsonType to mongoplugin module (#16994) * Introduce NullArrayType and refactor BsonType test cases (#16994) * Add new test cases on numeric string with leading zero (#16994) * Refactor test case name (#16994) * Add comment on the ordering of Json and Bson types (#16994) * Add comment on the ordering of Json and Bson types (#16994) * Add NullArrayType in Postgres and introduce postgres-specific types (#16994) * Add data type test cases for Postgres and change as per review comments (#16994) Co-authored-by: ChandanBalajiBP <chandan@appsmith.com> * feat: Update invite modal submit when we have tabs in modal (#17608) ## Description > Update invite modal submit when we have tabs in modal. Fixes [#16741](https://github.com/appsmithorg/appsmith/issues/16741) ## Type of change - New feature (non-breaking change which adds functionality) ## How Has This Been Tested? > Tested it locally. ## Checklist: - [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 * feat: AST based entity refactor (#17434) * task: AST based entity refactor * implemented refactor logic * jest cases with string manipulation using AST logic * comments and indentation * added evalVersion to request * chore: Added feature flag for datasource environments (#17657) chore: Added Feature flag for datasource environments * chore: Corrected analytics event for instance setting events (#17622) * Update top contributors * Fix typo in cloud-hosting check and NPE from Segment (#17692) Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com> * fix: remove file references on click of cancel button (#17664) * fix: table does not show data issue fixed (#17459) * chore: Add recommended indexes (#17704) Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com> * chore: Added workspace details to user invite analytic event (#17644) ## Description This PR adds the workspace details to user invite analytics event ## Type of change - New feature (non-breaking change which adds functionality) ## How Has This Been Tested? - Manually on local ## Checklist: - [x] My code follows the style guidelines of this project - [x] 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 - [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 * chore: Correct the toast font on windows (#17671) * fix: JS option missing for Label Font Style in Input widget (#17631) * fix: replace time based action to event based (#17586) * fix: replace time based action to event based - The delete datasource button was getting reset to it's original state after a static time of 2200ms - Replaced this to reset on completion of deletion instead * fix: removed unused functions * fix: updated the condition to show confirm delete icon * Updated Label Config * test: Add cypress tests for template phase 2 (#17036) Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local> * Change Segment CDN to our proxy (#17714) * chore: Fixing prettier formatting for AnalyticsUtil.tsx * chore: Adding base repository function to add user permissions to generic domain object (#17733) ## Description Adding base function to set the user permissions for a user in any domain object. As part of this, we also add default permission group to the `SeedMongoData`. Without this fix, the JUnit tests go into an infinite loop. Also fixing the `ExampleWorkspaceClonerTest` file. ## Type of change - Bug fix (non-breaking change which fixes an issue) ## How Has This Been Tested? - JUnit ## Checklist: - [ ] 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 * Update top contributors Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com> Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com> Co-authored-by: Nidhi <nidhi@appsmith.com> Co-authored-by: Sangeeth Sivan <74818788+berzerkeer@users.noreply.github.com> Co-authored-by: Trisha Anand <trisha@appsmith.com> Co-authored-by: Arpit Mohan <mohanarpit@users.noreply.github.com> Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com> Co-authored-by: f0c1s <anubhav@appsmith.com> Co-authored-by: Dhruvik Neharia <dhruvik@appsmith.com> Co-authored-by: Hetu Nandu <hetu@appsmith.com> Co-authored-by: Nilesh Sarupriya <nilesh@appsmith.com> Co-authored-by: Anagh Hegde <anagh@appsmith.com> Co-authored-by: arunvjn <32433245+arunvjn@users.noreply.github.com> Co-authored-by: Appsmith Bot <74705725+appsmith-bot@users.noreply.github.com> Co-authored-by: Vaibhav Tanwar <40293928+vaibh1297@users.noreply.github.com> Co-authored-by: subratadeypappu <subrata@appsmith.com> Co-authored-by: ChandanBalajiBP <chandan@appsmith.com> Co-authored-by: Ankita Kinger <ankita@appsmith.com> Co-authored-by: ChandanBalajiBP <104058110+ChandanBalajiBP@users.noreply.github.com> Co-authored-by: Vishnu Gp <vishnu@appsmith.com> Co-authored-by: Keyur Paralkar <keyur@appsmith.com> Co-authored-by: sneha122 <sneha@appsmith.com> Co-authored-by: Tanvi Bhakta <tanvibhakta@gmail.com> Co-authored-by: sanjus-robotic-studio <58104863+sanjus-robotic-studio@users.noreply.github.com> Co-authored-by: Ayush Pahwa <ayush@appsmith.com> Co-authored-by: Parthvi <80334441+Parthvi12@users.noreply.github.com> Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local> Co-authored-by: Arpit Mohan <arpit@appsmith.com> Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com> Co-authored-by: albinAppsmith <87797149+albinAppsmith@users.noreply.github.com> Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com> Co-authored-by: Nidhi <nidhi@appsmith.com> Co-authored-by: Sangeeth Sivan <74818788+berzerkeer@users.noreply.github.com> Co-authored-by: Trisha Anand <trisha@appsmith.com> Co-authored-by: Arpit Mohan <mohanarpit@users.noreply.github.com> Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com> Co-authored-by: f0c1s <anubhav@appsmith.com> Co-authored-by: Dhruvik Neharia <dhruvik@appsmith.com> Co-authored-by: Hetu Nandu <hetu@appsmith.com> Co-authored-by: Nilesh Sarupriya <nilesh@appsmith.com> Co-authored-by: Anagh Hegde <anagh@appsmith.com> Co-authored-by: arunvjn <32433245+arunvjn@users.noreply.github.com> Co-authored-by: Appsmith Bot <74705725+appsmith-bot@users.noreply.github.com> Co-authored-by: Vaibhav Tanwar <40293928+vaibh1297@users.noreply.github.com> Co-authored-by: subratadeypappu <subrata@appsmith.com> Co-authored-by: ChandanBalajiBP <chandan@appsmith.com> Co-authored-by: Ankita Kinger <ankita@appsmith.com> Co-authored-by: ChandanBalajiBP <104058110+ChandanBalajiBP@users.noreply.github.com> Co-authored-by: Vishnu Gp <vishnu@appsmith.com> Co-authored-by: Keyur Paralkar <keyur@appsmith.com> Co-authored-by: sneha122 <sneha@appsmith.com> Co-authored-by: sanjus-robotic-studio <58104863+sanjus-robotic-studio@users.noreply.github.com> Co-authored-by: Ayush Pahwa <ayush@appsmith.com> Co-authored-by: Parthvi <80334441+Parthvi12@users.noreply.github.com> Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local> Co-authored-by: Arpit Mohan <arpit@appsmith.com>
267 lines
8.0 KiB
TypeScript
267 lines
8.0 KiB
TypeScript
import React, { useCallback, useEffect } from "react";
|
|
import { saveSettings } from "@appsmith/actions/settingsAction";
|
|
import { SETTINGS_FORM_NAME } from "@appsmith/constants/forms";
|
|
import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
|
|
import _ from "lodash";
|
|
import ProductUpdatesModal from "pages/Applications/ProductUpdatesModal";
|
|
import { connect, useDispatch } from "react-redux";
|
|
import { RouteComponentProps, useParams, withRouter } from "react-router";
|
|
import { AppState } from "@appsmith/reducers";
|
|
import { formValueSelector, InjectedFormProps, reduxForm } from "redux-form";
|
|
import {
|
|
getSettings,
|
|
getSettingsSavingState,
|
|
getShowReleaseNotes,
|
|
} from "selectors/settingsSelectors";
|
|
import Group from "./FormGroup/group";
|
|
import RestartBanner from "./RestartBanner";
|
|
import SaveAdminSettings from "./SaveSettings";
|
|
import { DisconnectService } from "./DisconnectService";
|
|
import AdminConfig from "@appsmith/pages/AdminSettings/config";
|
|
import {
|
|
SettingTypes,
|
|
Setting,
|
|
} from "@appsmith/pages/AdminSettings/config/types";
|
|
import {
|
|
createMessage,
|
|
DISCONNECT_AUTH_ERROR,
|
|
DISCONNECT_SERVICE_SUBHEADER,
|
|
DISCONNECT_SERVICE_WARNING,
|
|
MANDATORY_FIELDS_ERROR,
|
|
} from "@appsmith/constants/messages";
|
|
import { Toaster, Variant } from "design-system";
|
|
import {
|
|
connectedMethods,
|
|
saveAllowed,
|
|
} from "@appsmith/utils/adminSettingsHelpers";
|
|
import AnalyticsUtil from "utils/AnalyticsUtil";
|
|
import {
|
|
Wrapper,
|
|
BottomSpace,
|
|
HeaderWrapper,
|
|
SettingsHeader,
|
|
SettingsSubHeader,
|
|
SettingsFormWrapper,
|
|
MaxWidthWrapper,
|
|
} from "./components";
|
|
import { BackButton } from "components/utils/helperComponents";
|
|
|
|
type FormProps = {
|
|
settings: Record<string, string>;
|
|
settingsConfig: Record<string, string | boolean>;
|
|
isSaving: boolean;
|
|
showReleaseNotes: boolean;
|
|
};
|
|
|
|
function getSettingLabel(name = "") {
|
|
return name.replace(/-/g, "");
|
|
}
|
|
|
|
function getSettingDetail(category: string, subCategory: string) {
|
|
return AdminConfig.getCategoryDetails(category, subCategory);
|
|
}
|
|
|
|
function getSettingsConfig(category: string, subCategory?: string) {
|
|
return AdminConfig.get(subCategory ?? category);
|
|
}
|
|
|
|
export function SettingsForm(
|
|
props: InjectedFormProps & RouteComponentProps & FormProps,
|
|
) {
|
|
const params = useParams() as any;
|
|
const { category, selected: subCategory } = params;
|
|
const settingsDetails = getSettingsConfig(category, subCategory);
|
|
const { settings, settingsConfig } = props;
|
|
const details = getSettingDetail(category, subCategory);
|
|
const dispatch = useDispatch();
|
|
const isSavable = AdminConfig.savableCategories.includes(
|
|
subCategory ?? category,
|
|
);
|
|
const pageTitle = getSettingLabel(
|
|
details?.title || (subCategory ?? category),
|
|
);
|
|
|
|
const onSave = () => {
|
|
if (checkMandatoryFileds()) {
|
|
if (saveAllowed(props.settings)) {
|
|
AnalyticsUtil.logEvent("ADMIN_SETTINGS_SAVE", {
|
|
method: pageTitle,
|
|
});
|
|
dispatch(saveSettings(props.settings));
|
|
} else {
|
|
saveBlocked();
|
|
}
|
|
} else {
|
|
AnalyticsUtil.logEvent("ADMIN_SETTINGS_ERROR", {
|
|
error: createMessage(MANDATORY_FIELDS_ERROR),
|
|
});
|
|
Toaster.show({
|
|
text: createMessage(MANDATORY_FIELDS_ERROR),
|
|
variant: Variant.danger,
|
|
});
|
|
}
|
|
};
|
|
|
|
const checkMandatoryFileds = () => {
|
|
const requiredFields = settingsDetails.filter((eachSetting) => {
|
|
const isInitialSettingBlank =
|
|
settingsConfig[eachSetting.id]?.toString().trim() === "" ||
|
|
settingsConfig[eachSetting.id] === undefined;
|
|
const isInitialSettingNotBlank = settingsConfig[eachSetting.id];
|
|
const isNewSettingBlank =
|
|
settings[eachSetting.id]?.toString()?.trim() === "";
|
|
const isNewSettingNotBlank = !settings[eachSetting.id];
|
|
|
|
if (
|
|
eachSetting.isRequired &&
|
|
!eachSetting.isHidden &&
|
|
((isInitialSettingBlank && isNewSettingNotBlank) ||
|
|
(isInitialSettingNotBlank && isNewSettingBlank))
|
|
) {
|
|
return eachSetting.id;
|
|
}
|
|
});
|
|
|
|
return !(requiredFields.length > 0);
|
|
};
|
|
|
|
const onClear = (event?: React.FocusEvent<any, any>) => {
|
|
if (event?.type === "click") {
|
|
AnalyticsUtil.logEvent("ADMIN_SETTINGS_RESET", {
|
|
method: pageTitle,
|
|
});
|
|
}
|
|
_.forEach(props.settingsConfig, (value, settingName) => {
|
|
const setting = AdminConfig.settingsMap[settingName];
|
|
if (setting && setting.controlType == SettingTypes.TOGGLE) {
|
|
const settingsStr = props.settingsConfig[settingName].toString();
|
|
if (settingName.toLowerCase().includes("enable")) {
|
|
props.settingsConfig[settingName] =
|
|
settingsStr === "" || settingsStr === "true";
|
|
} else {
|
|
props.settingsConfig[settingName] = settingsStr === "true";
|
|
}
|
|
}
|
|
});
|
|
props.initialize(props.settingsConfig);
|
|
};
|
|
|
|
useEffect(onClear, [subCategory]);
|
|
|
|
const onReleaseNotesClose = useCallback(() => {
|
|
dispatch({
|
|
type: ReduxActionTypes.TOGGLE_RELEASE_NOTES,
|
|
payload: false,
|
|
});
|
|
}, []);
|
|
|
|
const saveBlocked = () => {
|
|
AnalyticsUtil.logEvent("ADMIN_SETTINGS_ERROR", {
|
|
error: createMessage(DISCONNECT_AUTH_ERROR),
|
|
});
|
|
Toaster.show({
|
|
text: createMessage(DISCONNECT_AUTH_ERROR),
|
|
variant: Variant.danger,
|
|
});
|
|
};
|
|
|
|
const disconnect = (currentSettings: AdminConfig) => {
|
|
const updatedSettings: any = {};
|
|
if (connectedMethods.length >= 2) {
|
|
_.forEach(currentSettings, (setting: Setting) => {
|
|
if (!setting.isHidden && setting.controlType !== SettingTypes.LINK) {
|
|
updatedSettings[setting.id] = "";
|
|
}
|
|
});
|
|
dispatch(saveSettings(updatedSettings));
|
|
AnalyticsUtil.logEvent("ADMIN_SETTINGS_DISCONNECT_AUTH_METHOD", {
|
|
method: pageTitle,
|
|
});
|
|
} else {
|
|
saveBlocked();
|
|
}
|
|
};
|
|
|
|
return (
|
|
<Wrapper>
|
|
{subCategory && <BackButton />}
|
|
<SettingsFormWrapper>
|
|
<MaxWidthWrapper>
|
|
<HeaderWrapper>
|
|
<SettingsHeader>{pageTitle}</SettingsHeader>
|
|
{details?.subText && (
|
|
<SettingsSubHeader>{details.subText}</SettingsSubHeader>
|
|
)}
|
|
</HeaderWrapper>
|
|
<Group
|
|
category={category}
|
|
settings={settingsDetails}
|
|
subCategory={subCategory}
|
|
/>
|
|
{isSavable && (
|
|
<SaveAdminSettings
|
|
isSaving={props.isSaving}
|
|
onClear={onClear}
|
|
onSave={onSave}
|
|
settings={props.settings}
|
|
valid={props.valid}
|
|
/>
|
|
)}
|
|
{details?.isConnected && (
|
|
<DisconnectService
|
|
disconnect={() => disconnect(settingsDetails)}
|
|
subHeader={createMessage(DISCONNECT_SERVICE_SUBHEADER)}
|
|
warning={`${pageTitle} ${createMessage(
|
|
DISCONNECT_SERVICE_WARNING,
|
|
)}`}
|
|
/>
|
|
)}
|
|
<BottomSpace />
|
|
</MaxWidthWrapper>
|
|
</SettingsFormWrapper>
|
|
{props.showReleaseNotes && (
|
|
<ProductUpdatesModal hideTrigger isOpen onClose={onReleaseNotesClose} />
|
|
)}
|
|
<RestartBanner />
|
|
</Wrapper>
|
|
);
|
|
}
|
|
|
|
const validate = (values: Record<string, any>) => {
|
|
const errors: any = {};
|
|
_.filter(values, (value, name) => {
|
|
const err_message = AdminConfig.validate(name, value);
|
|
if (err_message) {
|
|
errors[name] = err_message;
|
|
}
|
|
});
|
|
return errors;
|
|
};
|
|
|
|
const selector = formValueSelector(SETTINGS_FORM_NAME);
|
|
export default withRouter(
|
|
connect((state: AppState) => {
|
|
const settingsConfig = getSettings(state);
|
|
const newProps: any = {
|
|
settings: {},
|
|
settingsConfig,
|
|
isSaving: getSettingsSavingState(state),
|
|
showReleaseNotes: getShowReleaseNotes(state),
|
|
};
|
|
_.forEach(AdminConfig.settingsMap, (setting, name) => {
|
|
const fieldValue = selector(state, name);
|
|
|
|
if (fieldValue !== settingsConfig[name]) {
|
|
newProps.settings[name] = fieldValue;
|
|
}
|
|
});
|
|
return newProps;
|
|
}, null)(
|
|
reduxForm<any, any>({
|
|
validate,
|
|
form: SETTINGS_FORM_NAME,
|
|
touchOnBlur: true,
|
|
})(SettingsForm),
|
|
),
|
|
);
|