Shared:Components:Selector: add loading state after click on Submit button

This commit is contained in:
Timofey Boyko 2024-03-18 12:47:16 +03:00
parent 3565966356
commit 8ac2fe9ec2
3 changed files with 31 additions and 21 deletions

View File

@ -1,25 +1,25 @@
// (c) Copyright Ascensio System SIA 2010-2024
//
//
// This program is a free software product.
// You can redistribute it and/or modify it under the terms
// of the GNU Affero General Public License (AGPL) version 3 as published by the Free Software
// Foundation. In accordance with Section 7(a) of the GNU AGPL its Section 15 shall be amended
// to the effect that Ascensio System SIA expressly excludes the warranty of non-infringement of
// any third-party rights.
//
//
// This program is distributed WITHOUT ANY WARRANTY, without even the implied warranty
// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For details, see
// the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
//
//
// You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021.
//
//
// The interactive user interfaces in modified source and object code versions of the Program must
// display Appropriate Legal Notices, as required under Section 5 of the GNU AGPL version 3.
//
//
// Pursuant to Section 7(b) of the License you must retain the original Product logo when
// distributing the program. Pursuant to Section 7(e) we decline to grant you any rights under
// trademark law for use of our trademarks.
//
//
// All the Product's GUI elements, including illustrations and icon sets, as well as technical writing
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
@ -148,6 +148,8 @@ const Selector = ({
const [selectedAccess, setSelectedAccess] =
React.useState<TAccessRight | null>(null);
const requestRunning = React.useRef<boolean>(false);
const onSelectAction = (item: TSelectorItem) => {
onSelect?.({
...item,
@ -297,13 +299,15 @@ const Selector = ({
selectedTabItems,
]);
const onSubmitAction = () => {
onSubmit(
const onSubmitAction = async () => {
requestRunning.current = true;
await onSubmit(
newSelectedItems,
selectedAccess,
newFooterInputValue,
isFooterCheckboxChecked,
);
requestRunning.current = false;
};
const onChangeAccessRightsAction = React.useCallback(
@ -565,6 +569,7 @@ const Selector = ({
submitButtonLabel={submitButtonLabel}
disableSubmitButton={disableSubmitButton}
submitButtonId={submitButtonId}
requestRunning={requestRunning.current}
// cancel button
{...cancelButtonProps}
// access rights

View File

@ -1,25 +1,25 @@
// (c) Copyright Ascensio System SIA 2010-2024
//
//
// This program is a free software product.
// You can redistribute it and/or modify it under the terms
// of the GNU Affero General Public License (AGPL) version 3 as published by the Free Software
// Foundation. In accordance with Section 7(a) of the GNU AGPL its Section 15 shall be amended
// to the effect that Ascensio System SIA expressly excludes the warranty of non-infringement of
// any third-party rights.
//
//
// This program is distributed WITHOUT ANY WARRANTY, without even the implied warranty
// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For details, see
// the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
//
//
// You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021.
//
//
// The interactive user interfaces in modified source and object code versions of the Program must
// display Appropriate Legal Notices, as required under Section 5 of the GNU AGPL version 3.
//
//
// Pursuant to Section 7(b) of the License you must retain the original Product logo when
// distributing the program. Pursuant to Section 7(e) we decline to grant you any rights under
// trademark law for use of our trademarks.
//
//
// All the Product's GUI elements, including illustrations and icon sets, as well as technical writing
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
@ -187,7 +187,7 @@ export type TSelectorSubmitButton = {
access: TAccessRight | null,
fileName: string,
isFooterCheckboxChecked: boolean,
) => void;
) => void | Promise<void>;
submitButtonId?: string;
};
@ -354,6 +354,7 @@ export type FooterProps = TSelectorFooterSubmitButton &
TSelectorFooterCheckbox & {
isMultiSelect: boolean;
selectedItemsCount: number;
requestRunning?: boolean;
};
type TSelectorItemLogo =

View File

@ -1,25 +1,25 @@
// (c) Copyright Ascensio System SIA 2010-2024
//
//
// This program is a free software product.
// You can redistribute it and/or modify it under the terms
// of the GNU Affero General Public License (AGPL) version 3 as published by the Free Software
// Foundation. In accordance with Section 7(a) of the GNU AGPL its Section 15 shall be amended
// to the effect that Ascensio System SIA expressly excludes the warranty of non-infringement of
// any third-party rights.
//
//
// This program is distributed WITHOUT ANY WARRANTY, without even the implied warranty
// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For details, see
// the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
//
//
// You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021.
//
//
// The interactive user interfaces in modified source and object code versions of the Program must
// display Appropriate Legal Notices, as required under Section 5 of the GNU AGPL version 3.
//
//
// Pursuant to Section 7(b) of the License you must retain the original Product logo when
// distributing the program. Pursuant to Section 7(e) we decline to grant you any rights under
// trademark law for use of our trademarks.
//
//
// All the Product's GUI elements, including illustrations and icon sets, as well as technical writing
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
@ -66,6 +66,8 @@ const Footer = React.memo(
setIsChecked,
submitButtonId,
cancelButtonId,
requestRunning,
}: FooterProps) => {
const label =
selectedItemsCount && isMultiSelect
@ -134,6 +136,7 @@ const Footer = React.memo(
primary
scale
size={ButtonSize.normal}
isLoading={requestRunning}
isDisabled={
!withFooterInput
? disableSubmitButton
@ -167,6 +170,7 @@ const Footer = React.memo(
scale
size={ButtonSize.normal}
onClick={onCancel}
isDisabled={requestRunning}
/>
)}
</StyledButtonContainer>