Merge branch 'release/v2.0.0' into feature/new-form-gallery
This commit is contained in:
commit
5e7478ff3c
@ -23,7 +23,6 @@
|
||||
"storybook-serve": "yarn workspace @docspace/components run storybook-serve",
|
||||
"test": "yarn workspace @docspace/components test",
|
||||
"wipe": "shx rm -rf node_modules yarn.lock packages/**/node_modules",
|
||||
"debug-info": "auto-changelog --unreleased-only --template debuginfo --output public/debuginfo.md",
|
||||
"licenses-audit": "yarn licenses audit --output-csv=licenses.csv --config=licenses.config.js --summary"
|
||||
},
|
||||
"old-scripts": {
|
||||
@ -35,7 +34,6 @@
|
||||
"e2e.test:translation": "yarn workspaces foreach -vptiR --from '{@docspace/client,@docspace/login}' run test:translation:model"
|
||||
},
|
||||
"devDependencies": {
|
||||
"auto-changelog": "file:./packages/auto-changelog-2.3.1.tgz",
|
||||
"he": "^1.2.0",
|
||||
"shx": "^0.3.4",
|
||||
"terser": "^5.16.6"
|
||||
|
Binary file not shown.
@ -145,7 +145,7 @@ export default inject(
|
||||
const folderItem = selections[0] ? selections[0] : selectedFolderStore;
|
||||
|
||||
const isRoomOwner = folderItem?.createdBy?.id === user.id;
|
||||
const isRoot = selection.length || bufferSelection ? false : true;
|
||||
const isRoot = selectedFolderStore.isRootFolder;
|
||||
|
||||
return {
|
||||
visible,
|
||||
|
@ -33,11 +33,11 @@ const LinkBlock = (props) => {
|
||||
scale
|
||||
size="base"
|
||||
withBorder
|
||||
isAutoFocussed={false}
|
||||
isAutoFocussed
|
||||
className="edit-link_name-input"
|
||||
value={linkNameValue}
|
||||
onChange={onChangeLinkName}
|
||||
placeholder={t("ExternalLink")}
|
||||
placeholder={t("LinkName")}
|
||||
isDisabled={isLoading}
|
||||
/>
|
||||
|
||||
@ -50,7 +50,7 @@ const LinkBlock = (props) => {
|
||||
isReadOnly
|
||||
className="edit-link_link-input"
|
||||
value={linkValue}
|
||||
placeholder={t("ExternalLink")}
|
||||
placeholder={t("LinkName")}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
|
@ -18,7 +18,7 @@ import { RoomsType } from "@docspace/common/constants";
|
||||
import Avatar from "@docspace/components/avatar";
|
||||
import copy from "copy-to-clipboard";
|
||||
|
||||
const LINKS_LIMIT_COUNT = 10;
|
||||
const LINKS_LIMIT_COUNT = 5;
|
||||
|
||||
const PublicRoomBlock = (props) => {
|
||||
const {
|
||||
|
@ -108,7 +108,7 @@ const PortalRenaming = (props) => {
|
||||
setIsLoadingPortalNameSave(true);
|
||||
|
||||
setPortalRename(portalName)
|
||||
.then((res) => {
|
||||
.then((confirmUrl) => {
|
||||
onCloseModal();
|
||||
toastr.success(t("SuccessfullySavePortalNameMessage"));
|
||||
|
||||
@ -116,7 +116,7 @@ const PortalRenaming = (props) => {
|
||||
setPortalNameDefault(portalName);
|
||||
sessionStorage.clear();
|
||||
|
||||
navigate(res);
|
||||
window.location.replace(confirmUrl);
|
||||
})
|
||||
.catch((error) => {
|
||||
let errorMessage = "";
|
||||
|
@ -74,7 +74,7 @@ const RoomPassword = (props) => {
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
console.log(error);
|
||||
toastr.error(error);
|
||||
setIsLoading(false);
|
||||
}
|
||||
};
|
||||
|
@ -236,7 +236,6 @@ const ControlButtons = ({
|
||||
id="header_optional-button"
|
||||
zIndex={402}
|
||||
className="option-button"
|
||||
directionX="right"
|
||||
iconName={VerticalDotsReactSvgUrl}
|
||||
size={15}
|
||||
isFill
|
||||
|
@ -27,7 +27,7 @@ const disabledAndHeaderStyle = css`
|
||||
const WrapperToggle = styled.div`
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-left: auto;
|
||||
margin-inline-start: auto;
|
||||
width: 36px;
|
||||
|
||||
& label {
|
||||
|
Loading…
Reference in New Issue
Block a user