Merge branch 'feature/static-versioned' of https://github.com/ONLYOFFICE/DocSpace into feature/static-versioned

This commit is contained in:
Timofey Boyko 2023-01-16 11:48:29 +03:00
commit 331c5f1465
4 changed files with 28 additions and 24 deletions

View File

@ -14,7 +14,7 @@ import AccessRightSelect from "@docspace/components/AccessRightSelect";
key: "key1", key: "key1",
title: "Room administrator", title: "Room administrator",
description: `Administration of rooms, archiving of rooms, inviting and managing users in rooms.`, description: `Administration of rooms, archiving of rooms, inviting and managing users in rooms.`,
icon: CrownIcon, icon: CrownIconUrl,
quota: "free", quota: "free",
color: "#20D21F", color: "#20D21F",
}} }}
@ -37,7 +37,7 @@ import AccessRightSelect from "@docspace/components/AccessRightSelect";
key: "key1", key: "key1",
title: "Room administrator", title: "Room administrator",
description: `Administration of rooms, archiving of rooms, inviting and managing users in rooms.`, description: `Administration of rooms, archiving of rooms, inviting and managing users in rooms.`,
icon: CrownIcon, icon: CrownIconUrl,
quota: "free", quota: "free",
color: "#20D21F", color: "#20D21F",
} }

View File

@ -48,7 +48,7 @@ import AccessRightSelect from "@docspace/components/access-right-secelt";
key: "key1", key: "key1",
title: "Room administrator", title: "Room administrator",
description: `Administration of rooms, archiving of rooms, inviting and managing users in rooms.`, description: `Administration of rooms, archiving of rooms, inviting and managing users in rooms.`,
icon: CrownIcon, icon: CrownIconUrl,
quota: "free", quota: "free",
color: "#20D21F", color: "#20D21F",
} }

View File

@ -1,17 +1,17 @@
import AccessNoneIcon from "../../../public/images/access.none.react.svg?url"; import AccessNoneIconUrl from "../../../public/images/access.none.react.svg?url";
import CheckRoundIcon from "../../../public/images/check.react.svg?url"; import CheckRoundIconUrl from "../../../public/images/check.react.svg?url";
import CommentIcon from "../../../public/images/access.comment.react.svg?url"; import CommentIconUrl from "../../../public/images/access.comment.react.svg?url";
import CrownIcon from "../../../public/images/access.edit.react.svg?url"; import CrownIconUrl from "../../../public/images/access.edit.react.svg?url";
import EyeIcon from "../../../public/images/eye.react.svg?url"; import EyeIconUrl from "../../../public/images/eye.react.svg?url";
import PencilIcon from "../../../public/images/access.edit.react.svg?url"; import PencilIconUrl from "../../../public/images/access.edit.react.svg?url";
import ReviewIcon from "../../../public/images/access.review.react.svg?url"; import ReviewIconUrl from "../../../public/images/access.review.react.svg?url";
export const data = [ export const data = [
{ {
key: "key1", key: "key1",
label: "Room administrator", label: "Room administrator",
description: `Administration of rooms, archiving of rooms, inviting and managing users in rooms.`, description: `Administration of rooms, archiving of rooms, inviting and managing users in rooms.`,
icon: CrownIcon, icon: CrownIconUrl,
quota: "free", quota: "free",
color: "#20D21F", color: "#20D21F",
}, },
@ -19,7 +19,7 @@ export const data = [
key: "key2", key: "key2",
label: "Full access", label: "Full access",
description: `Edit, upload, create, view, download, delete files and folders.`, description: `Edit, upload, create, view, download, delete files and folders.`,
icon: CheckRoundIcon, icon: CheckRoundIconUrl,
quota: "paid", quota: "paid",
color: "#EDC409", color: "#EDC409",
}, },
@ -29,30 +29,30 @@ export const data = [
key: "key4", key: "key4",
label: "Editing", label: "Editing",
description: `Editing, viewing, downloading files and folders, filling out forms.`, description: `Editing, viewing, downloading files and folders, filling out forms.`,
icon: PencilIcon, icon: PencilIconUrl,
}, },
{ {
key: "key5", key: "key5",
label: "Review", label: "Review",
description: `Reviewing, viewing, downloading files and folders, filling out forms.`, description: `Reviewing, viewing, downloading files and folders, filling out forms.`,
icon: ReviewIcon, icon: ReviewIconUrl,
}, },
{ {
key: "key6", key: "key6",
label: "Comment", label: "Comment",
description: `Commenting on files, viewing, downloading files and folders, filling out forms.`, description: `Commenting on files, viewing, downloading files and folders, filling out forms.`,
icon: CommentIcon, icon: CommentIconUrl,
}, },
{ {
key: "key7", key: "key7",
label: "Read only", label: "Read only",
description: `Viewing, downloading files and folders, filling out forms.`, description: `Viewing, downloading files and folders, filling out forms.`,
icon: EyeIcon, icon: EyeIconUrl,
}, },
{ {
key: "key8", key: "key8",
label: "Deny access", label: "Deny access",
description: "", description: "",
icon: AccessNoneIcon, icon: AccessNoneIconUrl,
}, },
]; ];

View File

@ -29,6 +29,10 @@ import ToggleContent from "../toggle-content";
import Tooltip from "../tooltip"; import Tooltip from "../tooltip";
import SettingsIcon from "../../../public/images/settings.react.svg"; import SettingsIcon from "../../../public/images/settings.react.svg";
import CatalogFolderIcon from "../../../public/images/catalog.folder.react.svg"; import CatalogFolderIcon from "../../../public/images/catalog.folder.react.svg";
import CatalogEmployeeUrl from "../../../public/images/catalog.employee.react.svg?url";
import ItemActiveUrl from "../../../public/images/item.active.react.svg?url";
import SearchUrl from "../../../public/images/search.react.svg?url";
const array_items = [ const array_items = [
{ {
key: "0", key: "0",
@ -50,28 +54,28 @@ const array_items = [
const options = [ const options = [
{ {
key: 0, key: 0,
icon: "static/images/catalog.employee.react.svg", // optional item icon: CatalogEmployeeUrl, // optional item
label: "Option 1", label: "Option 1",
disabled: false, // optional item disabled: false, // optional item
onClick: () => {}, // optional item onClick: () => {}, // optional item
}, },
{ {
key: 1, key: 1,
icon: "static/images/catalog.employee.react.svg", // optional item icon: CatalogEmployeeUrl, // optional item
label: "Option 2", label: "Option 2",
disabled: false, // optional item disabled: false, // optional item
onClick: () => {}, // optional item onClick: () => {}, // optional item
}, },
{ {
key: 2, key: 2,
icon: "static/images/catalog.employee.react.svg", // optional item icon: CatalogEmployeeUrl, // optional item
label: "Option 3", label: "Option 3",
disabled: true, // optional item disabled: true, // optional item
onClick: () => {}, // optional item onClick: () => {}, // optional item
}, },
{ {
key: 3, key: 3,
icon: "static/images/catalog.employee.react.svg", // optional item icon: CatalogEmployeeUrl, // optional item
label: "Option 4", label: "Option 4",
disabled: false, // optional item disabled: false, // optional item
onClick: () => {}, // optional item onClick: () => {}, // optional item
@ -101,13 +105,13 @@ const elementIcon = <CatalogFolderIcon size="big" />;
const elementComboBox = ( const elementComboBox = (
<ComboBox <ComboBox
options={[ options={[
{ key: 1, icon: "static/images/item.active.react.svg", label: "Open" }, { key: 1, icon: ItemActiveUrl, label: "Open" },
{ key: 2, icon: "CheckIcon", label: "Closed" }, { key: 2, icon: "CheckIcon", label: "Closed" },
]} ]}
onSelect={(option) => console.log(option)} onSelect={(option) => console.log(option)}
selectedOption={{ selectedOption={{
key: 0, key: 0,
icon: "static/images/item.active.react.svg", icon: ItemActiveUrl,
label: "", label: "",
}} }}
scaled={false} scaled={false}
@ -330,7 +334,7 @@ const Template = (args) => (
{({ value, set }) => ( {({ value, set }) => (
<InputBlock <InputBlock
placeholder="Add input text" placeholder="Add input text"
iconName={"static/images/search.react.svg"} iconName={SearchUrl}
onIconClick={() => {}} onIconClick={() => {}}
onChange={(e) => set(e.target.value)} onChange={(e) => set(e.target.value)}
value={value} value={value}