Merge branch 'develop' into bugfix/sharing-settings
This commit is contained in:
Alexey Kostenko
commit
23b209b85c
@ -61,7 +61,6 @@
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
</PackageReference> -->
|
||||
<PackageReference Include="MySql.Data" Version="8.0.21" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
|
||||
<PackageReference Include="NLog" Version="4.7.5" />
|
||||
<PackageReference Include="NLog.Web.AspNetCore" Version="4.9.3" />
|
||||
<PackageReference Include="NUnit" Version="3.12.0" />
|
||||
|
||||
@ -74,7 +74,7 @@ server {
|
||||
}
|
||||
|
||||
location / {
|
||||
proxy_pass http://localhost:5001;
|
||||
proxy_pass http://127.0.0.1:5001;
|
||||
|
||||
location ~* /(manifest.json|service-worker.js|appIcon.png|bg-error.png) {
|
||||
root $public_root;
|
||||
@ -87,7 +87,7 @@ server {
|
||||
proxy_set_header X-Forwarded-For $remote_addr;
|
||||
proxy_set_header Host $host;
|
||||
|
||||
proxy_pass http://localhost:5001;
|
||||
proxy_pass http://127.0.0.1:5001;
|
||||
|
||||
proxy_redirect off;
|
||||
|
||||
@ -98,49 +98,49 @@ server {
|
||||
|
||||
location /api/2.0 {
|
||||
location ~* /(files|encryption|privacyroom) {
|
||||
proxy_pass http://localhost:5007;
|
||||
proxy_pass http://127.0.0.1:5007;
|
||||
proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
|
||||
}
|
||||
|
||||
location ~* /(authentication|modules|portal|security|settings|smtpsettings|capabilities|thirdparty) {
|
||||
proxy_pass http://localhost:5000;
|
||||
proxy_pass http://127.0.0.1:5000;
|
||||
proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
|
||||
|
||||
location ~* portal/(.*)(backup|restore)(.*) {
|
||||
rewrite (.*)/portal/(.*) $1/backup/$2 break;
|
||||
proxy_redirect off;
|
||||
|
||||
proxy_pass http://localhost:5012;
|
||||
proxy_pass http://127.0.0.1:5012;
|
||||
proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
location ~* /(people|group) {
|
||||
proxy_pass http://localhost:5004;
|
||||
proxy_pass http://127.0.0.1:5004;
|
||||
proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
|
||||
}
|
||||
|
||||
location ~* /backup {
|
||||
proxy_pass http://localhost:5012;
|
||||
proxy_pass http://127.0.0.1:5012;
|
||||
proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
|
||||
}
|
||||
}
|
||||
|
||||
location /storage {
|
||||
proxy_pass http://localhost:5003;
|
||||
proxy_pass http://127.0.0.1:5003;
|
||||
proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
|
||||
}
|
||||
|
||||
location /login.ashx {
|
||||
proxy_pass http://localhost:5003;
|
||||
proxy_pass http://127.0.0.1:5003;
|
||||
proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
|
||||
}
|
||||
|
||||
location /products {
|
||||
location ~* /people {
|
||||
#rewrite products/people/(.*) /$1 break;
|
||||
proxy_pass http://localhost:5002;
|
||||
proxy_pass http://127.0.0.1:5002;
|
||||
proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
|
||||
|
||||
location ~* /(sockjs-node|locales) {
|
||||
@ -149,7 +149,7 @@ server {
|
||||
proxy_set_header X-Forwarded-For $remote_addr;
|
||||
proxy_set_header Host $host;
|
||||
|
||||
proxy_pass http://localhost:5002;
|
||||
proxy_pass http://127.0.0.1:5002;
|
||||
|
||||
proxy_redirect off;
|
||||
|
||||
@ -166,7 +166,7 @@ server {
|
||||
|
||||
location ~* /files {
|
||||
#rewrite products/files/(.*) /$1 break;
|
||||
proxy_pass http://localhost:5008;
|
||||
proxy_pass http://127.0.0.1:5008;
|
||||
proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
|
||||
|
||||
location ~* /(sockjs-node|locales) {
|
||||
@ -175,7 +175,7 @@ server {
|
||||
proxy_set_header X-Forwarded-For $remote_addr;
|
||||
proxy_set_header Host $host;
|
||||
|
||||
proxy_pass http://localhost:5008;
|
||||
proxy_pass http://127.0.0.1:5008;
|
||||
|
||||
proxy_redirect off;
|
||||
|
||||
@ -190,7 +190,7 @@ server {
|
||||
}
|
||||
|
||||
location ~* (/httphandlers/filehandler.ashx|ChunkedUploader.ashx) {
|
||||
proxy_pass http://localhost:5007;
|
||||
proxy_pass http://127.0.0.1:5007;
|
||||
proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
|
||||
}
|
||||
}
|
||||
@ -198,13 +198,13 @@ server {
|
||||
|
||||
location /apisystem {
|
||||
rewrite apisystem/(.*) /$1 break;
|
||||
proxy_pass http://localhost:5010;
|
||||
proxy_pass http://127.0.0.1:5010;
|
||||
proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
|
||||
}
|
||||
|
||||
location /sh {
|
||||
rewrite sh/(.*) /$1 break;
|
||||
proxy_pass http://localhost:9999;
|
||||
proxy_pass http://127.0.0.1:9999;
|
||||
proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
|
||||
}
|
||||
}
|
||||
@ -25,7 +25,7 @@ class PureEditor extends React.Component {
|
||||
|
||||
showLoader();
|
||||
|
||||
let docApiUrl = await files.getDocServiceUrl();
|
||||
//let docApiUrl = await files.getDocServiceUrl();
|
||||
|
||||
const script = document.createElement("script");
|
||||
script.setAttribute("type", "text/javascript");
|
||||
@ -33,9 +33,8 @@ class PureEditor extends React.Component {
|
||||
|
||||
script.onload = function () {
|
||||
console.log("PureEditor script.onload", fileId, window.DocsAPI);
|
||||
|
||||
files
|
||||
.openEdit(fileId)
|
||||
.openEdit(fileId, null, urlParams.doc)
|
||||
.then((config) => {
|
||||
if (window.innerWidth < 720) {
|
||||
config.type = "mobile";
|
||||
@ -51,7 +50,8 @@ class PureEditor extends React.Component {
|
||||
});
|
||||
};
|
||||
|
||||
script.src = docApiUrl;
|
||||
script.src =
|
||||
"http://localhost/discbundle/common/javascript/head-snvdnBHTni4RCNYKbRM_iQ2.js?ver=10.5.793";
|
||||
script.async = true;
|
||||
|
||||
console.log("PureEditor componentDidMount: added script");
|
||||
|
||||
@ -48,6 +48,7 @@ import {
|
||||
import { NewFilesPanel } from "../../../../panels";
|
||||
import { ConvertDialog } from "../../../../dialogs";
|
||||
import EditingWrapperComponent from "./EditingWrapperComponent";
|
||||
import { isMobile } from "react-device-detect";
|
||||
|
||||
const { FileAction } = constants;
|
||||
const sideColor = "#A3A9AE";
|
||||
@ -271,7 +272,7 @@ class FilesRowContent extends React.PureComponent {
|
||||
};
|
||||
|
||||
getStatusByDate = () => {
|
||||
const { culture, t, item } = this.props;
|
||||
const { culture, t, item, sectionWidth } = this.props;
|
||||
const { created, updated, version, fileExst } = item;
|
||||
|
||||
const title =
|
||||
@ -283,8 +284,9 @@ class FilesRowContent extends React.PureComponent {
|
||||
|
||||
const date = fileExst ? updated : created;
|
||||
const dateLabel = new Date(date).toLocaleString(culture);
|
||||
const mobile = (sectionWidth && sectionWidth <= 375) || isMobile;
|
||||
|
||||
return `${title}: ${dateLabel}`;
|
||||
return mobile ? dateLabel : `${title}: ${dateLabel}`;
|
||||
};
|
||||
|
||||
getDefaultName = (format) => {
|
||||
|
||||
@ -36,6 +36,7 @@ import {
|
||||
import { NewFilesPanel } from "../../../../panels";
|
||||
import EditingWrapperComponent from "./EditingWrapperComponent";
|
||||
import TileContent from "./TileContent";
|
||||
import { isMobile } from "react-device-detect";
|
||||
|
||||
const { FileAction } = constants;
|
||||
const { getSettings } = initStore.auth.selectors;
|
||||
@ -249,7 +250,7 @@ class FilesTileContent extends React.PureComponent {
|
||||
};
|
||||
|
||||
getStatusByDate = () => {
|
||||
const { culture, t, item } = this.props;
|
||||
const { culture, t, item, sectionWidth } = this.props;
|
||||
const { created, updated, version, fileExst } = item;
|
||||
|
||||
const title =
|
||||
@ -261,8 +262,9 @@ class FilesTileContent extends React.PureComponent {
|
||||
|
||||
const date = fileExst ? updated : created;
|
||||
const dateLabel = new Date(date).toLocaleString(culture);
|
||||
const mobile = (sectionWidth && sectionWidth <= 375) || isMobile;
|
||||
|
||||
return `${title}: ${dateLabel}`;
|
||||
return mobile ? dateLabel : `${title}: ${dateLabel}`;
|
||||
};
|
||||
|
||||
getDefaultName = (format) => {
|
||||
|
||||
@ -143,8 +143,6 @@
|
||||
"PeopleResource": [
|
||||
"LblSendEmail",
|
||||
"LblSendMessage",
|
||||
"NotFoundDescription",
|
||||
"NotFoundTitle",
|
||||
"ClearButton",
|
||||
"LblActive",
|
||||
"LblTerminated",
|
||||
|
||||
@ -24,10 +24,10 @@
|
||||
dependencies:
|
||||
"@babel/highlight" "^7.10.4"
|
||||
|
||||
"@babel/compat-data@^7.12.1", "@babel/compat-data@^7.12.5", "@babel/compat-data@^7.9.0":
|
||||
version "7.12.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.5.tgz#f56db0c4bb1bbbf221b4e81345aab4141e7cb0e9"
|
||||
integrity sha512-DTsS7cxrsH3by8nqQSpFSyjSfSYl57D6Cf4q8dW3LK83tBKBDCkfcay1nYkXq1nIHXnpX8WMMb/O25HOy3h1zg==
|
||||
"@babel/compat-data@^7.12.5", "@babel/compat-data@^7.12.7", "@babel/compat-data@^7.9.0":
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.7.tgz#9329b4782a7d6bbd7eef57e11addf91ee3ef1e41"
|
||||
integrity sha512-YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw==
|
||||
|
||||
"@babel/core@7.9.0":
|
||||
version "7.9.0"
|
||||
@ -52,18 +52,18 @@
|
||||
source-map "^0.5.0"
|
||||
|
||||
"@babel/core@^7.1.0", "@babel/core@^7.4.5", "@babel/core@^7.8.4":
|
||||
version "7.12.3"
|
||||
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.3.tgz#1b436884e1e3bff6fb1328dc02b208759de92ad8"
|
||||
integrity sha512-0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g==
|
||||
version "7.12.9"
|
||||
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.9.tgz#fd450c4ec10cdbb980e2928b7aa7a28484593fc8"
|
||||
integrity sha512-gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ==
|
||||
dependencies:
|
||||
"@babel/code-frame" "^7.10.4"
|
||||
"@babel/generator" "^7.12.1"
|
||||
"@babel/generator" "^7.12.5"
|
||||
"@babel/helper-module-transforms" "^7.12.1"
|
||||
"@babel/helpers" "^7.12.1"
|
||||
"@babel/parser" "^7.12.3"
|
||||
"@babel/template" "^7.10.4"
|
||||
"@babel/traverse" "^7.12.1"
|
||||
"@babel/types" "^7.12.1"
|
||||
"@babel/helpers" "^7.12.5"
|
||||
"@babel/parser" "^7.12.7"
|
||||
"@babel/template" "^7.12.7"
|
||||
"@babel/traverse" "^7.12.9"
|
||||
"@babel/types" "^7.12.7"
|
||||
convert-source-map "^1.7.0"
|
||||
debug "^4.1.0"
|
||||
gensync "^1.0.0-beta.1"
|
||||
@ -73,7 +73,7 @@
|
||||
semver "^5.4.1"
|
||||
source-map "^0.5.0"
|
||||
|
||||
"@babel/generator@^7.12.1", "@babel/generator@^7.12.5", "@babel/generator@^7.4.0", "@babel/generator@^7.9.0":
|
||||
"@babel/generator@^7.12.5", "@babel/generator@^7.4.0", "@babel/generator@^7.9.0":
|
||||
version "7.12.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.5.tgz#a2c50de5c8b6d708ab95be5e6053936c1884a4de"
|
||||
integrity sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==
|
||||
@ -97,7 +97,7 @@
|
||||
"@babel/helper-explode-assignable-expression" "^7.10.4"
|
||||
"@babel/types" "^7.10.4"
|
||||
|
||||
"@babel/helper-builder-react-jsx-experimental@^7.12.1":
|
||||
"@babel/helper-builder-react-jsx-experimental@^7.12.4":
|
||||
version "7.12.4"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.4.tgz#55fc1ead5242caa0ca2875dcb8eed6d311e50f48"
|
||||
integrity sha512-AjEa0jrQqNk7eDQOo0pTfUOwQBMF+xVqrausQwT9/rTKy0g04ggFNaJpaE09IQMn9yExluigWMJcj0WC7bq+Og==
|
||||
@ -114,7 +114,7 @@
|
||||
"@babel/helper-annotate-as-pure" "^7.10.4"
|
||||
"@babel/types" "^7.10.4"
|
||||
|
||||
"@babel/helper-compilation-targets@^7.12.1", "@babel/helper-compilation-targets@^7.8.7":
|
||||
"@babel/helper-compilation-targets@^7.12.5", "@babel/helper-compilation-targets@^7.8.7":
|
||||
version "7.12.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz#cb470c76198db6a24e9dbc8987275631e5d29831"
|
||||
integrity sha512-+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw==
|
||||
@ -136,12 +136,11 @@
|
||||
"@babel/helper-split-export-declaration" "^7.10.4"
|
||||
|
||||
"@babel/helper-create-regexp-features-plugin@^7.12.1":
|
||||
version "7.12.1"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.1.tgz#18b1302d4677f9dc4740fe8c9ed96680e29d37e8"
|
||||
integrity sha512-rsZ4LGvFTZnzdNZR5HZdmJVuXK8834R5QkF3WvcnBhrlVtF0HSIUC6zbreL9MgjTywhKokn8RIYRiq99+DLAxA==
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.7.tgz#2084172e95443fa0a09214ba1bb328f9aea1278f"
|
||||
integrity sha512-idnutvQPdpbduutvi3JVfEgcVIHooQnhvhx0Nk9isOINOIGYkZea1Pk2JlJRiUnMefrlvr0vkByATBY/mB4vjQ==
|
||||
dependencies:
|
||||
"@babel/helper-annotate-as-pure" "^7.10.4"
|
||||
"@babel/helper-regex" "^7.10.4"
|
||||
regexpu-core "^4.7.1"
|
||||
|
||||
"@babel/helper-define-map@^7.10.4":
|
||||
@ -184,13 +183,13 @@
|
||||
"@babel/types" "^7.10.4"
|
||||
|
||||
"@babel/helper-member-expression-to-functions@^7.12.1":
|
||||
version "7.12.1"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz#fba0f2fcff3fba00e6ecb664bb5e6e26e2d6165c"
|
||||
integrity sha512-k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz#aa77bd0396ec8114e5e30787efa78599d874a855"
|
||||
integrity sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==
|
||||
dependencies:
|
||||
"@babel/types" "^7.12.1"
|
||||
"@babel/types" "^7.12.7"
|
||||
|
||||
"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.8.3":
|
||||
"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.12.5", "@babel/helper-module-imports@^7.8.3":
|
||||
version "7.12.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz#1bfc0229f794988f76ed0a4d4e90860850b54dfb"
|
||||
integrity sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==
|
||||
@ -213,24 +212,17 @@
|
||||
lodash "^4.17.19"
|
||||
|
||||
"@babel/helper-optimise-call-expression@^7.10.4":
|
||||
version "7.10.4"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz#50dc96413d594f995a77905905b05893cd779673"
|
||||
integrity sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.7.tgz#7f94ae5e08721a49467346aa04fd22f750033b9c"
|
||||
integrity sha512-I5xc9oSJ2h59OwyUqjv95HRyzxj53DAubUERgQMrpcCEYQyToeHA+NEcUEsVWB4j53RDeskeBJ0SgRAYHDBckw==
|
||||
dependencies:
|
||||
"@babel/types" "^7.10.4"
|
||||
"@babel/types" "^7.12.7"
|
||||
|
||||
"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
|
||||
version "7.10.4"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375"
|
||||
integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==
|
||||
|
||||
"@babel/helper-regex@^7.10.4":
|
||||
version "7.10.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.5.tgz#32dfbb79899073c415557053a19bd055aae50ae0"
|
||||
integrity sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==
|
||||
dependencies:
|
||||
lodash "^4.17.19"
|
||||
|
||||
"@babel/helper-remap-async-to-generator@^7.12.1":
|
||||
version "7.12.1"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz#8c4dbbf916314f6047dc05e6a2217074238347fd"
|
||||
@ -291,7 +283,7 @@
|
||||
"@babel/traverse" "^7.10.4"
|
||||
"@babel/types" "^7.10.4"
|
||||
|
||||
"@babel/helpers@^7.12.1", "@babel/helpers@^7.9.0":
|
||||
"@babel/helpers@^7.12.5", "@babel/helpers@^7.9.0":
|
||||
version "7.12.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.5.tgz#1a1ba4a768d9b58310eda516c449913fe647116e"
|
||||
integrity sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA==
|
||||
@ -309,10 +301,10 @@
|
||||
chalk "^2.0.0"
|
||||
js-tokens "^4.0.0"
|
||||
|
||||
"@babel/parser@^7.1.0", "@babel/parser@^7.10.4", "@babel/parser@^7.12.3", "@babel/parser@^7.12.5", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.9.0":
|
||||
version "7.12.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.5.tgz#b4af32ddd473c0bfa643bd7ff0728b8e71b81ea0"
|
||||
integrity sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==
|
||||
"@babel/parser@^7.1.0", "@babel/parser@^7.12.7", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.9.0":
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.7.tgz#fee7b39fe809d0e73e5b25eecaf5780ef3d73056"
|
||||
integrity sha512-oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg==
|
||||
|
||||
"@babel/plugin-proposal-async-generator-functions@^7.12.1", "@babel/plugin-proposal-async-generator-functions@^7.8.3":
|
||||
version "7.12.1"
|
||||
@ -404,10 +396,10 @@
|
||||
"@babel/helper-plugin-utils" "^7.8.3"
|
||||
"@babel/plugin-syntax-numeric-separator" "^7.8.3"
|
||||
|
||||
"@babel/plugin-proposal-numeric-separator@^7.12.1", "@babel/plugin-proposal-numeric-separator@^7.8.3":
|
||||
version "7.12.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.5.tgz#b1ce757156d40ed79d59d467cb2b154a5c4149ba"
|
||||
integrity sha512-UiAnkKuOrCyjZ3sYNHlRlfuZJbBHknMQ9VMwVeX97Ofwx7RpD6gS2HfqTCh8KNUQgcOm8IKt103oR4KIjh7Q8g==
|
||||
"@babel/plugin-proposal-numeric-separator@^7.12.7", "@babel/plugin-proposal-numeric-separator@^7.8.3":
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz#8bf253de8139099fea193b297d23a9d406ef056b"
|
||||
integrity sha512-8c+uy0qmnRTeukiGsjLGy6uVs/TFjJchGXUeBqlG4VWYOdJWkhhVPdQ3uHwbmalfJwv2JsV0qffXP4asRfL2SQ==
|
||||
dependencies:
|
||||
"@babel/helper-plugin-utils" "^7.10.4"
|
||||
"@babel/plugin-syntax-numeric-separator" "^7.10.4"
|
||||
@ -437,10 +429,10 @@
|
||||
"@babel/helper-plugin-utils" "^7.8.3"
|
||||
"@babel/plugin-syntax-optional-chaining" "^7.8.0"
|
||||
|
||||
"@babel/plugin-proposal-optional-chaining@^7.12.1", "@babel/plugin-proposal-optional-chaining@^7.9.0":
|
||||
version "7.12.1"
|
||||
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.1.tgz#cce122203fc8a32794296fc377c6dedaf4363797"
|
||||
integrity sha512-c2uRpY6WzaVDzynVY9liyykS+kVU+WRZPMPYpkelXH8KBt1oXoI89kPbZKKG/jDT5UK92FTW2fZkZaJhdiBabw==
|
||||
"@babel/plugin-proposal-optional-chaining@^7.12.7", "@babel/plugin-proposal-optional-chaining@^7.9.0":
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz#e02f0ea1b5dc59d401ec16fb824679f683d3303c"
|
||||
integrity sha512-4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA==
|
||||
dependencies:
|
||||
"@babel/helper-plugin-utils" "^7.10.4"
|
||||
"@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
|
||||
@ -787,12 +779,12 @@
|
||||
dependencies:
|
||||
"@babel/helper-plugin-utils" "^7.10.4"
|
||||
|
||||
"@babel/plugin-transform-react-jsx-development@^7.12.5", "@babel/plugin-transform-react-jsx-development@^7.9.0":
|
||||
version "7.12.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.5.tgz#677de5b96da310430d6cfb7fee16a1603afa3d56"
|
||||
integrity sha512-1JJusg3iPgsZDthyWiCr3KQiGs31ikU/mSf2N2dSYEAO0GEImmVUbWf0VoSDGDFTAn5Dj4DUiR6SdIXHY7tELA==
|
||||
"@babel/plugin-transform-react-jsx-development@^7.12.7", "@babel/plugin-transform-react-jsx-development@^7.9.0":
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.7.tgz#4c2a647de79c7e2b16bfe4540677ba3121e82a08"
|
||||
integrity sha512-Rs3ETtMtR3VLXFeYRChle5SsP/P9Jp/6dsewBQfokDSzKJThlsuFcnzLTDRALiUmTC48ej19YD9uN1mupEeEDg==
|
||||
dependencies:
|
||||
"@babel/helper-builder-react-jsx-experimental" "^7.12.1"
|
||||
"@babel/helper-builder-react-jsx-experimental" "^7.12.4"
|
||||
"@babel/helper-plugin-utils" "^7.10.4"
|
||||
"@babel/plugin-syntax-jsx" "^7.12.1"
|
||||
|
||||
@ -810,13 +802,13 @@
|
||||
dependencies:
|
||||
"@babel/helper-plugin-utils" "^7.10.4"
|
||||
|
||||
"@babel/plugin-transform-react-jsx@^7.12.5", "@babel/plugin-transform-react-jsx@^7.9.1":
|
||||
version "7.12.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.5.tgz#39ede0e30159770561b6963be143e40af3bde00c"
|
||||
integrity sha512-2xkcPqqrYiOQgSlM/iwto1paPijjsDbUynN13tI6bosDz/jOW3CRzYguIE8wKX32h+msbBM22Dv5fwrFkUOZjQ==
|
||||
"@babel/plugin-transform-react-jsx@^7.12.7", "@babel/plugin-transform-react-jsx@^7.9.1":
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.7.tgz#8b14d45f6eccd41b7f924bcb65c021e9f0a06f7f"
|
||||
integrity sha512-YFlTi6MEsclFAPIDNZYiCRbneg1MFGao9pPG9uD5htwE0vDbPaMUMeYd6itWjw7K4kro4UbdQf3ljmFl9y48dQ==
|
||||
dependencies:
|
||||
"@babel/helper-builder-react-jsx" "^7.10.4"
|
||||
"@babel/helper-builder-react-jsx-experimental" "^7.12.1"
|
||||
"@babel/helper-builder-react-jsx-experimental" "^7.12.4"
|
||||
"@babel/helper-plugin-utils" "^7.10.4"
|
||||
"@babel/plugin-syntax-jsx" "^7.12.1"
|
||||
|
||||
@ -867,13 +859,12 @@
|
||||
"@babel/helper-plugin-utils" "^7.10.4"
|
||||
"@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
|
||||
|
||||
"@babel/plugin-transform-sticky-regex@^7.12.1", "@babel/plugin-transform-sticky-regex@^7.8.3":
|
||||
version "7.12.1"
|
||||
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.1.tgz#5c24cf50de396d30e99afc8d1c700e8bce0f5caf"
|
||||
integrity sha512-CiUgKQ3AGVk7kveIaPEET1jNDhZZEl1RPMWdTBE1799bdz++SwqDHStmxfCtDfBhQgCl38YRiSnrMuUMZIWSUQ==
|
||||
"@babel/plugin-transform-sticky-regex@^7.12.7", "@babel/plugin-transform-sticky-regex@^7.8.3":
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz#560224613ab23987453948ed21d0b0b193fa7fad"
|
||||
integrity sha512-VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg==
|
||||
dependencies:
|
||||
"@babel/helper-plugin-utils" "^7.10.4"
|
||||
"@babel/helper-regex" "^7.10.4"
|
||||
|
||||
"@babel/plugin-transform-template-literals@^7.12.1", "@babel/plugin-transform-template-literals@^7.8.3":
|
||||
version "7.12.1"
|
||||
@ -980,13 +971,13 @@
|
||||
semver "^5.5.0"
|
||||
|
||||
"@babel/preset-env@^7.4.5", "@babel/preset-env@^7.8.4":
|
||||
version "7.12.1"
|
||||
resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.1.tgz#9c7e5ca82a19efc865384bb4989148d2ee5d7ac2"
|
||||
integrity sha512-H8kxXmtPaAGT7TyBvSSkoSTUK6RHh61So05SyEbpmr0MCZrsNYn7mGMzzeYoOUCdHzww61k8XBft2TaES+xPLg==
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.7.tgz#54ea21dbe92caf6f10cb1a0a576adc4ebf094b55"
|
||||
integrity sha512-OnNdfAr1FUQg7ksb7bmbKoby4qFOHw6DKWWUNB9KqnnCldxhxJlP+21dpyaWFmf2h0rTbOkXJtAGevY3XW1eew==
|
||||
dependencies:
|
||||
"@babel/compat-data" "^7.12.1"
|
||||
"@babel/helper-compilation-targets" "^7.12.1"
|
||||
"@babel/helper-module-imports" "^7.12.1"
|
||||
"@babel/compat-data" "^7.12.7"
|
||||
"@babel/helper-compilation-targets" "^7.12.5"
|
||||
"@babel/helper-module-imports" "^7.12.5"
|
||||
"@babel/helper-plugin-utils" "^7.10.4"
|
||||
"@babel/helper-validator-option" "^7.12.1"
|
||||
"@babel/plugin-proposal-async-generator-functions" "^7.12.1"
|
||||
@ -996,10 +987,10 @@
|
||||
"@babel/plugin-proposal-json-strings" "^7.12.1"
|
||||
"@babel/plugin-proposal-logical-assignment-operators" "^7.12.1"
|
||||
"@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1"
|
||||
"@babel/plugin-proposal-numeric-separator" "^7.12.1"
|
||||
"@babel/plugin-proposal-numeric-separator" "^7.12.7"
|
||||
"@babel/plugin-proposal-object-rest-spread" "^7.12.1"
|
||||
"@babel/plugin-proposal-optional-catch-binding" "^7.12.1"
|
||||
"@babel/plugin-proposal-optional-chaining" "^7.12.1"
|
||||
"@babel/plugin-proposal-optional-chaining" "^7.12.7"
|
||||
"@babel/plugin-proposal-private-methods" "^7.12.1"
|
||||
"@babel/plugin-proposal-unicode-property-regex" "^7.12.1"
|
||||
"@babel/plugin-syntax-async-generators" "^7.8.0"
|
||||
@ -1041,14 +1032,14 @@
|
||||
"@babel/plugin-transform-reserved-words" "^7.12.1"
|
||||
"@babel/plugin-transform-shorthand-properties" "^7.12.1"
|
||||
"@babel/plugin-transform-spread" "^7.12.1"
|
||||
"@babel/plugin-transform-sticky-regex" "^7.12.1"
|
||||
"@babel/plugin-transform-sticky-regex" "^7.12.7"
|
||||
"@babel/plugin-transform-template-literals" "^7.12.1"
|
||||
"@babel/plugin-transform-typeof-symbol" "^7.12.1"
|
||||
"@babel/plugin-transform-unicode-escapes" "^7.12.1"
|
||||
"@babel/plugin-transform-unicode-regex" "^7.12.1"
|
||||
"@babel/preset-modules" "^0.1.3"
|
||||
"@babel/types" "^7.12.1"
|
||||
core-js-compat "^3.6.2"
|
||||
"@babel/types" "^7.12.7"
|
||||
core-js-compat "^3.7.0"
|
||||
semver "^5.5.0"
|
||||
|
||||
"@babel/preset-modules@^0.1.3":
|
||||
@ -1075,14 +1066,14 @@
|
||||
"@babel/plugin-transform-react-jsx-source" "^7.9.0"
|
||||
|
||||
"@babel/preset-react@^7.0.0":
|
||||
version "7.12.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.5.tgz#d45625f65d53612078a43867c5c6750e78772c56"
|
||||
integrity sha512-jcs++VPrgyFehkMezHtezS2BpnUlR7tQFAyesJn1vGTO9aTFZrgIQrA5YydlTwxbcjMwkFY6i04flCigRRr3GA==
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.7.tgz#36d61d83223b07b6ac4ec55cf016abb0f70be83b"
|
||||
integrity sha512-wKeTdnGUP5AEYCYQIMeXMMwU7j+2opxrG0WzuZfxuuW9nhKvvALBjl67653CWamZJVefuJGI219G591RSldrqQ==
|
||||
dependencies:
|
||||
"@babel/helper-plugin-utils" "^7.10.4"
|
||||
"@babel/plugin-transform-react-display-name" "^7.12.1"
|
||||
"@babel/plugin-transform-react-jsx" "^7.12.5"
|
||||
"@babel/plugin-transform-react-jsx-development" "^7.12.5"
|
||||
"@babel/plugin-transform-react-jsx" "^7.12.7"
|
||||
"@babel/plugin-transform-react-jsx-development" "^7.12.7"
|
||||
"@babel/plugin-transform-react-jsx-self" "^7.12.1"
|
||||
"@babel/plugin-transform-react-jsx-source" "^7.12.1"
|
||||
"@babel/plugin-transform-react-pure-annotations" "^7.12.1"
|
||||
@ -1117,34 +1108,34 @@
|
||||
dependencies:
|
||||
regenerator-runtime "^0.13.4"
|
||||
|
||||
"@babel/template@^7.10.4", "@babel/template@^7.4.0", "@babel/template@^7.8.6":
|
||||
version "7.10.4"
|
||||
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278"
|
||||
integrity sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==
|
||||
"@babel/template@^7.10.4", "@babel/template@^7.12.7", "@babel/template@^7.4.0", "@babel/template@^7.8.6":
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc"
|
||||
integrity sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==
|
||||
dependencies:
|
||||
"@babel/code-frame" "^7.10.4"
|
||||
"@babel/parser" "^7.10.4"
|
||||
"@babel/types" "^7.10.4"
|
||||
"@babel/parser" "^7.12.7"
|
||||
"@babel/types" "^7.12.7"
|
||||
|
||||
"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.5", "@babel/traverse@^7.4.3", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.9.0":
|
||||
version "7.12.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.5.tgz#78a0c68c8e8a35e4cacfd31db8bb303d5606f095"
|
||||
integrity sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==
|
||||
"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.5", "@babel/traverse@^7.12.9", "@babel/traverse@^7.4.3", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.9.0":
|
||||
version "7.12.9"
|
||||
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.9.tgz#fad26c972eabbc11350e0b695978de6cc8e8596f"
|
||||
integrity sha512-iX9ajqnLdoU1s1nHt36JDI9KG4k+vmI8WgjK5d+aDTwQbL2fUnzedNedssA645Ede3PM2ma1n8Q4h2ohwXgMXw==
|
||||
dependencies:
|
||||
"@babel/code-frame" "^7.10.4"
|
||||
"@babel/generator" "^7.12.5"
|
||||
"@babel/helper-function-name" "^7.10.4"
|
||||
"@babel/helper-split-export-declaration" "^7.11.0"
|
||||
"@babel/parser" "^7.12.5"
|
||||
"@babel/types" "^7.12.5"
|
||||
"@babel/parser" "^7.12.7"
|
||||
"@babel/types" "^7.12.7"
|
||||
debug "^4.1.0"
|
||||
globals "^11.1.0"
|
||||
lodash "^4.17.19"
|
||||
|
||||
"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.5", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.9.0":
|
||||
version "7.12.6"
|
||||
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.6.tgz#ae0e55ef1cce1fbc881cd26f8234eb3e657edc96"
|
||||
integrity sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==
|
||||
"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.9.0":
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.7.tgz#6039ff1e242640a29452c9ae572162ec9a8f5d13"
|
||||
integrity sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ==
|
||||
dependencies:
|
||||
"@babel/helper-validator-identifier" "^7.10.4"
|
||||
lodash "^4.17.19"
|
||||
@ -1548,17 +1539,17 @@
|
||||
"@babel/types" "^7.0.0"
|
||||
|
||||
"@types/babel__template@*":
|
||||
version "7.0.3"
|
||||
resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.3.tgz#b8aaeba0a45caca7b56a5de9459872dde3727214"
|
||||
integrity sha512-uCoznIPDmnickEi6D0v11SBpW0OuVqHJCa7syXqQHy5uktSCreIlt0iglsCnmvz8yCb38hGcWeseA8cWJSwv5Q==
|
||||
version "7.4.0"
|
||||
resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.0.tgz#0c888dd70b3ee9eebb6e4f200e809da0076262be"
|
||||
integrity sha512-NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A==
|
||||
dependencies:
|
||||
"@babel/parser" "^7.1.0"
|
||||
"@babel/types" "^7.0.0"
|
||||
|
||||
"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
|
||||
version "7.0.15"
|
||||
resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.15.tgz#db9e4238931eb69ef8aab0ad6523d4d4caa39d03"
|
||||
integrity sha512-Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A==
|
||||
version "7.0.16"
|
||||
resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.16.tgz#0bbbf70c7bc4193210dd27e252c51260a37cd6a7"
|
||||
integrity sha512-S63Dt4CZOkuTmpLGGWtT/mQdVORJOpx6SZWGVaP56dda/0Nx5nEe82K7/LAm8zYr6SfMq+1N2OreIOrHAx656w==
|
||||
dependencies:
|
||||
"@babel/types" "^7.3.0"
|
||||
|
||||
@ -1616,9 +1607,9 @@
|
||||
integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
|
||||
|
||||
"@types/node@*":
|
||||
version "14.14.7"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.7.tgz#8ea1e8f8eae2430cf440564b98c6dfce1ec5945d"
|
||||
integrity sha512-Zw1vhUSQZYw+7u5dAwNbIA9TuTotpzY/OF7sJM9FqPOF3SPjKnxrjoTktXDZgUjybf4cWVBP7O8wvKdSaGHweg==
|
||||
version "14.14.10"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.10.tgz#5958a82e41863cfc71f2307b3748e3491ba03785"
|
||||
integrity sha512-J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ==
|
||||
|
||||
"@types/parse-json@^4.0.0":
|
||||
version "4.0.0"
|
||||
@ -2128,12 +2119,14 @@ array-flatten@^2.1.0:
|
||||
integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
|
||||
|
||||
array-includes@^3.0.3, array-includes@^3.1.1:
|
||||
version "3.1.1"
|
||||
resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348"
|
||||
integrity sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==
|
||||
version "3.1.2"
|
||||
resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.2.tgz#a8db03e0b88c8c6aeddc49cb132f9bcab4ebf9c8"
|
||||
integrity sha512-w2GspexNQpx+PutG3QpT437/BenZBj0M/MZGn5mzv/MofYqo0xmRHzn4lFsoDlWJ+THYsGJmFlW68WlDFx7VRw==
|
||||
dependencies:
|
||||
call-bind "^1.0.0"
|
||||
define-properties "^1.1.3"
|
||||
es-abstract "^1.17.0"
|
||||
es-abstract "^1.18.0-next.1"
|
||||
get-intrinsic "^1.0.1"
|
||||
is-string "^1.0.5"
|
||||
|
||||
array-union@^1.0.1:
|
||||
@ -2154,12 +2147,13 @@ array-unique@^0.3.2:
|
||||
integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
|
||||
|
||||
array.prototype.flat@^1.2.1:
|
||||
version "1.2.3"
|
||||
resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b"
|
||||
integrity sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==
|
||||
version "1.2.4"
|
||||
resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz#6ef638b43312bd401b4c6199fdec7e2dc9e9a123"
|
||||
integrity sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==
|
||||
dependencies:
|
||||
call-bind "^1.0.0"
|
||||
define-properties "^1.1.3"
|
||||
es-abstract "^1.17.0-next.1"
|
||||
es-abstract "^1.18.0-next.1"
|
||||
|
||||
arrify@^1.0.1:
|
||||
version "1.0.1"
|
||||
@ -2172,7 +2166,7 @@ asap@~2.0.6:
|
||||
integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
|
||||
|
||||
"asc-web-common@file:../../../packages/asc-web-common":
|
||||
version "1.0.279"
|
||||
version "1.0.281"
|
||||
dependencies:
|
||||
axios "^0.19.1"
|
||||
history "4.10.1"
|
||||
@ -2189,7 +2183,7 @@ asap@~2.0.6:
|
||||
sjcl "^1.0.8"
|
||||
|
||||
"asc-web-components@file:../../../packages/asc-web-components":
|
||||
version "1.0.484"
|
||||
version "1.0.488"
|
||||
dependencies:
|
||||
email-addresses "^3.1.0"
|
||||
html-to-react "^1.4.2"
|
||||
@ -2428,9 +2422,9 @@ babel-plugin-named-asset-import@^0.3.6:
|
||||
integrity sha512-squySRkf+6JGnvjoUtDEjSREJEBirnXi9NqP6rjSYsylxQxqBTz+pkmf395i9E2zsvmYUaI40BHo6SqZUdydlw==
|
||||
|
||||
"babel-plugin-styled-components@>= 1":
|
||||
version "1.11.1"
|
||||
resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-1.11.1.tgz#5296a9e557d736c3186be079fff27c6665d63d76"
|
||||
integrity sha512-YwrInHyKUk1PU3avIRdiLyCpM++18Rs1NgyMXEAQC33rIXs/vro0A+stf4sT0Gf22Got+xRWB8Cm0tw+qkRzBA==
|
||||
version "1.12.0"
|
||||
resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-1.12.0.tgz#1dec1676512177de6b827211e9eda5a30db4f9b9"
|
||||
integrity sha512-FEiD7l5ZABdJPpLssKXjBUJMYqzbcNzBowfXDCdJhOpbhWiewapUaY+LZGT8R4Jg2TwOjGjG4RKeyrO5p9sBkA==
|
||||
dependencies:
|
||||
"@babel/helper-annotate-as-pure" "^7.0.0"
|
||||
"@babel/helper-module-imports" "^7.0.0"
|
||||
@ -2586,7 +2580,7 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.4.0:
|
||||
resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828"
|
||||
integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==
|
||||
|
||||
bn.js@^5.1.1:
|
||||
bn.js@^5.0.0, bn.js@^5.1.1:
|
||||
version "5.1.3"
|
||||
resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz#beca005408f642ebebea80b042b4d18d2ac0ee6b"
|
||||
integrity sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==
|
||||
@ -2704,11 +2698,11 @@ browserify-des@^1.0.0:
|
||||
safe-buffer "^5.1.2"
|
||||
|
||||
browserify-rsa@^4.0.0, browserify-rsa@^4.0.1:
|
||||
version "4.0.1"
|
||||
resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
|
||||
integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=
|
||||
version "4.1.0"
|
||||
resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d"
|
||||
integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==
|
||||
dependencies:
|
||||
bn.js "^4.1.0"
|
||||
bn.js "^5.0.0"
|
||||
randombytes "^2.0.1"
|
||||
|
||||
browserify-sign@^4.0.0:
|
||||
@ -2743,7 +2737,7 @@ browserslist@4.10.0:
|
||||
node-releases "^1.1.52"
|
||||
pkg-up "^3.1.0"
|
||||
|
||||
browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.14.6, browserslist@^4.6.2, browserslist@^4.6.4, browserslist@^4.9.1:
|
||||
browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.14.7, browserslist@^4.6.2, browserslist@^4.6.4, browserslist@^4.9.1:
|
||||
version "4.14.7"
|
||||
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.7.tgz#c071c1b3622c1c2e790799a37bb09473a4351cb6"
|
||||
integrity sha512-BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ==
|
||||
@ -2949,9 +2943,9 @@ caniuse-api@^3.0.0:
|
||||
lodash.uniq "^4.5.0"
|
||||
|
||||
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001157:
|
||||
version "1.0.30001157"
|
||||
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001157.tgz#2d11aaeb239b340bc1aa730eca18a37fdb07a9ab"
|
||||
integrity sha512-gOerH9Wz2IRZ2ZPdMfBvyOi3cjaz4O4dgNwPGzx8EhqAs4+2IL/O+fJsbt+znSigujoZG8bVcIAUM/I/E5K3MA==
|
||||
version "1.0.30001162"
|
||||
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001162.tgz#9f83aad1f42539ce9aab58bb177598f2f8e22ec6"
|
||||
integrity sha512-E9FktFxaNnp4ky3ucIGzEXLM+Knzlpuq1oN1sFAU0KeayygabGTmOsndpo8QrL4D9pcThlf4D2pUKaDxPCUmVw==
|
||||
|
||||
capture-exit@^2.0.0:
|
||||
version "2.0.0"
|
||||
@ -3418,28 +3412,28 @@ copy-webpack-plugin@^5.1.1:
|
||||
serialize-javascript "^4.0.0"
|
||||
webpack-log "^2.0.0"
|
||||
|
||||
core-js-compat@^3.6.2:
|
||||
version "3.7.0"
|
||||
resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.7.0.tgz#8479c5d3d672d83f1f5ab94cf353e57113e065ed"
|
||||
integrity sha512-V8yBI3+ZLDVomoWICO6kq/CD28Y4r1M7CWeO4AGpMdMfseu8bkSubBmUPySMGKRTS+su4XQ07zUkAsiu9FCWTg==
|
||||
core-js-compat@^3.6.2, core-js-compat@^3.7.0:
|
||||
version "3.8.0"
|
||||
resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.8.0.tgz#3248c6826f4006793bd637db608bca6e4cd688b1"
|
||||
integrity sha512-o9QKelQSxQMYWHXc/Gc4L8bx/4F7TTraE5rhuN8I7mKBt5dBIUpXpIR3omv70ebr8ST5R3PqbDQr+ZI3+Tt1FQ==
|
||||
dependencies:
|
||||
browserslist "^4.14.6"
|
||||
browserslist "^4.14.7"
|
||||
semver "7.0.0"
|
||||
|
||||
core-js-pure@^3.0.0:
|
||||
version "3.7.0"
|
||||
resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.7.0.tgz#28a57c861d5698e053f0ff36905f7a3301b4191e"
|
||||
integrity sha512-EZD2ckZysv8MMt4J6HSvS9K2GdtlZtdBncKAmF9lr2n0c9dJUaUN88PSTjvgwCgQPWKTkERXITgS6JJRAnljtg==
|
||||
version "3.8.0"
|
||||
resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.8.0.tgz#4cdd2eca37d49cda206b66e26204818dba77884a"
|
||||
integrity sha512-fRjhg3NeouotRoIV0L1FdchA6CK7ZD+lyINyMoz19SyV+ROpC4noS1xItWHFtwZdlqfMfVPJEyEGdfri2bD1pA==
|
||||
|
||||
core-js@^2.4.0, core-js@^2.6.4:
|
||||
version "2.6.11"
|
||||
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
|
||||
integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
|
||||
version "2.6.12"
|
||||
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
|
||||
integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
|
||||
|
||||
core-js@^3.5.0:
|
||||
version "3.7.0"
|
||||
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.7.0.tgz#b0a761a02488577afbf97179e4681bf49568520f"
|
||||
integrity sha512-NwS7fI5M5B85EwpWuIwJN4i/fbisQUwLwiSNUWeXlkAZ0sbBjLEvLvFLf1uzAUV66PcEPt4xCGCmOZSxVf3xzA==
|
||||
version "3.8.0"
|
||||
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.0.tgz#0fc2d4941cadf80538b030648bb64d230b4da0ce"
|
||||
integrity sha512-W2VYNB0nwQQE7tKS7HzXd7r2y/y2SVJl4ga6oH/dnaLFzM0o2lB2P3zCkWj5Wc/zyMYjtgd5Hmhk0ObkQFZOIA==
|
||||
|
||||
core-util-is@1.0.2, core-util-is@~1.0.0:
|
||||
version "1.0.2"
|
||||
@ -3677,12 +3671,12 @@ css-tree@1.0.0-alpha.37:
|
||||
mdn-data "2.0.4"
|
||||
source-map "^0.6.1"
|
||||
|
||||
css-tree@^1.0.0:
|
||||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.1.tgz#7726678dfe2a57993a018d9dce519bf1760e3b6d"
|
||||
integrity sha512-WroX+2MvsYcRGP8QA0p+rxzOniT/zpAoQ/DTKDSJzh5T3IQKUkFHeIIfgIapm2uaP178GWY3Mime1qbk8GO/tA==
|
||||
css-tree@^1.1.2:
|
||||
version "1.1.2"
|
||||
resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.2.tgz#9ae393b5dafd7dae8a622475caec78d3d8fbd7b5"
|
||||
integrity sha512-wCoWush5Aeo48GLhfHPbmvZs59Z+M7k5+B1xDnXbdWNcEF423DoFdqSWE0PM5aNk5nI5cp1q7ms36zGApY/sKQ==
|
||||
dependencies:
|
||||
mdn-data "2.0.12"
|
||||
mdn-data "2.0.14"
|
||||
source-map "^0.6.1"
|
||||
|
||||
css-what@2.1:
|
||||
@ -3789,11 +3783,11 @@ cssnano@^4.1.10:
|
||||
postcss "^7.0.0"
|
||||
|
||||
csso@^4.0.2:
|
||||
version "4.1.0"
|
||||
resolved "https://registry.yarnpkg.com/csso/-/csso-4.1.0.tgz#1d31193efa99b87aa6bad6c0cef155e543d09e8b"
|
||||
integrity sha512-h+6w/W1WqXaJA4tb1dk7r5tVbOm97MsKxzwnvOR04UQ6GILroryjMWu3pmCCtL2mLaEStQ0fZgeGiy99mo7iyg==
|
||||
version "4.2.0"
|
||||
resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529"
|
||||
integrity sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==
|
||||
dependencies:
|
||||
css-tree "^1.0.0"
|
||||
css-tree "^1.1.2"
|
||||
|
||||
cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0", cssom@^0.3.4:
|
||||
version "0.3.8"
|
||||
@ -3808,9 +3802,9 @@ cssstyle@^1.0.0, cssstyle@^1.1.1:
|
||||
cssom "0.3.x"
|
||||
|
||||
csstype@^3.0.2:
|
||||
version "3.0.4"
|
||||
resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.4.tgz#b156d7be03b84ff425c9a0a4b1e5f4da9c5ca888"
|
||||
integrity sha512-xc8DUsCLmjvCfoD7LTGE0ou2MIWLx0K9RCZwSHMOdynqRsP4MtUcLeqh1HcQ2dInwDTqn+3CE0/FZh1et+p4jA==
|
||||
version "3.0.5"
|
||||
resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.5.tgz#7fdec6a28a67ae18647c51668a9ff95bb2fa7bb8"
|
||||
integrity sha512-uVDi8LpBUKQj6sdxNaTetL6FpeCqTjOvAQuQUa/qAqq8oOd4ivkbhgnqayl0dnPal8Tb/yB1tF+gOvCBiicaiQ==
|
||||
|
||||
currently-unhandled@^0.4.1:
|
||||
version "0.4.1"
|
||||
@ -3868,16 +3862,16 @@ debug@=3.1.0:
|
||||
ms "2.0.0"
|
||||
|
||||
debug@^3.1.1, debug@^3.2.5:
|
||||
version "3.2.6"
|
||||
resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
|
||||
integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
|
||||
version "3.2.7"
|
||||
resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
|
||||
integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
|
||||
dependencies:
|
||||
ms "^2.1.1"
|
||||
|
||||
debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
|
||||
version "4.2.0"
|
||||
resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1"
|
||||
integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==
|
||||
version "4.3.1"
|
||||
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
|
||||
integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
|
||||
dependencies:
|
||||
ms "2.1.2"
|
||||
|
||||
@ -4241,9 +4235,9 @@ ejs@^2.6.1:
|
||||
integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
|
||||
|
||||
electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.591:
|
||||
version "1.3.593"
|
||||
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.593.tgz#947ccf6dc8e013e2b053d2463ecd1043c164fcef"
|
||||
integrity sha512-GvO7G1ZxvffnMvPCr4A7+iQPVuvpyqMrx2VWSERAjG+pHK6tmO9XqYdBfMIq9corRyi4bNImSDEiDvIoDb8HrA==
|
||||
version "1.3.610"
|
||||
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.610.tgz#1254eb394acd220a836ea1f203f8cded4e487052"
|
||||
integrity sha512-eFDC+yVQpEhtlapk4CYDPfV9ajF9cEof5TBcO49L1ETO+aYogrKWDmYpZyxBScMNe8Bo/gJamH4amQ4yyvXg4g==
|
||||
|
||||
elliptic@^6.5.3:
|
||||
version "6.5.3"
|
||||
@ -4328,7 +4322,7 @@ error-ex@^1.2.0, error-ex@^1.3.1:
|
||||
dependencies:
|
||||
is-arrayish "^0.2.1"
|
||||
|
||||
es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.17.5:
|
||||
es-abstract@^1.17.0-next.1, es-abstract@^1.17.2:
|
||||
version "1.17.7"
|
||||
resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz#a4de61b2f66989fc7421676c1cb9787573ace54c"
|
||||
integrity sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==
|
||||
@ -4408,7 +4402,7 @@ escape-html@~1.0.3:
|
||||
resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
|
||||
integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
|
||||
|
||||
escape-string-regexp@2.0.0:
|
||||
escape-string-regexp@2.0.0, escape-string-regexp@^2.0.0:
|
||||
version "2.0.0"
|
||||
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
|
||||
integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
|
||||
@ -4913,9 +4907,9 @@ file-loader@4.3.0:
|
||||
schema-utils "^2.5.0"
|
||||
|
||||
file-selector@^0.2.2:
|
||||
version "0.2.3"
|
||||
resolved "https://registry.yarnpkg.com/file-selector/-/file-selector-0.2.3.tgz#e2958cdd4366f95e59dc618b95c700abe72ed7a6"
|
||||
integrity sha512-d+hc9ctodLSVG55V2V5I4/eJBEr2p2na/kDN46Ty7PBhdp/Q5NmeQTXKa1Hx3AcIL1lgSFKZI0ve/v5ZXGCDkQ==
|
||||
version "0.2.4"
|
||||
resolved "https://registry.yarnpkg.com/file-selector/-/file-selector-0.2.4.tgz#7b98286f9dbb9925f420130ea5ed0a69238d4d80"
|
||||
integrity sha512-ZDsQNbrv6qRi1YTDOEWzf5J2KjZ9KMI1Q2SGeTkCJmNNW25Jg4TW4UMcmoqcg4WrAyKRcpBXdbWRxkfrOzVRbA==
|
||||
dependencies:
|
||||
tslib "^2.0.3"
|
||||
|
||||
@ -5248,7 +5242,7 @@ get-caller-file@^2.0.1:
|
||||
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
|
||||
integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
|
||||
|
||||
get-intrinsic@^1.0.0:
|
||||
get-intrinsic@^1.0.0, get-intrinsic@^1.0.1:
|
||||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.1.tgz#94a9768fcbdd0595a1c9273aacf4c89d075631be"
|
||||
integrity sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==
|
||||
@ -6078,9 +6072,9 @@ is-color-stop@^1.0.0:
|
||||
rgba-regex "^1.0.0"
|
||||
|
||||
is-core-module@^2.1.0:
|
||||
version "2.1.0"
|
||||
resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.1.0.tgz#a4cc031d9b1aca63eecbd18a650e13cb4eeab946"
|
||||
integrity sha512-YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA==
|
||||
version "2.2.0"
|
||||
resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
|
||||
integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
|
||||
dependencies:
|
||||
has "^1.0.3"
|
||||
|
||||
@ -7219,9 +7213,9 @@ lodash@4.17.19:
|
||||
integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
|
||||
|
||||
loglevel@^1.6.8:
|
||||
version "1.7.0"
|
||||
resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.0.tgz#728166855a740d59d38db01cf46f042caa041bb0"
|
||||
integrity sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==
|
||||
version "1.7.1"
|
||||
resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197"
|
||||
integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==
|
||||
|
||||
loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
|
||||
version "1.4.0"
|
||||
@ -7320,10 +7314,10 @@ md5.js@^1.3.4:
|
||||
inherits "^2.0.1"
|
||||
safe-buffer "^5.1.2"
|
||||
|
||||
mdn-data@2.0.12:
|
||||
version "2.0.12"
|
||||
resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.12.tgz#bbb658d08b38f574bbb88f7b83703defdcc46844"
|
||||
integrity sha512-ULbAlgzVb8IqZ0Hsxm6hHSlQl3Jckst2YEQS7fODu9ilNWy2LvcoSY7TRFIktABP2mdppBioc66va90T+NUs8Q==
|
||||
mdn-data@2.0.14:
|
||||
version "2.0.14"
|
||||
resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
|
||||
integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==
|
||||
|
||||
mdn-data@2.0.4:
|
||||
version "2.0.4"
|
||||
@ -7756,9 +7750,9 @@ node-notifier@^5.4.2:
|
||||
which "^1.3.0"
|
||||
|
||||
node-releases@^1.1.52, node-releases@^1.1.66:
|
||||
version "1.1.66"
|
||||
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.66.tgz#609bd0dc069381015cd982300bae51ab4f1b1814"
|
||||
integrity sha512-JHEQ1iWPGK+38VLB2H9ef2otU4l8s3yAMt9Xf934r6+ojCYDMHPMqvCc9TnzfeFSP1QEOeU6YZEd3+De0LTCgg==
|
||||
version "1.1.67"
|
||||
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.67.tgz#28ebfcccd0baa6aad8e8d4d8fe4cbc49ae239c12"
|
||||
integrity sha512-V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg==
|
||||
|
||||
node-sass@^4.13.0:
|
||||
version "4.14.1"
|
||||
@ -7901,12 +7895,12 @@ object-inspect@^1.8.0:
|
||||
integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==
|
||||
|
||||
object-is@^1.0.1:
|
||||
version "1.1.3"
|
||||
resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.3.tgz#2e3b9e65560137455ee3bd62aec4d90a2ea1cc81"
|
||||
integrity sha512-teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg==
|
||||
version "1.1.4"
|
||||
resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.4.tgz#63d6c83c00a43f4cbc9434eb9757c8a5b8565068"
|
||||
integrity sha512-1ZvAZ4wlF7IyPVOcE1Omikt7UpaFlOQq0HlSti+ZvDH3UiD2brwGMwDbyV43jao2bKJ+4+WdPJHSd7kgzKYVqg==
|
||||
dependencies:
|
||||
call-bind "^1.0.0"
|
||||
define-properties "^1.1.3"
|
||||
es-abstract "^1.18.0-next.1"
|
||||
|
||||
object-keys@^1.0.12, object-keys@^1.1.1:
|
||||
version "1.1.1"
|
||||
@ -7936,31 +7930,33 @@ object.assign@^4.1.0, object.assign@^4.1.1:
|
||||
object-keys "^1.1.1"
|
||||
|
||||
object.entries@^1.1.0, object.entries@^1.1.1:
|
||||
version "1.1.2"
|
||||
resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.2.tgz#bc73f00acb6b6bb16c203434b10f9a7e797d3add"
|
||||
integrity sha512-BQdB9qKmb/HyNdMNWVr7O3+z5MUIx3aiegEIJqjMBbBf0YT9RRxTJSim4mzFqtyr7PDAHigq0N9dO0m0tRakQA==
|
||||
version "1.1.3"
|
||||
resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.3.tgz#c601c7f168b62374541a07ddbd3e2d5e4f7711a6"
|
||||
integrity sha512-ym7h7OZebNS96hn5IJeyUmaWhaSM4SVtAPPfNLQEI2MYWCO2egsITb9nab2+i/Pwibx+R0mtn+ltKJXRSeTMGg==
|
||||
dependencies:
|
||||
call-bind "^1.0.0"
|
||||
define-properties "^1.1.3"
|
||||
es-abstract "^1.17.5"
|
||||
es-abstract "^1.18.0-next.1"
|
||||
has "^1.0.3"
|
||||
|
||||
object.fromentries@^2.0.2:
|
||||
version "2.0.2"
|
||||
resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz#4a09c9b9bb3843dd0f89acdb517a794d4f355ac9"
|
||||
integrity sha512-r3ZiBH7MQppDJVLx6fhD618GKNG40CZYH9wgwdhKxBDDbQgjeWGGd4AtkZad84d291YxvWe7bJGuE65Anh0dxQ==
|
||||
version "2.0.3"
|
||||
resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.3.tgz#13cefcffa702dc67750314a3305e8cb3fad1d072"
|
||||
integrity sha512-IDUSMXs6LOSJBWE++L0lzIbSqHl9KDCfff2x/JSEIDtEUavUnyMYC2ZGay/04Zq4UT8lvd4xNhU4/YHKibAOlw==
|
||||
dependencies:
|
||||
call-bind "^1.0.0"
|
||||
define-properties "^1.1.3"
|
||||
es-abstract "^1.17.0-next.1"
|
||||
function-bind "^1.1.1"
|
||||
es-abstract "^1.18.0-next.1"
|
||||
has "^1.0.3"
|
||||
|
||||
object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.0:
|
||||
version "2.1.0"
|
||||
resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649"
|
||||
integrity sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==
|
||||
version "2.1.1"
|
||||
resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.1.tgz#0dfda8d108074d9c563e80490c883b6661091544"
|
||||
integrity sha512-6DtXgZ/lIZ9hqx4GtZETobXLR/ZLaa0aqV0kzbn80Rf8Z2e/XFnhA0I7p07N2wH8bBBltr2xQPi6sbKWAY2Eng==
|
||||
dependencies:
|
||||
call-bind "^1.0.0"
|
||||
define-properties "^1.1.3"
|
||||
es-abstract "^1.17.0-next.1"
|
||||
es-abstract "^1.18.0-next.1"
|
||||
|
||||
object.pick@^1.3.0:
|
||||
version "1.3.0"
|
||||
@ -7970,13 +7966,13 @@ object.pick@^1.3.0:
|
||||
isobject "^3.0.1"
|
||||
|
||||
object.values@^1.1.0, object.values@^1.1.1:
|
||||
version "1.1.1"
|
||||
resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"
|
||||
integrity sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==
|
||||
version "1.1.2"
|
||||
resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.2.tgz#7a2015e06fcb0f546bd652486ce8583a4731c731"
|
||||
integrity sha512-MYC0jvJopr8EK6dPBiO8Nb9mvjdypOachO5REGk6MXzujbBrAisKo3HmdEI6kZDL6fC31Mwee/5YbtMebixeag==
|
||||
dependencies:
|
||||
call-bind "^1.0.0"
|
||||
define-properties "^1.1.3"
|
||||
es-abstract "^1.17.0-next.1"
|
||||
function-bind "^1.1.1"
|
||||
es-abstract "^1.18.0-next.1"
|
||||
has "^1.0.3"
|
||||
|
||||
obuf@^1.0.0, obuf@^1.1.2:
|
||||
@ -9419,9 +9415,9 @@ rc-util@^4.15.3, rc-util@^4.5.1:
|
||||
shallowequal "^1.1.0"
|
||||
|
||||
re-resizable@^6.7.0:
|
||||
version "6.8.0"
|
||||
resolved "https://registry.yarnpkg.com/re-resizable/-/re-resizable-6.8.0.tgz#8a99d98a37032276aea62c1c344612f7e8ddc506"
|
||||
integrity sha512-MffuegFHq5juSvLTe/lecTikc2DqIsLjrTAAZ44goPcNavjYgiCqwJa5RydGPsDOZ+OUZAZk1DP9S4AEu0Q1fQ==
|
||||
version "6.9.0"
|
||||
resolved "https://registry.yarnpkg.com/re-resizable/-/re-resizable-6.9.0.tgz#9c3059b389ced6ade602234cc5bb1e12d231cd47"
|
||||
integrity sha512-3cUDG81ylyqI0Pdgle/RHwwRYq0ORZzsUaySOCO8IbEtNyaRtrIHYm/jMQ5pjcNiKCxR3vsSymIQZHwJq4gg2Q==
|
||||
dependencies:
|
||||
fast-memoize "^2.5.1"
|
||||
|
||||
@ -9672,9 +9668,9 @@ react-scripts@3.4.3:
|
||||
fsevents "2.1.2"
|
||||
|
||||
react-svg@^11.0.9:
|
||||
version "11.1.1"
|
||||
resolved "https://registry.yarnpkg.com/react-svg/-/react-svg-11.1.1.tgz#0e9b11fbf0efc7df347d8f268e8d77fd9d022a3a"
|
||||
integrity sha512-bqj+2C/niy/V519ABD3fUD9+T33DiDUUUuu39d2O9G2RXTXSFHqA7zU7DEjF+yadMXmEbe0+NlNSZimHWN5jew==
|
||||
version "11.1.3"
|
||||
resolved "https://registry.yarnpkg.com/react-svg/-/react-svg-11.1.3.tgz#14c3f1552b0893319e7466e22797cf7f08a3bfb8"
|
||||
integrity sha512-OSrg4mVXgGK+Qypraa0d68bI8e6ubcBGes9lqcaMdSgPjfrzFTe4yaG94UdROwk5JvFVLKTquc4lRuvqOY92KQ==
|
||||
dependencies:
|
||||
"@babel/runtime" "^7.12.5"
|
||||
"@tanem/svg-injector" "^8.1.0"
|
||||
@ -10562,7 +10558,7 @@ shellwords@^0.1.1:
|
||||
resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
|
||||
integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
|
||||
|
||||
side-channel@^1.0.2:
|
||||
side-channel@^1.0.2, side-channel@^1.0.3:
|
||||
version "1.0.3"
|
||||
resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.3.tgz#cdc46b057550bbab63706210838df5d4c19519c3"
|
||||
integrity sha512-A6+ByhlLkksFoUepsGxfj5x1gTSrs+OydsRptUxeNCabQpCFUvcwIczgOigI8vhY/OJCnPnyE9rGiwgvr9cS1g==
|
||||
@ -10752,9 +10748,9 @@ spdx-expression-parse@^3.0.0:
|
||||
spdx-license-ids "^3.0.0"
|
||||
|
||||
spdx-license-ids@^3.0.0:
|
||||
version "3.0.6"
|
||||
resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz#c80757383c28abf7296744998cbc106ae8b854ce"
|
||||
integrity sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw==
|
||||
version "3.0.7"
|
||||
resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65"
|
||||
integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==
|
||||
|
||||
spdy-transport@^3.0.0:
|
||||
version "3.0.0"
|
||||
@ -10827,9 +10823,11 @@ stable@^0.1.8:
|
||||
integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==
|
||||
|
||||
stack-utils@^1.0.1:
|
||||
version "1.0.2"
|
||||
resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8"
|
||||
integrity sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA==
|
||||
version "1.0.4"
|
||||
resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.4.tgz#4b600971dcfc6aed0cbdf2a8268177cc916c87c8"
|
||||
integrity sha512-IPDJfugEGbfizBwBZRZ3xpccMdRyP5lqsBWXGQWimVjua/ccLCeMOAVjlc1R7LxFjo5sEDhyNIXd8mo/AiDS9w==
|
||||
dependencies:
|
||||
escape-string-regexp "^2.0.0"
|
||||
|
||||
static-extend@^0.1.1:
|
||||
version "0.1.2"
|
||||
@ -10945,32 +10943,33 @@ string-width@^4.1.0:
|
||||
strip-ansi "^6.0.0"
|
||||
|
||||
string.prototype.matchall@^4.0.2:
|
||||
version "4.0.2"
|
||||
resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz#48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e"
|
||||
integrity sha512-N/jp6O5fMf9os0JU3E72Qhf590RSRZU/ungsL/qJUYVTNv7hTG0P/dbPjxINVN9jpscu3nzYwKESU3P3RY5tOg==
|
||||
version "4.0.3"
|
||||
resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.3.tgz#24243399bc31b0a49d19e2b74171a15653ec996a"
|
||||
integrity sha512-OBxYDA2ifZQ2e13cP82dWFMaCV9CGF8GzmN4fljBVw5O5wep0lu4gacm1OL6MjROoUnB8VbkWRThqkV2YFLNxw==
|
||||
dependencies:
|
||||
call-bind "^1.0.0"
|
||||
define-properties "^1.1.3"
|
||||
es-abstract "^1.17.0"
|
||||
es-abstract "^1.18.0-next.1"
|
||||
has-symbols "^1.0.1"
|
||||
internal-slot "^1.0.2"
|
||||
regexp.prototype.flags "^1.3.0"
|
||||
side-channel "^1.0.2"
|
||||
side-channel "^1.0.3"
|
||||
|
||||
string.prototype.trimend@^1.0.1:
|
||||
version "1.0.2"
|
||||
resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz#6ddd9a8796bc714b489a3ae22246a208f37bfa46"
|
||||
integrity sha512-8oAG/hi14Z4nOVP0z6mdiVZ/wqjDtWSLygMigTzAb+7aPEDTleeFf+WrF+alzecxIRkckkJVn+dTlwzJXORATw==
|
||||
version "1.0.3"
|
||||
resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz#a22bd53cca5c7cf44d7c9d5c732118873d6cd18b"
|
||||
integrity sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==
|
||||
dependencies:
|
||||
call-bind "^1.0.0"
|
||||
define-properties "^1.1.3"
|
||||
es-abstract "^1.18.0-next.1"
|
||||
|
||||
string.prototype.trimstart@^1.0.1:
|
||||
version "1.0.2"
|
||||
resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz#22d45da81015309cd0cdd79787e8919fc5c613e7"
|
||||
integrity sha512-7F6CdBTl5zyu30BJFdzSTlSlLPwODC23Od+iLoVH8X6+3fvDPPuBVVj9iaB1GOsSTSIgVfsfm27R2FGrAPznWg==
|
||||
version "1.0.3"
|
||||
resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz#9b4cb590e123bb36564401d59824298de50fd5aa"
|
||||
integrity sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==
|
||||
dependencies:
|
||||
call-bind "^1.0.0"
|
||||
define-properties "^1.1.3"
|
||||
es-abstract "^1.18.0-next.1"
|
||||
|
||||
string_decoder@^1.0.0, string_decoder@^1.1.1:
|
||||
version "1.3.0"
|
||||
|
||||
@ -87,7 +87,7 @@ namespace ASC.Files.Core
|
||||
/// </summary>
|
||||
/// <param name="fileIds">id file</param>
|
||||
/// <returns></returns>
|
||||
List<File<T>> GetFiles(T[] fileIds);
|
||||
List<File<T>> GetFiles(IEnumerable<T> fileIds);
|
||||
|
||||
/// <summary>
|
||||
/// Gets the file (s) by ID (s) for share
|
||||
@ -99,7 +99,7 @@ namespace ASC.Files.Core
|
||||
/// <param name="searchText"></param>
|
||||
/// <param name="searchInContent"></param>
|
||||
/// <returns></returns>
|
||||
List<File<T>> GetFilesFiltered(T[] fileIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent);
|
||||
List<File<T>> GetFilesFiltered(IEnumerable<T> fileIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent);
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
@ -280,7 +280,7 @@ namespace ASC.Files.Core
|
||||
/// <param name="searchText"></param>
|
||||
/// <param name="searchInContent"></param>
|
||||
/// <returns></returns>
|
||||
List<File<T>> GetFiles(T[] parentIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent);
|
||||
List<File<T>> GetFiles(IEnumerable<T> parentIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent);
|
||||
|
||||
/// <summary>
|
||||
/// Search the list of files containing text
|
||||
|
||||
@ -95,7 +95,7 @@ namespace ASC.Files.Core
|
||||
/// <param name="searchSubfolders"></param>
|
||||
/// <param name="checkShare"></param>
|
||||
/// <returns></returns>
|
||||
List<Folder<T>> GetFolders(T[] folderIds, FilterType filterType = FilterType.None, bool subjectGroup = false, Guid? subjectID = null, string searchText = "", bool searchSubfolders = false, bool checkShare = true);
|
||||
List<Folder<T>> GetFolders(IEnumerable<T> folderIds, FilterType filterType = FilterType.None, bool subjectGroup = false, Guid? subjectID = null, string searchText = "", bool searchSubfolders = false, bool checkShare = true);
|
||||
|
||||
/// <summary>
|
||||
/// Get folder, contains folder with id
|
||||
|
||||
@ -123,13 +123,18 @@ namespace ASC.Files.Core.Data
|
||||
public File<int> GetFile(int fileId)
|
||||
{
|
||||
var query = GetFileQuery(r => r.Id == fileId && r.CurrentVersion).AsNoTracking();
|
||||
return ToFile(FromQueryWithShared(query).SingleOrDefault());
|
||||
return ToFile(
|
||||
FromQueryWithShared(query)
|
||||
.Take(1)
|
||||
.SingleOrDefault());
|
||||
}
|
||||
|
||||
public File<int> GetFile(int fileId, int fileVersion)
|
||||
{
|
||||
var query = GetFileQuery(r => r.Id == fileId && r.Version == fileVersion).AsNoTracking();
|
||||
return ToFile(FromQueryWithShared(query).SingleOrDefault());
|
||||
return ToFile(FromQueryWithShared(query)
|
||||
.Take(1)
|
||||
.SingleOrDefault());
|
||||
}
|
||||
|
||||
public File<int> GetFile(int parentId, string title)
|
||||
@ -165,9 +170,9 @@ namespace ASC.Files.Core.Data
|
||||
return FromQueryWithShared(query).Select(ToFile).ToList();
|
||||
}
|
||||
|
||||
public List<File<int>> GetFiles(int[] fileIds)
|
||||
public List<File<int>> GetFiles(IEnumerable<int> fileIds)
|
||||
{
|
||||
if (fileIds == null || fileIds.Length == 0) return new List<File<int>>();
|
||||
if (fileIds == null || !fileIds.Any()) return new List<File<int>>();
|
||||
|
||||
var query = GetFileQuery(r => fileIds.Any(a => a == r.Id) && r.CurrentVersion)
|
||||
.AsNoTracking();
|
||||
@ -175,9 +180,9 @@ namespace ASC.Files.Core.Data
|
||||
return FromQueryWithShared(query).Select(ToFile).ToList();
|
||||
}
|
||||
|
||||
public List<File<int>> GetFilesFiltered(int[] fileIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent)
|
||||
public List<File<int>> GetFilesFiltered(IEnumerable<int> fileIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent)
|
||||
{
|
||||
if (fileIds == null || fileIds.Length == 0 || filterType == FilterType.FoldersOnly) return new List<File<int>>();
|
||||
if (fileIds == null || !fileIds.Any() || filterType == FilterType.FoldersOnly) return new List<File<int>>();
|
||||
|
||||
var query = GetFileQuery(r => fileIds.Any(a => a == r.Id) && r.CurrentVersion).AsNoTracking();
|
||||
|
||||
@ -185,7 +190,7 @@ namespace ASC.Files.Core.Data
|
||||
{
|
||||
var func = GetFuncForSearch(null, null, filterType, subjectGroup, subjectID, searchText, searchInContent, false);
|
||||
|
||||
if (FactoryIndexer.TrySelectIds(s => func(s).In(r => r.Id, fileIds), out var searchIds))
|
||||
if (FactoryIndexer.TrySelectIds(s => func(s).In(r => r.Id, fileIds.ToArray()), out var searchIds))
|
||||
{
|
||||
query = query.Where(r => searchIds.Any(b => b == r.Id));
|
||||
}
|
||||
@ -1032,9 +1037,9 @@ namespace ASC.Files.Core.Data
|
||||
FilesDbContext.SaveChanges();
|
||||
}
|
||||
|
||||
public List<File<int>> GetFiles(int[] parentIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent)
|
||||
public List<File<int>> GetFiles(IEnumerable<int> parentIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent)
|
||||
{
|
||||
if (parentIds == null || parentIds.Length == 0 || filterType == FilterType.FoldersOnly) return new List<File<int>>();
|
||||
if (parentIds == null || !parentIds.Any() || filterType == FilterType.FoldersOnly) return new List<File<int>>();
|
||||
|
||||
var q = GetFileQuery(r => r.CurrentVersion)
|
||||
.AsNoTracking()
|
||||
@ -1328,9 +1333,11 @@ namespace ASC.Files.Core.Data
|
||||
.Where(x => x.tree.FolderId == r.FolderId)
|
||||
.OrderByDescending(r => r.tree.Level)
|
||||
.Select(r => r.folder)
|
||||
.Take(1)
|
||||
.FirstOrDefault(),
|
||||
Shared =
|
||||
FilesDbContext.Security
|
||||
.Where(x=> x.TenantId == TenantID)
|
||||
.Where(x => x.EntryType == FileEntryType.File)
|
||||
.Where(x => x.EntryId == r.Id.ToString())
|
||||
.Any()
|
||||
@ -1349,6 +1356,7 @@ namespace ASC.Files.Core.Data
|
||||
.Where(x => x.tree.FolderId == r.FolderId)
|
||||
.OrderByDescending(r => r.tree.Level)
|
||||
.Select(r => r.folder)
|
||||
.Take(1)
|
||||
.FirstOrDefault(),
|
||||
Shared = true
|
||||
});
|
||||
|
||||
@ -219,7 +219,7 @@ namespace ASC.Files.Core.Data
|
||||
return FromQueryWithShared(q).Select(ToFolder).ToList();
|
||||
}
|
||||
|
||||
public List<Folder<int>> GetFolders(int[] folderIds, FilterType filterType = FilterType.None, bool subjectGroup = false, Guid? subjectID = null, string searchText = "", bool searchSubfolders = false, bool checkShare = true)
|
||||
public List<Folder<int>> GetFolders(IEnumerable<int> folderIds, FilterType filterType = FilterType.None, bool subjectGroup = false, Guid? subjectID = null, string searchText = "", bool searchSubfolders = false, bool checkShare = true)
|
||||
{
|
||||
if (filterType == FilterType.FilesOnly || filterType == FilterType.ByExtension
|
||||
|| filterType == FilterType.DocumentsOnly || filterType == FilterType.ImagesOnly
|
||||
@ -243,7 +243,7 @@ namespace ASC.Files.Core.Data
|
||||
if (FactoryIndexer.TrySelectIds(s =>
|
||||
searchSubfolders
|
||||
? s.MatchAll(searchText)
|
||||
: s.MatchAll(searchText).In(r => r.Id, folderIds),
|
||||
: s.MatchAll(searchText).In(r => r.Id, folderIds.ToArray()),
|
||||
out var searchIds))
|
||||
{
|
||||
q = q.Where(r => searchIds.Any(a => a == r.Id));
|
||||
@ -325,7 +325,7 @@ namespace ASC.Files.Core.Data
|
||||
var newFolder = new DbFolder
|
||||
{
|
||||
Id = 0,
|
||||
ParentId = folder.ParentFolderID,
|
||||
ParentId = folder.FolderID,
|
||||
Title = folder.Title,
|
||||
CreateOn = TenantUtil.DateTimeToUtc(folder.CreateOn),
|
||||
CreateBy = folder.CreateBy,
|
||||
@ -353,13 +353,13 @@ namespace ASC.Files.Core.Data
|
||||
|
||||
//full path to root
|
||||
var oldTree = FilesDbContext.Tree
|
||||
.Where(r => r.FolderId == (int)folder.ParentFolderID);
|
||||
.Where(r => r.FolderId == folder.FolderID);
|
||||
|
||||
foreach (var o in oldTree)
|
||||
{
|
||||
var treeToAdd = new DbFolderTree
|
||||
{
|
||||
FolderId = (int)folder.ID,
|
||||
FolderId = folder.ID,
|
||||
ParentId = o.ParentId,
|
||||
Level = o.Level + 1
|
||||
};
|
||||
@ -569,7 +569,7 @@ namespace ASC.Files.Core.Data
|
||||
folder.FolderType = FolderType.DEFAULT;
|
||||
|
||||
var copy = ServiceProvider.GetService<Folder<int>>();
|
||||
copy.ParentFolderID = toFolderId;
|
||||
copy.FolderID = toFolderId;
|
||||
copy.RootFolderId = toFolder.RootFolderId;
|
||||
copy.RootFolderCreator = toFolder.RootFolderCreator;
|
||||
copy.RootFolderType = toFolder.RootFolderType;
|
||||
@ -912,7 +912,7 @@ namespace ASC.Files.Core.Data
|
||||
if (createIfNotExists)
|
||||
{
|
||||
var folder = ServiceProvider.GetService<Folder<int>>();
|
||||
folder.ParentFolderID = 0;
|
||||
folder.FolderID = 0;
|
||||
switch (bunch)
|
||||
{
|
||||
case my:
|
||||
@ -1049,7 +1049,8 @@ namespace ASC.Files.Core.Data
|
||||
.Select(r => r.folder)
|
||||
.Take(1)
|
||||
.FirstOrDefault(),
|
||||
Shared = FilesDbContext.Security
|
||||
Shared = FilesDbContext.Security
|
||||
.Where(x => x.TenantId == TenantID)
|
||||
.Where(r => r.EntryType == FileEntryType.Folder)
|
||||
.Where(x => x.EntryId == r.Id.ToString())
|
||||
.Any()
|
||||
@ -1079,7 +1080,7 @@ namespace ASC.Files.Core.Data
|
||||
if (r == null) return null;
|
||||
var result = ServiceProvider.GetService<Folder<int>>();
|
||||
result.ID = r.Folder.Id;
|
||||
result.ParentFolderID = r.Folder.ParentId;
|
||||
result.FolderID = r.Folder.ParentId;
|
||||
result.Title = r.Folder.Title;
|
||||
result.CreateOn = TenantUtil.DateTimeFromUtc(r.Folder.CreateOn);
|
||||
result.CreateBy = r.Folder.CreateBy;
|
||||
@ -1131,7 +1132,7 @@ namespace ASC.Files.Core.Data
|
||||
break;
|
||||
}
|
||||
|
||||
if (result.FolderType != FolderType.DEFAULT && 0.Equals(result.ParentFolderID)) result.RootFolderType = result.FolderType;
|
||||
if (result.FolderType != FolderType.DEFAULT && 0.Equals(result.FolderID)) result.RootFolderType = result.FolderType;
|
||||
if (result.FolderType != FolderType.DEFAULT && result.RootFolderCreator == default) result.RootFolderCreator = result.CreateBy;
|
||||
if (result.FolderType != FolderType.DEFAULT && 0.Equals(result.RootFolderId)) result.RootFolderId = result.ID;
|
||||
|
||||
|
||||
@ -28,7 +28,8 @@ using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using System.Linq;
|
||||
|
||||
using System.Text.RegularExpressions;
|
||||
|
||||
using ASC.Common;
|
||||
using ASC.Core;
|
||||
using ASC.Core.Common.EF;
|
||||
@ -457,15 +458,15 @@ namespace ASC.Files.Core.Data
|
||||
var shareQuery =
|
||||
new Func<IQueryable<TagLinkData>>(() => getBaseSqlQuery().Where(
|
||||
r => FilesDbContext.Security
|
||||
.Where(a => a.TenantId == r.Link.TenantId)
|
||||
.Where(a => a.TenantId == TenantID)
|
||||
.Where(a => a.EntryId == r.Link.EntryId)
|
||||
.Where(a => a.EntryType == r.Link.EntryType)
|
||||
.Any()));
|
||||
|
||||
var tmpShareFileTags =
|
||||
shareQuery()
|
||||
.Join(FilesDbContext.Files, r => r.Link.EntryId, f => f.Id.ToString(), (tagLink, file) => new { tagLink, file })
|
||||
.Where(r => r.file.TenantId == r.tagLink.Link.TenantId)
|
||||
.Join(FilesDbContext.Files, r => Regex.IsMatch(r.Link.EntryId, "^[0-9]+$") ? Convert.ToInt32(r.Link.EntryId) : -1, f => f.Id, (tagLink, file) => new { tagLink, file })
|
||||
.Where(r => r.file.TenantId == TenantID)
|
||||
.Where(r => r.file.CreateBy != subject)
|
||||
.Where(r => r.tagLink.Link.EntryType == FileEntryType.File)
|
||||
.Select(r => new
|
||||
@ -473,10 +474,11 @@ namespace ASC.Files.Core.Data
|
||||
r.tagLink,
|
||||
root = FilesDbContext.Folders
|
||||
.Join(FilesDbContext.Tree, a => a.Id, b => b.ParentId, (folder, tree) => new { folder, tree })
|
||||
.Where(x => x.folder.TenantId == r.file.TenantId)
|
||||
.Where(x => x.folder.TenantId == TenantID)
|
||||
.Where(x => x.tree.FolderId == r.file.FolderId)
|
||||
.OrderByDescending(r => r.tree.Level)
|
||||
.Select(r => r.folder)
|
||||
.Select(r => r.folder)
|
||||
.Take(1)
|
||||
.FirstOrDefault()
|
||||
})
|
||||
.Where(r => r.root.FolderType == FolderType.USER)
|
||||
@ -487,8 +489,8 @@ namespace ASC.Files.Core.Data
|
||||
|
||||
var tmpShareFolderTags =
|
||||
shareQuery()
|
||||
.Join(FilesDbContext.Folders, r => r.Link.EntryId, f => f.Id.ToString(), (tagLink, folder) => new { tagLink, folder })
|
||||
.Where(r => r.folder.TenantId == r.tagLink.Link.TenantId)
|
||||
.Join(FilesDbContext.Folders, r => Regex.IsMatch(r.Link.EntryId, "^[0-9]+$") ? Convert.ToInt32(r.Link.EntryId) : -1, f => f.Id, (tagLink, folder) => new { tagLink, folder })
|
||||
.Where(r => r.folder.TenantId == TenantID)
|
||||
.Where(r => r.folder.CreateBy != subject)
|
||||
.Where(r => r.tagLink.Link.EntryType == FileEntryType.Folder)
|
||||
.Select(r => new
|
||||
@ -496,10 +498,11 @@ namespace ASC.Files.Core.Data
|
||||
r.tagLink,
|
||||
root = FilesDbContext.Folders
|
||||
.Join(FilesDbContext.Tree, a => a.Id, b => b.ParentId, (folder, tree) => new { folder, tree })
|
||||
.Where(x => x.folder.TenantId == r.folder.TenantId)
|
||||
.Where(x => x.folder.TenantId ==TenantID)
|
||||
.Where(x => x.tree.FolderId == r.folder.ParentId)
|
||||
.OrderByDescending(r => r.tree.Level)
|
||||
.Select(r => r.folder)
|
||||
.Select(r => r.folder)
|
||||
.Take(1)
|
||||
.FirstOrDefault()
|
||||
})
|
||||
.Where(r => r.root.FolderType == FolderType.USER)
|
||||
@ -531,15 +534,15 @@ namespace ASC.Files.Core.Data
|
||||
var shareQuery =
|
||||
new Func<IQueryable<TagLinkData>>(() => getBaseSqlQuery().Where(
|
||||
r => FilesDbContext.Security
|
||||
.Where(a => a.TenantId == r.Link.TenantId)
|
||||
.Where(a => a.TenantId == TenantID)
|
||||
.Where(a => a.EntryId == r.Link.EntryId)
|
||||
.Where(a => a.EntryType == r.Link.EntryType)
|
||||
.Any()));
|
||||
|
||||
var tmpShareFileTags =
|
||||
shareQuery()
|
||||
.Join(FilesDbContext.Files, r => r.Link.EntryId, f => f.Id.ToString(), (tagLink, file) => new { tagLink, file })
|
||||
.Where(r => r.file.TenantId == r.tagLink.Link.TenantId)
|
||||
.Join(FilesDbContext.Files, r => Regex.IsMatch(r.Link.EntryId, "^[0-9]+$") ? Convert.ToInt32(r.Link.EntryId) : -1, f => f.Id, (tagLink, file) => new { tagLink, file })
|
||||
.Where(r => r.file.TenantId == TenantID)
|
||||
.Where(r => r.file.CreateBy != subject)
|
||||
.Where(r => r.tagLink.Link.EntryType == FileEntryType.File)
|
||||
.Select(r => new
|
||||
@ -547,10 +550,11 @@ namespace ASC.Files.Core.Data
|
||||
r.tagLink,
|
||||
root = FilesDbContext.Folders
|
||||
.Join(FilesDbContext.Tree, a => a.Id, b => b.ParentId, (folder, tree) => new { folder, tree })
|
||||
.Where(x => x.folder.TenantId == r.file.TenantId)
|
||||
.Where(x => x.folder.TenantId == TenantID)
|
||||
.Where(x => x.tree.FolderId == r.file.FolderId)
|
||||
.OrderByDescending(r => r.tree.Level)
|
||||
.Select(r => r.folder)
|
||||
.Select(r => r.folder)
|
||||
.Take(1)
|
||||
.FirstOrDefault()
|
||||
})
|
||||
.Where(r => r.root.FolderType == FolderType.Privacy)
|
||||
@ -561,8 +565,8 @@ namespace ASC.Files.Core.Data
|
||||
|
||||
var tmpShareFolderTags =
|
||||
shareQuery()
|
||||
.Join(FilesDbContext.Folders, r => r.Link.EntryId, f => f.Id.ToString(), (tagLink, folder) => new { tagLink, folder })
|
||||
.Where(r => r.folder.TenantId == r.tagLink.Link.TenantId)
|
||||
.Join(FilesDbContext.Folders, r => Regex.IsMatch(r.Link.EntryId, "^[0-9]+$") ? Convert.ToInt32(r.Link.EntryId) : -1, f => f.Id, (tagLink, folder) => new { tagLink, folder })
|
||||
.Where(r => r.folder.TenantId == TenantID)
|
||||
.Where(r => r.folder.CreateBy != subject)
|
||||
.Where(r => r.tagLink.Link.EntryType == FileEntryType.Folder)
|
||||
.Select(r => new
|
||||
@ -570,10 +574,11 @@ namespace ASC.Files.Core.Data
|
||||
r.tagLink,
|
||||
root = FilesDbContext.Folders
|
||||
.Join(FilesDbContext.Tree, a => a.Id, b => b.ParentId, (folder, tree) => new { folder, tree })
|
||||
.Where(x => x.folder.TenantId == r.folder.TenantId)
|
||||
.Where(x => x.folder.TenantId == TenantID)
|
||||
.Where(x => x.tree.FolderId == r.folder.ParentId)
|
||||
.OrderByDescending(r => r.tree.Level)
|
||||
.Select(r => r.folder)
|
||||
.Take(1)
|
||||
.FirstOrDefault()
|
||||
})
|
||||
.Where(r => r.root.FolderType == FolderType.Privacy)
|
||||
@ -626,7 +631,7 @@ namespace ASC.Files.Core.Data
|
||||
|
||||
var newTagsForFiles =
|
||||
getBaseSqlQuery()
|
||||
.Join(FilesDbContext.Files, r => r.Link.EntryId, r => r.Id.ToString(), (tagLink, file) => new { tagLink, file })
|
||||
.Join(FilesDbContext.Files, r => Regex.IsMatch(r.Link.EntryId, "^[0-9]+$") ? Convert.ToInt32(r.Link.EntryId) : -1, r => r.Id, (tagLink, file) => new { tagLink, file })
|
||||
.Where(r => r.file.TenantId == r.tagLink.Link.TenantId)
|
||||
.Where(r => where.Any(a => r.file.FolderId.ToString() == a))
|
||||
.Where(r => r.tagLink.Link.EntryType == FileEntryType.File)
|
||||
@ -657,7 +662,7 @@ namespace ASC.Files.Core.Data
|
||||
|
||||
var newTagsForSBox = getBaseSqlQuery()
|
||||
.Join(FilesDbContext.ThirdpartyIdMapping, r => r.Link.EntryId, r => r.HashId, (tagLink, mapping) => new { tagLink, mapping })
|
||||
.Where(r => r.mapping.TenantId == r.tagLink.Link.TenantId)
|
||||
.Where(r => r.mapping.TenantId == TenantID)
|
||||
.Where(r => thirdpartyFolderIds.Any(a => r.mapping.Id == a))
|
||||
.Where(r => r.tagLink.Tag.Owner == subject)
|
||||
.Where(r => r.tagLink.Link.EntryType == FileEntryType.Folder)
|
||||
@ -672,7 +677,7 @@ namespace ASC.Files.Core.Data
|
||||
protected List<Tag> FromQuery(IQueryable<TagLinkData> dbFilesTags)
|
||||
{
|
||||
return dbFilesTags
|
||||
//.ToList()
|
||||
.ToList()
|
||||
.Select(ToTag)
|
||||
.ToList();
|
||||
}
|
||||
|
||||
@ -24,10 +24,10 @@ namespace ASC.Files.Core.EF
|
||||
public string EntryId { get; set; }
|
||||
|
||||
[Column("create_by")]
|
||||
public Guid CreateBy { get; set; }
|
||||
public Guid? CreateBy { get; set; }
|
||||
|
||||
[Column("create_on")]
|
||||
public DateTime CreateOn { get; set; }
|
||||
public DateTime? CreateOn { get; set; }
|
||||
|
||||
[Column("tag_count")]
|
||||
public int TagCount { get; set; }
|
||||
|
||||
@ -77,8 +77,6 @@ namespace ASC.Files.Core
|
||||
FileConverter = fileConverter;
|
||||
}
|
||||
|
||||
public T FolderID { get; set; }
|
||||
|
||||
public int Version { get; set; }
|
||||
|
||||
[JsonPropertyName("version_group")]
|
||||
@ -242,19 +240,5 @@ namespace ASC.Files.Core
|
||||
|
||||
[NonSerialized]
|
||||
private readonly FileConverter FileConverter;
|
||||
|
||||
private T _folderIdDisplay;
|
||||
|
||||
[JsonPropertyName("folder_id")]
|
||||
public override T FolderIdDisplay
|
||||
{
|
||||
get
|
||||
{
|
||||
if (_folderIdDisplay != null) return _folderIdDisplay;
|
||||
|
||||
return FolderID;
|
||||
}
|
||||
set { _folderIdDisplay = value; }
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -129,13 +129,22 @@ namespace ASC.Files.Core
|
||||
{
|
||||
}
|
||||
|
||||
public T ID { get; set; }
|
||||
public T ID { get; set; }
|
||||
|
||||
public T FolderID { get; set; }
|
||||
|
||||
private T _folderIdDisplay;
|
||||
|
||||
[JsonPropertyName("folder_id")]
|
||||
public abstract T FolderIdDisplay
|
||||
public T FolderIdDisplay
|
||||
{
|
||||
get;
|
||||
set;
|
||||
get
|
||||
{
|
||||
if (_folderIdDisplay != null) return _folderIdDisplay;
|
||||
|
||||
return FolderID;
|
||||
}
|
||||
set { _folderIdDisplay = value; }
|
||||
}
|
||||
|
||||
public T RootFolderId { get; set; }
|
||||
|
||||
@ -68,8 +68,6 @@ namespace ASC.Files.Core
|
||||
{
|
||||
public FolderType FolderType { get; set; }
|
||||
|
||||
public T ParentFolderID { get; set; }
|
||||
|
||||
public int TotalFiles { get; set; }
|
||||
|
||||
public int TotalSubFolders { get; set; }
|
||||
@ -86,19 +84,6 @@ namespace ASC.Files.Core
|
||||
set { NewForMe = Convert.ToInt32(value); }
|
||||
}
|
||||
|
||||
private T _folderIdDisplay;
|
||||
|
||||
public override T FolderIdDisplay
|
||||
{
|
||||
get
|
||||
{
|
||||
if (_folderIdDisplay != null) return _folderIdDisplay;
|
||||
|
||||
return ParentFolderID;
|
||||
}
|
||||
set { _folderIdDisplay = value; }
|
||||
}
|
||||
|
||||
public Folder(Global global)
|
||||
: base(global)
|
||||
{
|
||||
|
||||
@ -300,8 +300,8 @@ namespace ASC.Web.Files.Services.WCFService
|
||||
var prevVisible = breadCrumbs.ElementAtOrDefault(breadCrumbs.Count() - 2);
|
||||
if (prevVisible != null)
|
||||
{
|
||||
if (prevVisible is Folder<string> f1) parent.ParentFolderID = (T)Convert.ChangeType(f1.ID, typeof(T));
|
||||
if (prevVisible is Folder<int> f2) parent.ParentFolderID = (T)Convert.ChangeType(f2.ID, typeof(T));
|
||||
if (prevVisible is Folder<string> f1) parent.FolderID = (T)Convert.ChangeType(f1.ID, typeof(T));
|
||||
if (prevVisible is Folder<int> f2) parent.FolderID = (T)Convert.ChangeType(f2.ID, typeof(T));
|
||||
}
|
||||
|
||||
parent.Shareable = FileSharing.CanSetAccess(parent)
|
||||
@ -348,11 +348,11 @@ namespace ASC.Web.Files.Services.WCFService
|
||||
|
||||
var folderDao = DaoFactory.GetFolderDao<TId>();
|
||||
var fileDao = DaoFactory.GetFileDao<TId>();
|
||||
var folders = folderDao.GetFolders(foldersId.ToArray());
|
||||
var folders = folderDao.GetFolders(foldersId);
|
||||
folders = FileSecurity.FilterRead(folders).ToList();
|
||||
entries = entries.Concat(folders);
|
||||
|
||||
var files = fileDao.GetFiles(filesId.ToArray());
|
||||
var files = fileDao.GetFiles(filesId);
|
||||
files = FileSecurity.FilterRead(files).ToList();
|
||||
entries = entries.Concat(files);
|
||||
|
||||
@ -398,7 +398,7 @@ namespace ASC.Web.Files.Services.WCFService
|
||||
{
|
||||
var newFolder = ServiceProvider.GetService<Folder<T>>();
|
||||
newFolder.Title = title;
|
||||
newFolder.ParentFolderID = parent.ID;
|
||||
newFolder.FolderID = parent.ID;
|
||||
|
||||
var folderId = folderDao.SaveFolder(newFolder);
|
||||
var folder = folderDao.GetFolder(folderId);
|
||||
@ -446,7 +446,7 @@ namespace ASC.Web.Files.Services.WCFService
|
||||
|
||||
if (folder.RootFolderType == FolderType.USER
|
||||
&& !Equals(folder.RootFolderCreator, AuthContext.CurrentAccount.ID)
|
||||
&& !FileSecurity.CanRead(folderDao.GetFolder(folder.ParentFolderID)))
|
||||
&& !FileSecurity.CanRead(folderDao.GetFolder(folder.FolderID)))
|
||||
{
|
||||
folder.FolderIdDisplay = GlobalFolderHelper.GetFolderShare<T>();
|
||||
}
|
||||
@ -676,7 +676,7 @@ namespace ASC.Web.Files.Services.WCFService
|
||||
var result = new ItemDictionary<string, string>();
|
||||
|
||||
var fileDao = GetFileDao();
|
||||
var ids = filesId.Where(FileTracker.IsEditing).Select(id => id).ToArray();
|
||||
var ids = filesId.Where(FileTracker.IsEditing).Select(id => id).ToList();
|
||||
|
||||
foreach (var file in fileDao.GetFiles(ids))
|
||||
{
|
||||
@ -1394,7 +1394,7 @@ namespace ASC.Web.Files.Services.WCFService
|
||||
}
|
||||
}
|
||||
|
||||
var folders = folderDao.GetFolders(foldersId.ToArray());
|
||||
var folders = folderDao.GetFolders(foldersId);
|
||||
var foldersProject = folders.Where(folder => folder.FolderType == FolderType.BUNCH).ToList();
|
||||
if (foldersProject.Any())
|
||||
{
|
||||
@ -1556,7 +1556,7 @@ namespace ASC.Web.Files.Services.WCFService
|
||||
var folderIdToMy = folderDao.GetFolderIDUser(true, userTo.ID);
|
||||
var newFolder = ServiceProvider.GetService<Folder<T>>();
|
||||
newFolder.Title = string.Format(CustomNamingPeople.Substitute<FilesCommonResource>("TitleDeletedUserFolder"), userFrom.DisplayUserName(false, DisplayUserSettingsHelper));
|
||||
newFolder.ParentFolderID = folderIdToMy;
|
||||
newFolder.FolderID = folderIdToMy;
|
||||
|
||||
var newFolderTo = folderDao.SaveFolder(newFolder);
|
||||
|
||||
@ -1608,7 +1608,7 @@ namespace ASC.Web.Files.Services.WCFService
|
||||
rootFoldersId.Add(folderIdFromMy);
|
||||
}
|
||||
|
||||
var rootFolders = folderDao.GetFolders(rootFoldersId.ToArray());
|
||||
var rootFolders = folderDao.GetFolders(rootFoldersId);
|
||||
foreach (var rootFolder in rootFolders)
|
||||
{
|
||||
FileMarker.RemoveMarkAsNew(rootFolder, userId);
|
||||
@ -1646,11 +1646,11 @@ namespace ASC.Web.Files.Services.WCFService
|
||||
var folderDao = GetFolderDao();
|
||||
var entries = Enumerable.Empty<FileEntry<T>>();
|
||||
|
||||
var files = fileDao.GetFiles(filesId.ToArray());
|
||||
var files = fileDao.GetFiles(filesId);
|
||||
files = FileSecurity.FilterRead(files).ToList();
|
||||
entries = entries.Concat(files);
|
||||
|
||||
var folders = folderDao.GetFolders(foldersId.ToArray());
|
||||
var folders = folderDao.GetFolders(foldersId);
|
||||
folders = FileSecurity.FilterRead(folders).ToList();
|
||||
entries = entries.Concat(folders);
|
||||
|
||||
@ -1668,11 +1668,11 @@ namespace ASC.Web.Files.Services.WCFService
|
||||
var folderDao = GetFolderDao();
|
||||
var entries = Enumerable.Empty<FileEntry<T>>();
|
||||
|
||||
var files = fileDao.GetFiles(filesId.ToArray());
|
||||
var files = fileDao.GetFiles(filesId);
|
||||
files = FileSecurity.FilterRead(files).ToList();
|
||||
entries = entries.Concat(files);
|
||||
|
||||
var folders = folderDao.GetFolders(foldersId.ToArray());
|
||||
var folders = folderDao.GetFolders(foldersId);
|
||||
folders = FileSecurity.FilterRead(folders).ToList();
|
||||
entries = entries.Concat(folders);
|
||||
|
||||
@ -1693,7 +1693,7 @@ namespace ASC.Web.Files.Services.WCFService
|
||||
|
||||
var tagDao = GetTagDao();
|
||||
var fileDao = GetFileDao();
|
||||
var files = fileDao.GetFiles(filesId.ToArray());
|
||||
var files = fileDao.GetFiles(filesId);
|
||||
|
||||
files = FileSecurity.FilterRead(files)
|
||||
.Where(file => FileUtility.ExtsWebTemplate.Contains(FileUtility.GetFileExtension(file.Title), StringComparer.CurrentCultureIgnoreCase))
|
||||
@ -1710,7 +1710,7 @@ namespace ASC.Web.Files.Services.WCFService
|
||||
{
|
||||
var tagDao = GetTagDao();
|
||||
var fileDao = GetFileDao();
|
||||
var files = fileDao.GetFiles(filesId.ToArray());
|
||||
var files = fileDao.GetFiles(filesId);
|
||||
|
||||
files = FileSecurity.FilterRead(files).ToList();
|
||||
|
||||
@ -2027,17 +2027,15 @@ namespace ASC.Web.Files.Services.WCFService
|
||||
//return new ItemList<string>(accounts);
|
||||
}
|
||||
|
||||
public ItemList<FileEntry<T>> ChangeOwner(ItemList<string> items, Guid userId)
|
||||
public IEnumerable<FileEntry> ChangeOwner(IEnumerable<T> foldersId, IEnumerable<T> filesId, Guid userId)
|
||||
{
|
||||
var userInfo = UserManager.GetUsers(userId);
|
||||
ErrorIf(Equals(userInfo, Constants.LostUser) || userInfo.IsVisitor(UserManager), FilesCommonResource.ErrorMassage_ChangeOwner);
|
||||
|
||||
ParseArrayItems(items, out var foldersId, out var filesId);
|
||||
|
||||
var entries = new List<FileEntry<T>>();
|
||||
var entries = new List<FileEntry>();
|
||||
|
||||
var folderDao = GetFolderDao();
|
||||
var folders = folderDao.GetFolders(foldersId.ToArray());
|
||||
var folders = folderDao.GetFolders(foldersId);
|
||||
|
||||
foreach (var folder in folders)
|
||||
{
|
||||
@ -2062,7 +2060,7 @@ namespace ASC.Web.Files.Services.WCFService
|
||||
}
|
||||
|
||||
var fileDao = GetFileDao();
|
||||
var files = fileDao.GetFiles(filesId.ToArray());
|
||||
var files = fileDao.GetFiles(filesId);
|
||||
|
||||
foreach (var file in files)
|
||||
{
|
||||
@ -2103,7 +2101,7 @@ namespace ASC.Web.Files.Services.WCFService
|
||||
entries.Add(newFile);
|
||||
}
|
||||
|
||||
return new ItemList<FileEntry<T>>(entries);
|
||||
return entries;
|
||||
}
|
||||
|
||||
public bool StoreOriginal(bool set)
|
||||
@ -2224,18 +2222,6 @@ namespace ASC.Web.Files.Services.WCFService
|
||||
return DaoFactory.GetSecurityDao<T>();
|
||||
}
|
||||
|
||||
private static void ParseArrayItems(IEnumerable<string> data, out List<T> foldersId, out List<T> filesId)
|
||||
{
|
||||
//TODO:!!!!Fix
|
||||
foldersId = new List<T>();
|
||||
filesId = new List<T>();
|
||||
foreach (var id in data)
|
||||
{
|
||||
if (id.StartsWith("file_")) filesId.Add((T)Convert.ChangeType(id.Substring("file_".Length), typeof(T)));
|
||||
if (id.StartsWith("folder_")) foldersId.Add((T)Convert.ChangeType(id.Substring("folder_".Length), typeof(T)));
|
||||
}
|
||||
}
|
||||
|
||||
private static void ErrorIf(bool condition, string errorMessage)
|
||||
{
|
||||
if (condition) throw new InvalidOperationException(errorMessage);
|
||||
|
||||
@ -110,6 +110,11 @@ namespace ASC.Files.Core.Security
|
||||
public List<Tuple<FileEntry<T>, bool>> CanRead<T>(IEnumerable<FileEntry<T>> entry, Guid userId)
|
||||
{
|
||||
return Can(entry, userId, FilesSecurityActions.Read);
|
||||
}
|
||||
|
||||
public List<Tuple<FileEntry<T>, bool>> CanRead<T>(IEnumerable<FileEntry<T>> entry)
|
||||
{
|
||||
return Can(entry, AuthContext.CurrentAccount.ID, FilesSecurityActions.Read);
|
||||
}
|
||||
|
||||
public bool CanRead<T>(FileEntry<T> entry, Guid userId)
|
||||
@ -574,8 +579,8 @@ namespace ASC.Files.Core.Security
|
||||
var folderDao = daoFactory.GetFolderDao<T>();
|
||||
var filteredEntries = entries.Where(filter).ToList();
|
||||
var roots = filteredEntries
|
||||
.Select(r => r.RootFolderId)
|
||||
.ToArray();
|
||||
.Select(r => r.RootFolderId)
|
||||
.ToList();
|
||||
|
||||
var rootsFolders = folderDao.GetFolders(roots);
|
||||
var bunches = folderDao.GetBunchObjectIDs(rootsFolders.Select(r => r.ID).ToList());
|
||||
@ -756,7 +761,7 @@ namespace ASC.Files.Core.Security
|
||||
|
||||
if (filterType == FilterType.None || filterType == FilterType.FoldersOnly)
|
||||
{
|
||||
var folders = folderDao.GetFolders(folderIds.Keys.ToArray(), filterType, subjectGroup, subjectID, searchText, withSubfolders, false);
|
||||
var folders = folderDao.GetFolders(folderIds.Keys, filterType, subjectGroup, subjectID, searchText, withSubfolders, false);
|
||||
|
||||
if (withSubfolders)
|
||||
{
|
||||
@ -776,7 +781,7 @@ namespace ASC.Files.Core.Security
|
||||
|
||||
if (filterType != FilterType.FoldersOnly && withSubfolders)
|
||||
{
|
||||
var filesInSharedFolders = fileDao.GetFiles(folderIds.Keys.ToArray(), filterType, subjectGroup, subjectID, searchText, searchInContent);
|
||||
var filesInSharedFolders = fileDao.GetFiles(folderIds.Keys, filterType, subjectGroup, subjectID, searchText, searchInContent);
|
||||
filesInSharedFolders = FilterRead(filesInSharedFolders).ToList();
|
||||
entries.AddRange(filesInSharedFolders);
|
||||
entries = entries.Distinct().ToList();
|
||||
@ -875,7 +880,7 @@ namespace ASC.Files.Core.Security
|
||||
|
||||
if (filterType == FilterType.None || filterType == FilterType.FoldersOnly)
|
||||
{
|
||||
var folders = folderDao.GetFolders(folderIds.Keys.ToArray(), filterType, subjectGroup, subjectID, searchText, withSubfolders, false);
|
||||
var folders = folderDao.GetFolders(folderIds.Keys, filterType, subjectGroup, subjectID, searchText, withSubfolders, false);
|
||||
|
||||
if (withSubfolders)
|
||||
{
|
||||
@ -895,7 +900,7 @@ namespace ASC.Files.Core.Security
|
||||
|
||||
if (filterType != FilterType.FoldersOnly && withSubfolders)
|
||||
{
|
||||
var filesInSharedFolders = fileDao.GetFiles(folderIds.Keys.ToArray(), filterType, subjectGroup, subjectID, searchText, searchInContent);
|
||||
var filesInSharedFolders = fileDao.GetFiles(folderIds.Keys, filterType, subjectGroup, subjectID, searchText, searchInContent);
|
||||
filesInSharedFolders = FilterRead(filesInSharedFolders).ToList();
|
||||
entries.AddRange(filesInSharedFolders);
|
||||
entries = entries.Distinct().ToList();
|
||||
|
||||
@ -128,7 +128,7 @@ namespace ASC.Files.Thirdparty.Box
|
||||
var folder = GetFolder();
|
||||
|
||||
folder.ID = MakeId(boxFolder.Id);
|
||||
folder.ParentFolderID = isRoot ? null : MakeId(GetParentFolderId(boxFolder));
|
||||
folder.FolderID = isRoot ? null : MakeId(GetParentFolderId(boxFolder));
|
||||
folder.CreateOn = isRoot ? ProviderInfo.CreateOn : (boxFolder.CreatedAt ?? default);
|
||||
folder.ModifiedOn = isRoot ? ProviderInfo.CreateOn : (boxFolder.ModifiedAt ?? default);
|
||||
|
||||
|
||||
@ -108,15 +108,15 @@ namespace ASC.Files.Thirdparty.Box
|
||||
return new List<File<string>> { GetFile(fileId) };
|
||||
}
|
||||
|
||||
public List<File<string>> GetFiles(string[] fileIds)
|
||||
public List<File<string>> GetFiles(IEnumerable<string> fileIds)
|
||||
{
|
||||
if (fileIds == null || fileIds.Length == 0) return new List<File<string>>();
|
||||
if (fileIds == null || !fileIds.Any()) return new List<File<string>>();
|
||||
return fileIds.Select(GetBoxFile).Select(ToFile).ToList();
|
||||
}
|
||||
|
||||
public List<File<string>> GetFilesFiltered(string[] fileIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent)
|
||||
public List<File<string>> GetFilesFiltered(IEnumerable<string> fileIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent)
|
||||
{
|
||||
if (fileIds == null || fileIds.Length == 0 || filterType == FilterType.FoldersOnly) return new List<File<string>>();
|
||||
if (fileIds == null || !fileIds.Any() || filterType == FilterType.FoldersOnly) return new List<File<string>>();
|
||||
|
||||
var files = GetFiles(fileIds).AsEnumerable();
|
||||
|
||||
|
||||
@ -130,7 +130,7 @@ namespace ASC.Files.Thirdparty.Box
|
||||
return folders.ToList();
|
||||
}
|
||||
|
||||
public List<Folder<string>> GetFolders(string[] folderIds, FilterType filterType = FilterType.None, bool subjectGroup = false, Guid? subjectID = null, string searchText = "", bool searchSubfolders = false, bool checkShare = true)
|
||||
public List<Folder<string>> GetFolders(IEnumerable<string> folderIds, FilterType filterType = FilterType.None, bool subjectGroup = false, Guid? subjectID = null, string searchText = "", bool searchSubfolders = false, bool checkShare = true)
|
||||
{
|
||||
if (filterType == FilterType.FilesOnly || filterType == FilterType.ByExtension
|
||||
|| filterType == FilterType.DocumentsOnly || filterType == FilterType.ImagesOnly
|
||||
@ -184,9 +184,9 @@ namespace ASC.Files.Thirdparty.Box
|
||||
return RenameFolder(folder, folder.Title);
|
||||
}
|
||||
|
||||
if (folder.ParentFolderID != null)
|
||||
if (folder.FolderID != null)
|
||||
{
|
||||
var boxFolderId = MakeBoxId(folder.ParentFolderID);
|
||||
var boxFolderId = MakeBoxId(folder.FolderID);
|
||||
|
||||
folder.Title = GetAvailableTitle(folder.Title, boxFolderId, IsExist);
|
||||
|
||||
|
||||
@ -111,7 +111,7 @@ namespace ASC.Files.Core.Thirdparty
|
||||
|
||||
var toFolder1 = ServiceProvider.GetService<Folder<TTo>>();
|
||||
toFolder1.Title = fromFolder.Title;
|
||||
toFolder1.ParentFolderID = toConverter(toRootFolderId);
|
||||
toFolder1.FolderID = toConverter(toRootFolderId);
|
||||
|
||||
var toFolder = toFolderDao.GetFolder(fromFolder.Title, toConverter(toRootFolderId));
|
||||
var toFolderId = toFolder != null
|
||||
|
||||
@ -123,7 +123,7 @@ namespace ASC.Files.Thirdparty.Dropbox
|
||||
var folder = GetFolder();
|
||||
|
||||
folder.ID = MakeId(dropboxFolder);
|
||||
folder.ParentFolderID = isRoot ? null : MakeId(GetParentFolderPath(dropboxFolder));
|
||||
folder.FolderID = isRoot ? null : MakeId(GetParentFolderPath(dropboxFolder));
|
||||
folder.CreateOn = isRoot ? ProviderInfo.CreateOn : default;
|
||||
folder.ModifiedOn = isRoot ? ProviderInfo.CreateOn : default;
|
||||
folder.Title = MakeFolderTitle(dropboxFolder);
|
||||
|
||||
@ -112,15 +112,15 @@ namespace ASC.Files.Thirdparty.Dropbox
|
||||
return new List<File<string>> { GetFile(fileId) };
|
||||
}
|
||||
|
||||
public List<File<string>> GetFiles(string[] fileIds)
|
||||
public List<File<string>> GetFiles(IEnumerable<string> fileIds)
|
||||
{
|
||||
if (fileIds == null || fileIds.Length == 0) return new List<File<string>>();
|
||||
if (fileIds == null || !fileIds.Any()) return new List<File<string>>();
|
||||
return fileIds.Select(GetDropboxFile).Select(ToFile).ToList();
|
||||
}
|
||||
|
||||
public List<File<string>> GetFilesFiltered(string[] fileIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent)
|
||||
public List<File<string>> GetFilesFiltered(IEnumerable<string> fileIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent)
|
||||
{
|
||||
if (fileIds == null || fileIds.Length == 0 || filterType == FilterType.FoldersOnly) return new List<File<string>>();
|
||||
if (fileIds == null || !fileIds.Any() || filterType == FilterType.FoldersOnly) return new List<File<string>>();
|
||||
|
||||
var files = GetFiles(fileIds).AsEnumerable();
|
||||
|
||||
|
||||
@ -131,7 +131,7 @@ namespace ASC.Files.Thirdparty.Dropbox
|
||||
return folders.ToList();
|
||||
}
|
||||
|
||||
public List<Folder<string>> GetFolders(string[] folderIds, FilterType filterType = FilterType.None, bool subjectGroup = false, Guid? subjectID = null, string searchText = "", bool searchSubfolders = false, bool checkShare = true)
|
||||
public List<Folder<string>> GetFolders(IEnumerable<string> folderIds, FilterType filterType = FilterType.None, bool subjectGroup = false, Guid? subjectID = null, string searchText = "", bool searchSubfolders = false, bool checkShare = true)
|
||||
{
|
||||
if (filterType == FilterType.FilesOnly || filterType == FilterType.ByExtension
|
||||
|| filterType == FilterType.DocumentsOnly || filterType == FilterType.ImagesOnly
|
||||
@ -185,9 +185,9 @@ namespace ASC.Files.Thirdparty.Dropbox
|
||||
return RenameFolder(folder, folder.Title);
|
||||
}
|
||||
|
||||
if (folder.ParentFolderID != null)
|
||||
if (folder.FolderID != null)
|
||||
{
|
||||
var dropboxFolderPath = MakeDropboxPath(folder.ParentFolderID);
|
||||
var dropboxFolderPath = MakeDropboxPath(folder.FolderID);
|
||||
|
||||
folder.Title = GetAvailableTitle(folder.Title, dropboxFolderPath, IsExist);
|
||||
|
||||
|
||||
@ -137,7 +137,7 @@ namespace ASC.Files.Thirdparty.GoogleDrive
|
||||
var folder = GetFolder();
|
||||
|
||||
folder.ID = MakeId(driveEntry);
|
||||
folder.ParentFolderID = isRoot ? null : MakeId(GetParentDriveId(driveEntry));
|
||||
folder.FolderID = isRoot ? null : MakeId(GetParentDriveId(driveEntry));
|
||||
folder.CreateOn = isRoot ? ProviderInfo.CreateOn : (driveEntry.CreatedTime ?? default);
|
||||
folder.ModifiedOn = isRoot ? ProviderInfo.CreateOn : (driveEntry.ModifiedTime ?? default);
|
||||
|
||||
|
||||
@ -109,15 +109,15 @@ namespace ASC.Files.Thirdparty.GoogleDrive
|
||||
return new List<File<string>> { GetFile(fileId) };
|
||||
}
|
||||
|
||||
public List<File<string>> GetFiles(string[] fileIds)
|
||||
public List<File<string>> GetFiles(IEnumerable<string> fileIds)
|
||||
{
|
||||
if (fileIds == null || fileIds.Length == 0) return new List<File<string>>();
|
||||
if (fileIds == null || !fileIds.Any()) return new List<File<string>>();
|
||||
return fileIds.Select(GetDriveEntry).Select(ToFile).ToList();
|
||||
}
|
||||
|
||||
public List<File<string>> GetFilesFiltered(string[] fileIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent)
|
||||
public List<File<string>> GetFilesFiltered(IEnumerable<string> fileIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent)
|
||||
{
|
||||
if (fileIds == null || fileIds.Length == 0 || filterType == FilterType.FoldersOnly) return new List<File<string>>();
|
||||
if (fileIds == null || !fileIds.Any() || filterType == FilterType.FoldersOnly) return new List<File<string>>();
|
||||
|
||||
var files = GetFiles(fileIds).AsEnumerable();
|
||||
|
||||
|
||||
@ -127,7 +127,7 @@ namespace ASC.Files.Thirdparty.GoogleDrive
|
||||
return folders.ToList();
|
||||
}
|
||||
|
||||
public List<Folder<string>> GetFolders(string[] folderIds, FilterType filterType = FilterType.None, bool subjectGroup = false, Guid? subjectID = null, string searchText = "", bool searchSubfolders = false, bool checkShare = true)
|
||||
public List<Folder<string>> GetFolders(IEnumerable<string> folderIds, FilterType filterType = FilterType.None, bool subjectGroup = false, Guid? subjectID = null, string searchText = "", bool searchSubfolders = false, bool checkShare = true)
|
||||
{
|
||||
if (filterType == FilterType.FilesOnly || filterType == FilterType.ByExtension
|
||||
|| filterType == FilterType.DocumentsOnly || filterType == FilterType.ImagesOnly
|
||||
@ -181,9 +181,9 @@ namespace ASC.Files.Thirdparty.GoogleDrive
|
||||
return RenameFolder(folder, folder.Title);
|
||||
}
|
||||
|
||||
if (folder.ParentFolderID != null)
|
||||
if (folder.FolderID != null)
|
||||
{
|
||||
var driveFolderId = MakeDriveId(folder.ParentFolderID);
|
||||
var driveFolderId = MakeDriveId(folder.FolderID);
|
||||
|
||||
var driveFolder = ProviderInfo.Storage.InsertEntry(null, folder.Title, driveFolderId, true);
|
||||
|
||||
|
||||
@ -34,7 +34,7 @@ namespace ASC.Files.Thirdparty
|
||||
{
|
||||
}
|
||||
|
||||
public List<File<string>> GetFiles(string[] parentIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent)
|
||||
public List<File<string>> GetFiles(IEnumerable<string> parentIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent)
|
||||
{
|
||||
return new List<File<string>>();
|
||||
}
|
||||
@ -280,7 +280,7 @@ namespace ASC.Files.Thirdparty
|
||||
|
||||
InitFileEntryError(folder, entry);
|
||||
|
||||
folder.ParentFolderID = null;
|
||||
folder.FolderID = null;
|
||||
|
||||
return folder;
|
||||
}
|
||||
|
||||
@ -123,7 +123,7 @@ namespace ASC.Files.Thirdparty.OneDrive
|
||||
var folder = GetFolder();
|
||||
|
||||
folder.ID = MakeId(isRoot ? string.Empty : onedriveFolder.Id);
|
||||
folder.ParentFolderID = isRoot ? null : MakeId(GetParentFolderId(onedriveFolder));
|
||||
folder.FolderID = isRoot ? null : MakeId(GetParentFolderId(onedriveFolder));
|
||||
folder.CreateOn = isRoot ? ProviderInfo.CreateOn : (onedriveFolder.CreatedDateTime.HasValue ? TenantUtil.DateTimeFromUtc(onedriveFolder.CreatedDateTime.Value.DateTime) : default);
|
||||
folder.ModifiedOn = isRoot ? ProviderInfo.CreateOn : (onedriveFolder.LastModifiedDateTime.HasValue ? TenantUtil.DateTimeFromUtc(onedriveFolder.LastModifiedDateTime.Value.DateTime) : default);
|
||||
|
||||
|
||||
@ -108,15 +108,15 @@ namespace ASC.Files.Thirdparty.OneDrive
|
||||
return new List<File<string>> { GetFile(fileId) };
|
||||
}
|
||||
|
||||
public List<File<string>> GetFiles(string[] fileIds)
|
||||
public List<File<string>> GetFiles(IEnumerable<string> fileIds)
|
||||
{
|
||||
if (fileIds == null || fileIds.Length == 0) return new List<File<string>>();
|
||||
if (fileIds == null || !fileIds.Any()) return new List<File<string>>();
|
||||
return fileIds.Select(GetOneDriveItem).Select(ToFile).ToList();
|
||||
}
|
||||
|
||||
public List<File<string>> GetFilesFiltered(string[] fileIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent)
|
||||
public List<File<string>> GetFilesFiltered(IEnumerable<string> fileIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent)
|
||||
{
|
||||
if (fileIds == null || fileIds.Length == 0 || filterType == FilterType.FoldersOnly) return new List<File<string>>();
|
||||
if (fileIds == null || !fileIds.Any() || filterType == FilterType.FoldersOnly) return new List<File<string>>();
|
||||
|
||||
var files = GetFiles(fileIds).AsEnumerable();
|
||||
|
||||
|
||||
@ -127,7 +127,7 @@ namespace ASC.Files.Thirdparty.OneDrive
|
||||
return folders.ToList();
|
||||
}
|
||||
|
||||
public List<Folder<string>> GetFolders(string[] folderIds, FilterType filterType = FilterType.None, bool subjectGroup = false, Guid? subjectID = null, string searchText = "", bool searchSubfolders = false, bool checkShare = true)
|
||||
public List<Folder<string>> GetFolders(IEnumerable<string> folderIds, FilterType filterType = FilterType.None, bool subjectGroup = false, Guid? subjectID = null, string searchText = "", bool searchSubfolders = false, bool checkShare = true)
|
||||
{
|
||||
if (filterType == FilterType.FilesOnly || filterType == FilterType.ByExtension
|
||||
|| filterType == FilterType.DocumentsOnly || filterType == FilterType.ImagesOnly
|
||||
@ -181,9 +181,9 @@ namespace ASC.Files.Thirdparty.OneDrive
|
||||
return RenameFolder(folder, folder.Title);
|
||||
}
|
||||
|
||||
if (folder.ParentFolderID != null)
|
||||
if (folder.FolderID != null)
|
||||
{
|
||||
var onedriveFolderId = MakeOneDriveId(folder.ParentFolderID);
|
||||
var onedriveFolderId = MakeOneDriveId(folder.FolderID);
|
||||
|
||||
folder.Title = GetAvailableTitle(folder.Title, onedriveFolderId, IsExist);
|
||||
|
||||
|
||||
@ -124,7 +124,7 @@ namespace ASC.Files.Thirdparty.ProviderDao
|
||||
return fileDao.GetFileHistory(selector.ConvertId(fileId));
|
||||
}
|
||||
|
||||
public List<File<string>> GetFiles(string[] fileIds)
|
||||
public List<File<string>> GetFiles(IEnumerable<string> fileIds)
|
||||
{
|
||||
var result = Enumerable.Empty<File<string>>();
|
||||
|
||||
@ -139,7 +139,7 @@ namespace ASC.Files.Thirdparty.ProviderDao
|
||||
.SelectMany(matchedId =>
|
||||
{
|
||||
var fileDao = selectorLocal.GetFileDao(matchedId.FirstOrDefault());
|
||||
return fileDao.GetFiles(matchedId.Select(selectorLocal.ConvertId).ToArray());
|
||||
return fileDao.GetFiles(matchedId.Select(selectorLocal.ConvertId).ToList());
|
||||
}
|
||||
)
|
||||
.Where(r => r != null));
|
||||
@ -148,7 +148,7 @@ namespace ASC.Files.Thirdparty.ProviderDao
|
||||
return result.ToList();
|
||||
}
|
||||
|
||||
public List<File<string>> GetFilesFiltered(string[] fileIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent)
|
||||
public List<File<string>> GetFilesFiltered(IEnumerable<string> fileIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent)
|
||||
{
|
||||
var result = Enumerable.Empty<File<string>>();
|
||||
|
||||
|
||||
@ -110,7 +110,7 @@ namespace ASC.Files.Thirdparty.ProviderDao
|
||||
return result;
|
||||
}
|
||||
|
||||
public List<Folder<string>> GetFolders(string[] folderIds, FilterType filterType = FilterType.None, bool subjectGroup = false, Guid? subjectID = null, string searchText = "", bool searchSubfolders = false, bool checkShare = true)
|
||||
public List<Folder<string>> GetFolders(IEnumerable<string> folderIds, FilterType filterType = FilterType.None, bool subjectGroup = false, Guid? subjectID = null, string searchText = "", bool searchSubfolders = false, bool checkShare = true)
|
||||
{
|
||||
var result = Enumerable.Empty<Folder<string>>();
|
||||
|
||||
@ -126,7 +126,7 @@ namespace ASC.Files.Thirdparty.ProviderDao
|
||||
{
|
||||
var folderDao = selectorLocal.GetFolderDao(matchedId.FirstOrDefault());
|
||||
return folderDao
|
||||
.GetFolders(matchedId.Select(selectorLocal.ConvertId).ToArray(),
|
||||
.GetFolders(matchedId.Select(selectorLocal.ConvertId).ToList(),
|
||||
filterType, subjectGroup, subjectID, searchText, searchSubfolders, checkShare);
|
||||
})
|
||||
.Where(r => r != null));
|
||||
@ -156,14 +156,14 @@ filterType, subjectGroup, subjectID, searchText, searchSubfolders, checkShare);
|
||||
folder.ID = folderId;
|
||||
return newFolderId;
|
||||
}
|
||||
if (folder.ParentFolderID != null)
|
||||
if (folder.FolderID != null)
|
||||
{
|
||||
var folderId = folder.ParentFolderID;
|
||||
var folderId = folder.FolderID;
|
||||
var selector = GetSelector(folderId);
|
||||
folder.ParentFolderID = selector.ConvertId(folderId);
|
||||
folder.FolderID = selector.ConvertId(folderId);
|
||||
var folderDao = selector.GetFolderDao(folderId);
|
||||
var newFolderId = folderDao.SaveFolder(folder);
|
||||
folder.ParentFolderID = folderId;
|
||||
folder.FolderID = folderId;
|
||||
return newFolderId;
|
||||
|
||||
}
|
||||
@ -277,7 +277,7 @@ filterType, subjectGroup, subjectID, searchText, searchSubfolders, checkShare);
|
||||
var folderId = folder.ID;
|
||||
var selector = GetSelector(folderId);
|
||||
folder.ID = selector.ConvertId(folderId);
|
||||
folder.ParentFolderID = selector.ConvertId(folder.ParentFolderID);
|
||||
folder.FolderID = selector.ConvertId(folder.FolderID);
|
||||
var folderDao = selector.GetFolderDao(folderId);
|
||||
return folderDao.RenameFolder(folder, newTitle);
|
||||
}
|
||||
|
||||
@ -101,14 +101,14 @@ namespace ASC.Files.Thirdparty.SharePoint
|
||||
return new List<File<string>> { GetFile(fileId) };
|
||||
}
|
||||
|
||||
public List<File<string>> GetFiles(string[] fileIds)
|
||||
public List<File<string>> GetFiles(IEnumerable<string> fileIds)
|
||||
{
|
||||
return fileIds.Select(fileId => ProviderInfo.ToFile(ProviderInfo.GetFileById(fileId))).ToList();
|
||||
}
|
||||
|
||||
public List<File<string>> GetFilesFiltered(string[] fileIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent)
|
||||
public List<File<string>> GetFilesFiltered(IEnumerable<string> fileIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent)
|
||||
{
|
||||
if (fileIds == null || fileIds.Length == 0 || filterType == FilterType.FoldersOnly) return new List<File<string>>();
|
||||
if (fileIds == null || !fileIds.Any() || filterType == FilterType.FoldersOnly) return new List<File<string>>();
|
||||
|
||||
var files = GetFiles(fileIds).AsEnumerable();
|
||||
|
||||
|
||||
@ -135,7 +135,7 @@ namespace ASC.Files.Thirdparty.SharePoint
|
||||
return folders.ToList();
|
||||
}
|
||||
|
||||
public List<Folder<string>> GetFolders(string[] folderIds, FilterType filterType = FilterType.None, bool subjectGroup = false, Guid? subjectID = null, string searchText = "", bool searchSubfolders = false, bool checkShare = true)
|
||||
public List<Folder<string>> GetFolders(IEnumerable<string> folderIds, FilterType filterType = FilterType.None, bool subjectGroup = false, Guid? subjectID = null, string searchText = "", bool searchSubfolders = false, bool checkShare = true)
|
||||
{
|
||||
if (filterType == FilterType.FilesOnly || filterType == FilterType.ByExtension
|
||||
|| filterType == FilterType.DocumentsOnly || filterType == FilterType.ImagesOnly
|
||||
@ -183,9 +183,9 @@ namespace ASC.Files.Thirdparty.SharePoint
|
||||
return ProviderInfo.ToFolder(savedfolder).ID;
|
||||
}
|
||||
|
||||
if (folder.ParentFolderID != null)
|
||||
if (folder.FolderID != null)
|
||||
{
|
||||
var parentFolder = ProviderInfo.GetFolderById(folder.ParentFolderID);
|
||||
var parentFolder = ProviderInfo.GetFolderById(folder.FolderID);
|
||||
|
||||
folder.Title = GetAvailableTitle(folder.Title, parentFolder, IsExist);
|
||||
|
||||
|
||||
@ -500,7 +500,7 @@ namespace ASC.Files.Thirdparty.SharePoint
|
||||
if (folder is SharePointFolderErrorEntry errorFolder)
|
||||
{
|
||||
result.ID = MakeId(errorFolder.ID);
|
||||
result.ParentFolderID = null;
|
||||
result.FolderID = null;
|
||||
result.CreateBy = Owner;
|
||||
result.CreateOn = DateTime.UtcNow;
|
||||
result.FolderType = FolderType.DEFAULT;
|
||||
@ -523,7 +523,7 @@ namespace ASC.Files.Thirdparty.SharePoint
|
||||
var isRoot = folder.ServerRelativeUrl == SpRootFolderId;
|
||||
|
||||
result.ID = MakeId(isRoot ? "" : folder.ServerRelativeUrl);
|
||||
result.ParentFolderID = isRoot ? null : MakeId(GetParentFolderId(folder.ServerRelativeUrl));
|
||||
result.FolderID = isRoot ? null : MakeId(GetParentFolderId(folder.ServerRelativeUrl));
|
||||
result.CreateBy = Owner;
|
||||
result.CreateOn = CreateOn;
|
||||
result.FolderType = FolderType.DEFAULT;
|
||||
|
||||
@ -281,7 +281,7 @@ namespace ASC.Files.Thirdparty.Sharpbox
|
||||
var folder = GetFolder();
|
||||
|
||||
folder.ID = MakeId(fsEntry);
|
||||
folder.ParentFolderID = isRoot ? null : MakeId(fsEntry.Parent);
|
||||
folder.FolderID = isRoot ? null : MakeId(fsEntry.Parent);
|
||||
folder.CreateOn = isRoot ? ProviderInfo.CreateOn : fsEntry.Modified;
|
||||
folder.ModifiedOn = isRoot ? ProviderInfo.CreateOn : fsEntry.Modified;
|
||||
folder.RootFolderId = MakeId(RootFolder());
|
||||
|
||||
@ -106,14 +106,14 @@ namespace ASC.Files.Thirdparty.Sharpbox
|
||||
return new List<File<string>> { GetFile(fileId) };
|
||||
}
|
||||
|
||||
public List<File<string>> GetFiles(string[] fileIds)
|
||||
public List<File<string>> GetFiles(IEnumerable<string> fileIds)
|
||||
{
|
||||
return fileIds.Select(fileId => ToFile(GetFileById(fileId))).ToList();
|
||||
}
|
||||
|
||||
public List<File<string>> GetFilesFiltered(string[] fileIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent)
|
||||
public List<File<string>> GetFilesFiltered(IEnumerable<string> fileIds, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent)
|
||||
{
|
||||
if (fileIds == null || fileIds.Length == 0 || filterType == FilterType.FoldersOnly) return new List<File<string>>();
|
||||
if (fileIds == null || !fileIds.Any() || filterType == FilterType.FoldersOnly) return new List<File<string>>();
|
||||
|
||||
var files = GetFiles(fileIds).AsEnumerable();
|
||||
|
||||
|
||||
@ -138,7 +138,7 @@ namespace ASC.Files.Thirdparty.Sharpbox
|
||||
return folders.ToList();
|
||||
}
|
||||
|
||||
public List<Folder<string>> GetFolders(string[] folderIds, FilterType filterType = FilterType.None, bool subjectGroup = false, Guid? subjectID = null, string searchText = "", bool searchSubfolders = false, bool checkShare = true)
|
||||
public List<Folder<string>> GetFolders(IEnumerable<string> folderIds, FilterType filterType = FilterType.None, bool subjectGroup = false, Guid? subjectID = null, string searchText = "", bool searchSubfolders = false, bool checkShare = true)
|
||||
{
|
||||
if (filterType == FilterType.FilesOnly || filterType == FilterType.ByExtension
|
||||
|| filterType == FilterType.DocumentsOnly || filterType == FilterType.ImagesOnly
|
||||
@ -186,9 +186,9 @@ namespace ASC.Files.Thirdparty.Sharpbox
|
||||
var savedfolder = ProviderInfo.Storage.CreateFolder(MakePath(folder.ID));
|
||||
return MakeId(savedfolder);
|
||||
}
|
||||
if (folder.ParentFolderID != null)
|
||||
if (folder.FolderID != null)
|
||||
{
|
||||
var parentFolder = GetFolderById(folder.ParentFolderID);
|
||||
var parentFolder = GetFolderById(folder.FolderID);
|
||||
|
||||
folder.Title = GetAvailableTitle(folder.Title, parentFolder, IsExist);
|
||||
|
||||
@ -390,7 +390,7 @@ namespace ASC.Files.Thirdparty.Sharpbox
|
||||
}
|
||||
else
|
||||
{
|
||||
var parentFolder = GetFolderById(folder.ParentFolderID);
|
||||
var parentFolder = GetFolderById(folder.FolderID);
|
||||
newTitle = GetAvailableTitle(newTitle, parentFolder, IsExist);
|
||||
|
||||
//rename folder
|
||||
|
||||
@ -566,7 +566,7 @@ namespace ASC.Web.Files.Classes
|
||||
{
|
||||
var folder = ServiceProvider.GetService<Folder<T>>();
|
||||
folder.Title = folderName;
|
||||
folder.ParentFolderID = folderId;
|
||||
folder.FolderID = folderId;
|
||||
|
||||
var subFolderId = folderDao.SaveFolder(folder);
|
||||
|
||||
|
||||
12
products/ASC.Files/Core/Model/ChangeOwnerModel.cs
Normal file
12
products/ASC.Files/Core/Model/ChangeOwnerModel.cs
Normal file
@ -0,0 +1,12 @@
|
||||
using System;
|
||||
using System.Text.Json;
|
||||
|
||||
using ASC.Files.Model;
|
||||
|
||||
namespace ASC.Files.Core.Model
|
||||
{
|
||||
public class ChangeOwnerModel: BaseBatchModel<JsonElement>
|
||||
{
|
||||
public Guid UserId { get; set; }
|
||||
}
|
||||
}
|
||||
@ -198,16 +198,16 @@ namespace ASC.Api.Documents
|
||||
IEnumerable<FileEntryWrapper> GetFolders<T>(IEnumerable<T> folders)
|
||||
{
|
||||
var folderDao = DaoFactory.GetFolderDao<T>();
|
||||
return folderDao.GetFolders(folders.ToArray())
|
||||
.Select(FolderWrapperHelper.Get)
|
||||
return folderDao.GetFolders(folders)
|
||||
.Select(r => FolderWrapperHelper.Get(r))
|
||||
.Cast<FileEntryWrapper>();
|
||||
}
|
||||
|
||||
IEnumerable<FileEntryWrapper> GetFiles<T>(IEnumerable<T> files)
|
||||
{
|
||||
var fileDao = DaoFactory.GetFileDao<T>();
|
||||
return fileDao.GetFiles(files.ToArray())
|
||||
.Select(FilesWrapperHelper.Get)
|
||||
return fileDao.GetFiles(files)
|
||||
.Select(r => FilesWrapperHelper.Get(r))
|
||||
.Cast<FileEntryWrapper>();
|
||||
}
|
||||
}
|
||||
|
||||
@ -25,8 +25,10 @@
|
||||
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
|
||||
using System.Linq;
|
||||
|
||||
using ASC.Api.Core;
|
||||
using ASC.Api.Utils;
|
||||
using ASC.Common;
|
||||
@ -171,47 +173,68 @@ namespace ASC.Api.Documents
|
||||
FileUtility = fileUtility;
|
||||
}
|
||||
|
||||
public FileWrapper<T> Get<T>(File<T> file)
|
||||
public FileWrapper<T> Get<T>(File<T> file, List<Tuple<FileEntry<T>, bool>> folders = null)
|
||||
{
|
||||
var result = Get<FileWrapper<T>, T>(file);
|
||||
var result = GetFileWrapper(file);
|
||||
|
||||
result.FolderId = file.FolderID;
|
||||
if (file.RootFolderType == FolderType.USER
|
||||
&& !Equals(file.RootFolderCreator, AuthContext.CurrentAccount.ID))
|
||||
{
|
||||
result.RootFolderType = FolderType.SHARE;
|
||||
var folderDao = DaoFactory.GetFolderDao<T>();
|
||||
var parentFolder = folderDao.GetFolder(file.FolderID);
|
||||
if (!FileSecurity.CanRead(parentFolder))
|
||||
{
|
||||
result.FolderId = GlobalFolderHelper.GetFolderShare<T>();
|
||||
var folderDao = DaoFactory.GetFolderDao<T>();
|
||||
FileEntry<T> parentFolder;
|
||||
|
||||
if(folders != null)
|
||||
{
|
||||
var folderWithRight = folders.FirstOrDefault(f => f.Item1.ID.Equals(file.FolderID));
|
||||
if (folderWithRight == null || !folderWithRight.Item2)
|
||||
{
|
||||
result.FolderId = GlobalFolderHelper.GetFolderShare<T>();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
parentFolder = folderDao.GetFolder(file.FolderID);
|
||||
if (!FileSecurity.CanRead(parentFolder))
|
||||
{
|
||||
result.FolderId = GlobalFolderHelper.GetFolderShare<T>();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
result.FileExst = FileUtility.GetFileExtension(file.Title);
|
||||
result.FileType = FileUtility.GetFileTypeByExtention(result.FileExst);
|
||||
|
||||
result.Version = file.Version;
|
||||
result.VersionGroup = file.VersionGroup;
|
||||
result.ContentLength = file.ContentLengthString;
|
||||
result.FileStatus = file.FileStatus;
|
||||
result.PureContentLength = file.ContentLength.NullIfDefault();
|
||||
result.Comment = file.Comment;
|
||||
return result;
|
||||
}
|
||||
|
||||
private FileWrapper<T> GetFileWrapper<T>(File<T> file)
|
||||
{
|
||||
var result = Get<FileWrapper<T>, T>(file);
|
||||
|
||||
result.FileExst = FileUtility.GetFileExtension(file.Title);
|
||||
result.FileType = FileUtility.GetFileTypeByExtention(result.FileExst);
|
||||
result.Version = file.Version;
|
||||
result.VersionGroup = file.VersionGroup;
|
||||
result.ContentLength = file.ContentLengthString;
|
||||
result.FileStatus = file.FileStatus;
|
||||
result.PureContentLength = file.ContentLength.NullIfDefault();
|
||||
result.Comment = file.Comment;
|
||||
result.Encrypted = file.Encrypted.NullIfDefault();
|
||||
result.Locked = file.Locked.NullIfDefault();
|
||||
result.LockedBy = file.LockedBy;
|
||||
|
||||
try
|
||||
{
|
||||
result.ViewUrl = CommonLinkUtility.GetFullAbsolutePath(file.DownloadUrl);
|
||||
|
||||
result.WebUrl = CommonLinkUtility.GetFullAbsolutePath(FilesLinkUtility.GetFileWebPreviewUrl(FileUtility, file.Title, file.ID));
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
//Don't catch anything here because of httpcontext
|
||||
}
|
||||
|
||||
return result;
|
||||
|
||||
try
|
||||
{
|
||||
result.ViewUrl = CommonLinkUtility.GetFullAbsolutePath(file.DownloadUrl);
|
||||
|
||||
result.WebUrl = CommonLinkUtility.GetFullAbsolutePath(FilesLinkUtility.GetFileWebPreviewUrl(FileUtility, file.Title, file.ID));
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
//Don't catch anything here because of httpcontext
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -32,6 +32,7 @@ using System.Text.Json.Serialization;
|
||||
|
||||
using ASC.Common;
|
||||
using ASC.Files.Core;
|
||||
using ASC.Files.Core.Security;
|
||||
using ASC.Web.Files.Services.WCFService;
|
||||
|
||||
namespace ASC.Api.Documents
|
||||
@ -104,20 +105,29 @@ namespace ASC.Api.Documents
|
||||
|
||||
[Scope]
|
||||
public class FolderContentWrapperHelper
|
||||
{
|
||||
{
|
||||
private FileSecurity FileSecurity { get; }
|
||||
private IDaoFactory DaoFactory { get; }
|
||||
private FileWrapperHelper FileWrapperHelper { get; }
|
||||
private FolderWrapperHelper FolderWrapperHelper { get; }
|
||||
|
||||
public FolderContentWrapperHelper(
|
||||
public FolderContentWrapperHelper(
|
||||
FileSecurity fileSecurity,
|
||||
IDaoFactory daoFactory,
|
||||
FileWrapperHelper fileWrapperHelper,
|
||||
FolderWrapperHelper folderWrapperHelper)
|
||||
{
|
||||
{
|
||||
FileSecurity = fileSecurity;
|
||||
DaoFactory = daoFactory;
|
||||
FileWrapperHelper = fileWrapperHelper;
|
||||
FolderWrapperHelper = folderWrapperHelper;
|
||||
}
|
||||
|
||||
public FolderContentWrapper<T> Get<T>(DataWrapper<T> folderItems, int startIndex)
|
||||
{
|
||||
{
|
||||
var foldersIntWithRights = GetFoldersIntWithRights<int>();
|
||||
var foldersStringWithRights = GetFoldersIntWithRights<string>();
|
||||
|
||||
var result = new FolderContentWrapper<T>
|
||||
{
|
||||
Files = folderItems.Entries
|
||||
@ -127,11 +137,11 @@ namespace ASC.Api.Documents
|
||||
FileEntryWrapper wrapper = null;
|
||||
if (r is File<int> fol1)
|
||||
{
|
||||
wrapper = FileWrapperHelper.Get(fol1);
|
||||
wrapper = FileWrapperHelper.Get(fol1, foldersIntWithRights);
|
||||
}
|
||||
if (r is File<string> fol2)
|
||||
{
|
||||
wrapper = FileWrapperHelper.Get(fol2);
|
||||
wrapper = FileWrapperHelper.Get(fol2, foldersStringWithRights);
|
||||
}
|
||||
|
||||
return wrapper;
|
||||
@ -145,11 +155,11 @@ namespace ASC.Api.Documents
|
||||
FileEntryWrapper wrapper = null;
|
||||
if (r is Folder<int> fol1)
|
||||
{
|
||||
wrapper = FolderWrapperHelper.Get(fol1);
|
||||
wrapper = FolderWrapperHelper.Get(fol1, foldersIntWithRights);
|
||||
}
|
||||
if (r is Folder<string> fol2)
|
||||
{
|
||||
wrapper = FolderWrapperHelper.Get(fol2);
|
||||
wrapper = FolderWrapperHelper.Get(fol2, foldersStringWithRights);
|
||||
}
|
||||
|
||||
return wrapper;
|
||||
@ -164,7 +174,15 @@ namespace ASC.Api.Documents
|
||||
result.Total = folderItems.Total;
|
||||
result.New = folderItems.New;
|
||||
|
||||
return result;
|
||||
return result;
|
||||
|
||||
|
||||
List<Tuple<FileEntry<T1>, bool>> GetFoldersIntWithRights<T1>()
|
||||
{
|
||||
var folderDao = DaoFactory.GetFolderDao<T1>();
|
||||
var folders = folderDao.GetFolders(folderItems.Entries.OfType<FileEntry<T1>>().Select(r => r.FolderID).ToList());
|
||||
return FileSecurity.CanRead(folders);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -25,7 +25,9 @@
|
||||
|
||||
|
||||
using System;
|
||||
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
using ASC.Api.Core;
|
||||
using ASC.Api.Utils;
|
||||
using ASC.Common;
|
||||
@ -113,27 +115,49 @@ namespace ASC.Api.Documents
|
||||
GlobalFolderHelper = globalFolderHelper;
|
||||
}
|
||||
|
||||
public FolderWrapper<T> Get<T>(Folder<T> folder)
|
||||
public FolderWrapper<T> Get<T>(Folder<T> folder, List<Tuple<FileEntry<T>, bool>> folders = null)
|
||||
{
|
||||
var result = Get<FolderWrapper<T>, T>(folder);
|
||||
result.ParentId = folder.ParentFolderID;
|
||||
var result = GetFolderWrapper(folder);
|
||||
|
||||
result.ParentId = folder.FolderID;
|
||||
|
||||
if (folder.RootFolderType == FolderType.USER
|
||||
&& !Equals(folder.RootFolderCreator, AuthContext.CurrentAccount.ID))
|
||||
{
|
||||
result.RootFolderType = FolderType.SHARE;
|
||||
|
||||
var folderDao = DaoFactory.GetFolderDao<T>();
|
||||
var parentFolder = folderDao.GetFolder(folder.ParentFolderID);
|
||||
if (!FileSecurity.CanRead(parentFolder))
|
||||
result.ParentId = GlobalFolderHelper.GetFolderShare<T>();
|
||||
var folderDao = DaoFactory.GetFolderDao<T>();
|
||||
FileEntry<T> parentFolder;
|
||||
|
||||
if (folders != null)
|
||||
{
|
||||
var folderWithRight = folders.FirstOrDefault(f => f.Item1.ID.Equals(folder.FolderID));
|
||||
if (folderWithRight == null || !folderWithRight.Item2)
|
||||
{
|
||||
result.ParentId = GlobalFolderHelper.GetFolderShare<T>();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
parentFolder = folderDao.GetFolder(folder.FolderID);
|
||||
if (!FileSecurity.CanRead(parentFolder))
|
||||
{
|
||||
result.ParentId = GlobalFolderHelper.GetFolderShare<T>();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private FolderWrapper<T> GetFolderWrapper<T>(Folder<T> folder)
|
||||
{
|
||||
var result = Get<FolderWrapper<T>, T>(folder);
|
||||
result.FilesCount = folder.TotalFiles;
|
||||
result.FoldersCount = folder.TotalSubFolders;
|
||||
result.IsShareable = folder.Shareable.NullIfDefault();
|
||||
result.New = folder.NewForMe;
|
||||
|
||||
return result;
|
||||
result.New = folder.NewForMe;
|
||||
return result;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -181,13 +181,13 @@ namespace ASC.Web.Files.Services.WCFService.FileOperations
|
||||
var entriesPathId = new ItemNameValueCollection<T>();
|
||||
if (0 < Files.Count)
|
||||
{
|
||||
var files = FileDao.GetFiles(Files.ToArray());
|
||||
var files = FileDao.GetFiles(Files);
|
||||
files = FilesSecurity.FilterRead(files).ToList();
|
||||
files.ForEach(file => entriesPathId.Add(ExecPathFromFile(scope, file, string.Empty)));
|
||||
}
|
||||
if (0 < Folders.Count)
|
||||
{
|
||||
FilesSecurity.FilterRead(FolderDao.GetFolders(Files.ToArray())).ToList().Cast<FileEntry<T>>().ToList()
|
||||
FilesSecurity.FilterRead(FolderDao.GetFolders(Files)).Cast<FileEntry<T>>().ToList()
|
||||
.ForEach(folder => fileMarker.RemoveMarkAsNew(folder));
|
||||
|
||||
var filesInFolder = GetFilesInFolders(scope, Folders, string.Empty);
|
||||
|
||||
@ -92,11 +92,11 @@ namespace ASC.Web.Files.Services.WCFService.FileOperations
|
||||
var entries = new List<FileEntry<T>>();
|
||||
if (Folders.Any())
|
||||
{
|
||||
entries.AddRange(FolderDao.GetFolders(Folders.ToArray()));
|
||||
entries.AddRange(FolderDao.GetFolders(Folders));
|
||||
}
|
||||
if (Files.Any())
|
||||
{
|
||||
entries.AddRange(FileDao.GetFiles(Files.ToArray()));
|
||||
entries.AddRange(FileDao.GetFiles(Files));
|
||||
}
|
||||
entries.ForEach(x =>
|
||||
{
|
||||
|
||||
@ -199,7 +199,7 @@ namespace ASC.Web.Files.Services.WCFService.FileOperations
|
||||
{
|
||||
Error = FilesCommonResource.ErrorMassage_SecurityException_MoveFolder;
|
||||
}
|
||||
else if (!Equals((folder.ParentFolderID ?? default).ToString(), toFolderId.ToString()) || _resolveType == FileConflictResolveType.Duplicate)
|
||||
else if (!Equals((folder.FolderID ?? default).ToString(), toFolderId.ToString()) || _resolveType == FileConflictResolveType.Duplicate)
|
||||
{
|
||||
try
|
||||
{
|
||||
|
||||
@ -270,6 +270,9 @@ namespace ASC.Web.Files.Services.WCFService.FileOperations
|
||||
CurrentTenant = fileOperationData.Tenant;
|
||||
|
||||
using var scope = ServiceProvider.CreateScope();
|
||||
var tenantManager = scope.ServiceProvider.GetService<TenantManager>();
|
||||
tenantManager.SetCurrentTenant(CurrentTenant);
|
||||
|
||||
var daoFactory = scope.ServiceProvider.GetService<IDaoFactory>();
|
||||
FolderDao = daoFactory.GetFolderDao<TId>();
|
||||
|
||||
|
||||
@ -340,7 +340,7 @@ namespace ASC.Web.Files.Utils
|
||||
|
||||
folders.RemoveAll(folder => rootKeys.Contains(folder.ID));
|
||||
|
||||
var projectFolders = DaoFactory.GetFolderDao<int>().GetFolders(projectFolderIds.ToArray(), filter, subjectGroup, subjectId, null, false, false);
|
||||
var projectFolders = DaoFactory.GetFolderDao<int>().GetFolders(projectFolderIds.ToList(), filter, subjectGroup, subjectId, null, false, false);
|
||||
folders.AddRange(projectFolders);
|
||||
}
|
||||
|
||||
@ -554,7 +554,7 @@ namespace ASC.Web.Files.Utils
|
||||
|
||||
if (filter == FilterType.None || filter == FilterType.FoldersOnly)
|
||||
{
|
||||
var folderIds = tags.Where(tag => tag.EntryType == FileEntryType.Folder).Select(tag => (T)Convert.ChangeType(tag.EntryId, typeof(T))).ToArray();
|
||||
var folderIds = tags.Where(tag => tag.EntryType == FileEntryType.Folder).Select(tag => (T)Convert.ChangeType(tag.EntryId, typeof(T))).ToList();
|
||||
folders = folderDao.GetFolders(folderIds, filter, subjectGroup, subjectId, searchText, false, false);
|
||||
folders = folders.Where(folder => folder.RootFolderType != FolderType.TRASH).ToList();
|
||||
|
||||
@ -697,7 +697,7 @@ namespace ASC.Web.Files.Utils
|
||||
//Fake folder. Don't send request to third party
|
||||
var folder = ServiceProvider.GetService<Folder<string>>();
|
||||
|
||||
folder.ParentFolderID = parentFolderId;
|
||||
folder.FolderID = parentFolderId;
|
||||
|
||||
folder.ID = providerInfo.RootFolderId;
|
||||
folder.CreateBy = providerInfo.Owner;
|
||||
|
||||
@ -569,7 +569,7 @@ namespace ASC.Web.Files.Utils
|
||||
var parentId =
|
||||
entry.FileEntryType == FileEntryType.File
|
||||
? ((File<T>)entry).FolderID
|
||||
: ((Folder<T>)entry).ParentFolderID;
|
||||
: ((Folder<T>)entry).FolderID;
|
||||
|
||||
var parentEntry = entryTags.Keys.FirstOrDefault(entryCountTag => Equals(entryCountTag.ID, parentId));
|
||||
if (parentEntry != null)
|
||||
|
||||
@ -213,7 +213,7 @@ namespace ASC.Web.Files.Utils
|
||||
{
|
||||
var newFolder = ServiceProvider.GetService<Folder<T>>();
|
||||
newFolder.Title = subFolderTitle;
|
||||
newFolder.ParentFolderID = folderId;
|
||||
newFolder.FolderID = folderId;
|
||||
|
||||
folderId = folderDao.SaveFolder(newFolder);
|
||||
|
||||
|
||||
@ -58,6 +58,7 @@ using ASC.Web.Files.Utils;
|
||||
using ASC.Web.Studio.Core;
|
||||
using ASC.Web.Studio.Utility;
|
||||
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.AspNetCore.Mvc.ActionConstraints;
|
||||
@ -96,8 +97,8 @@ namespace ASC.Api.Documents
|
||||
private WordpressHelper WordpressHelper { get; }
|
||||
private EasyBibHelper EasyBibHelper { get; }
|
||||
private ProductEntryPoint ProductEntryPoint { get; }
|
||||
public TenantManager TenantManager { get; }
|
||||
public FileUtility FileUtility { get; }
|
||||
private TenantManager TenantManager { get; }
|
||||
private FileUtility FileUtility { get; }
|
||||
|
||||
/// <summary>
|
||||
/// </summary>
|
||||
@ -723,12 +724,14 @@ namespace ASC.Api.Documents
|
||||
/// <param name="doc"></param>
|
||||
/// <category>Files</category>
|
||||
/// <returns></returns>
|
||||
[AllowAnonymous]
|
||||
[Read("file/{fileId}/openedit", DisableFormat = true)]
|
||||
public Configuration<string> OpenEdit(string fileId, int version, string doc)
|
||||
{
|
||||
return FilesControllerHelperString.OpenEdit(fileId, version, doc);
|
||||
}
|
||||
|
||||
[AllowAnonymous]
|
||||
[Read("file/{fileId:int}/openedit")]
|
||||
public Configuration<int> OpenEdit(int fileId, int version, string doc)
|
||||
{
|
||||
@ -1095,6 +1098,27 @@ namespace ASC.Api.Documents
|
||||
return FilesControllerHelperInt.RenameFolder(folderId, folderModel.Title);
|
||||
}
|
||||
|
||||
[Create("owner")]
|
||||
public IEnumerable<FileEntryWrapper> ChangeOwnerFromBody([FromBody] ChangeOwnerModel model)
|
||||
{
|
||||
return ChangeOwner(model);
|
||||
}
|
||||
|
||||
[Create("owner")]
|
||||
[Consumes("application/x-www-form-urlencoded")]
|
||||
public IEnumerable<FileEntryWrapper> ChangeOwnerFromForm([FromForm] ChangeOwnerModel model)
|
||||
{
|
||||
return ChangeOwner(model);
|
||||
}
|
||||
|
||||
public IEnumerable<FileEntryWrapper> ChangeOwner(ChangeOwnerModel model)
|
||||
{
|
||||
var result = new List<FileEntry>();
|
||||
result.AddRange(FileStorageServiceInt.ChangeOwner(model.FolderIds.Where(r => r.ValueKind == JsonValueKind.Number).Select(r => r.GetInt32()).ToList(), model.FileIds.Where(r => r.ValueKind == JsonValueKind.Number).Select(r => r.GetInt32()).ToList(), model.UserId));
|
||||
result.AddRange(FileStorageService.ChangeOwner(model.FolderIds.Where(r => r.ValueKind == JsonValueKind.String).Select(r => r.GetString()).ToList(), model.FileIds.Where(r => r.ValueKind == JsonValueKind.String).Select(r => r.GetString()).ToList(), model.UserId));
|
||||
return result.Select(FilesControllerHelperInt.GetFileEntryWrapper);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Returns a detailed information about the folder with the ID specified in the request
|
||||
/// </summary>
|
||||
@ -1805,7 +1829,7 @@ namespace ASC.Api.Documents
|
||||
public IEnumerable<FolderWrapper<string>> GetCommonThirdPartyFolders()
|
||||
{
|
||||
var parent = FileStorageServiceInt.GetFolder(GlobalFolderHelper.FolderCommon);
|
||||
return EntryManager.GetThirpartyFolders(parent).Select(FolderWrapperHelper.Get).ToList();
|
||||
return EntryManager.GetThirpartyFolders(parent).Select(r => FolderWrapperHelper.Get(r)).ToList();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
@ -293,16 +293,7 @@ namespace ASC.Files.Helpers
|
||||
|
||||
public IEnumerable<FileEntryWrapper> GetFolderPath(T folderId)
|
||||
{
|
||||
return EntryManager.GetBreadCrumbs(folderId).Select(r =>
|
||||
{
|
||||
if (r is Folder<string> f1)
|
||||
return FolderWrapperHelper.Get(f1);
|
||||
|
||||
if (r is Folder<int> f2)
|
||||
return FolderWrapperHelper.Get(f2);
|
||||
|
||||
return default(FileEntryWrapper);
|
||||
});
|
||||
return EntryManager.GetBreadCrumbs(folderId).Select(GetFileEntryWrapper);
|
||||
}
|
||||
|
||||
public FileWrapper<T> GetFileInfo(T fileId, int version = -1)
|
||||
@ -321,28 +312,7 @@ namespace ASC.Files.Helpers
|
||||
public List<FileEntryWrapper> GetNewItems(T folderId)
|
||||
{
|
||||
return FileStorageService.GetNewItems(folderId)
|
||||
.Select(r =>
|
||||
{
|
||||
FileEntryWrapper wrapper = null;
|
||||
if (r is Folder<int> fol1)
|
||||
{
|
||||
wrapper = FolderWrapperHelper.Get(fol1);
|
||||
}
|
||||
else if (r is Folder<string> fol2)
|
||||
{
|
||||
wrapper = FolderWrapperHelper.Get(fol2);
|
||||
}
|
||||
else if (r is File<int> file1)
|
||||
{
|
||||
wrapper = FileWrapperHelper.Get(file1);
|
||||
}
|
||||
else if (r is File<string> file2)
|
||||
{
|
||||
wrapper = FileWrapperHelper.Get(file2);
|
||||
}
|
||||
|
||||
return wrapper;
|
||||
})
|
||||
.Select(GetFileEntryWrapper)
|
||||
.ToList();
|
||||
}
|
||||
|
||||
@ -415,20 +385,7 @@ namespace ASC.Files.Helpers
|
||||
|
||||
entries.AddRange(FileStorageService.GetItems(checkedFiles.OfType<string>(), checkedFiles.OfType<string>(), FilterType.FilesOnly, false, "", ""));
|
||||
|
||||
return entries.Select(r =>
|
||||
{
|
||||
FileEntryWrapper wrapper = null;
|
||||
if (r is Folder<int> fol1)
|
||||
{
|
||||
wrapper = FolderWrapperHelper.Get(fol1);
|
||||
}
|
||||
if (r is Folder<string> fol2)
|
||||
{
|
||||
wrapper = FolderWrapperHelper.Get(fol2);
|
||||
}
|
||||
|
||||
return wrapper;
|
||||
});
|
||||
return entries.Select(GetFileEntryWrapper);
|
||||
}
|
||||
|
||||
public IEnumerable<FileOperationWraper> MoveBatchItems(BatchModel batchModel)
|
||||
@ -489,13 +446,13 @@ namespace ASC.Files.Helpers
|
||||
public IEnumerable<FileWrapper<T>> GetFileVersionInfo(T fileId)
|
||||
{
|
||||
var files = FileStorageService.GetFileHistory(fileId);
|
||||
return files.Select(FileWrapperHelper.Get);
|
||||
return files.Select(r=> FileWrapperHelper.Get(r));
|
||||
}
|
||||
|
||||
public IEnumerable<FileWrapper<T>> ChangeHistory(T fileId, int version, bool continueVersion)
|
||||
{
|
||||
var history = FileStorageService.CompleteVersion(fileId, version, continueVersion).Value;
|
||||
return history.Select(FileWrapperHelper.Get);
|
||||
return history.Select(r=> FileWrapperHelper.Get(r));
|
||||
}
|
||||
|
||||
public FileWrapper<T> LockFile(T fileId, bool lockFile)
|
||||
@ -631,5 +588,28 @@ namespace ASC.Files.Helpers
|
||||
new OrderBy(sortBy, !ApiContext.SortDescending)),
|
||||
startIndex);
|
||||
}
|
||||
|
||||
internal FileEntryWrapper GetFileEntryWrapper(FileEntry r)
|
||||
{
|
||||
FileEntryWrapper wrapper = null;
|
||||
if (r is Folder<int> fol1)
|
||||
{
|
||||
wrapper = FolderWrapperHelper.Get(fol1);
|
||||
}
|
||||
else if (r is Folder<string> fol2)
|
||||
{
|
||||
wrapper = FolderWrapperHelper.Get(fol2);
|
||||
}
|
||||
else if (r is File<int> file1)
|
||||
{
|
||||
wrapper = FileWrapperHelper.Get(file1);
|
||||
}
|
||||
else if (r is File<string> file2)
|
||||
{
|
||||
wrapper = FileWrapperHelper.Get(file2);
|
||||
}
|
||||
|
||||
return wrapper;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -118,7 +118,7 @@ namespace ASC.Files.Service.Core
|
||||
.Where(f => f.Item1.RootFolderType != FolderType.TRASH && f.Item1.RootFolderType != FolderType.BUNCH)
|
||||
.ToList();
|
||||
|
||||
var folderIDs = files.Select(r => r.Item1.FolderID).ToArray();
|
||||
var folderIDs = files.Select(r => r.Item1.FolderID).ToList();
|
||||
var folders = FolderDao.GetFolders(folderIDs, checkShare: false);
|
||||
|
||||
return files.Select(f => new Tuple<Feed.Aggregator.Feed, object>(ToFeed(f, folders.FirstOrDefault(r => r.ID.Equals(f.Item1.FolderID))), f));
|
||||
|
||||
@ -87,10 +87,10 @@ namespace ASC.Files.Service.Core
|
||||
.Where(f => f.Item1.RootFolderType != FolderType.TRASH && f.Item1.RootFolderType != FolderType.BUNCH)
|
||||
.ToList();
|
||||
|
||||
var parentFolderIDs = folders.Select(r => r.Item1.ParentFolderID).ToArray();
|
||||
var parentFolderIDs = folders.Select(r => r.Item1.FolderID).ToList();
|
||||
var parentFolders = FolderDao.GetFolders(parentFolderIDs, checkShare: false);
|
||||
|
||||
return folders.Select(f => new Tuple<Feed.Aggregator.Feed, object>(ToFeed(f, parentFolders.FirstOrDefault(r => r.ID.Equals(f.Item1.ParentFolderID))), f));
|
||||
return folders.Select(f => new Tuple<Feed.Aggregator.Feed, object>(ToFeed(f, parentFolders.FirstOrDefault(r => r.ID.Equals(f.Item1.FolderID))), f));
|
||||
}
|
||||
|
||||
private Feed.Aggregator.Feed ToFeed((Folder<int>, SmallShareRecord) tuple, Folder<int> rootFolder)
|
||||
@ -109,12 +109,12 @@ namespace ASC.Files.Service.Core
|
||||
Module = Name,
|
||||
Title = folder.Title,
|
||||
ExtraLocation = rootFolder.FolderType == FolderType.DEFAULT ? rootFolder.Title : string.Empty,
|
||||
ExtraLocationUrl = rootFolder.FolderType == FolderType.DEFAULT ? FilesLinkUtility.GetFileRedirectPreviewUrl(folder.ParentFolderID, false) : string.Empty,
|
||||
ExtraLocationUrl = rootFolder.FolderType == FolderType.DEFAULT ? FilesLinkUtility.GetFileRedirectPreviewUrl(folder.FolderID, false) : string.Empty,
|
||||
Keywords = string.Format("{0}", folder.Title),
|
||||
HasPreview = false,
|
||||
CanComment = false,
|
||||
Target = shareRecord.ShareTo,
|
||||
GroupId = GetGroupId(sharedFolderItem, shareRecord.ShareBy, folder.ParentFolderID.ToString())
|
||||
GroupId = GetGroupId(sharedFolderItem, shareRecord.ShareBy, folder.FolderID.ToString())
|
||||
};
|
||||
|
||||
return feed;
|
||||
@ -129,12 +129,12 @@ namespace ASC.Files.Service.Core
|
||||
Module = Name,
|
||||
Title = folder.Title,
|
||||
ExtraLocation = rootFolder.FolderType == FolderType.DEFAULT ? rootFolder.Title : string.Empty,
|
||||
ExtraLocationUrl = rootFolder.FolderType == FolderType.DEFAULT ? FilesLinkUtility.GetFileRedirectPreviewUrl(folder.ParentFolderID, false) : string.Empty,
|
||||
ExtraLocationUrl = rootFolder.FolderType == FolderType.DEFAULT ? FilesLinkUtility.GetFileRedirectPreviewUrl(folder.FolderID, false) : string.Empty,
|
||||
Keywords = string.Format("{0}", folder.Title),
|
||||
HasPreview = false,
|
||||
CanComment = false,
|
||||
Target = null,
|
||||
GroupId = GetGroupId(folderItem, folder.CreateBy, folder.ParentFolderID.ToString())
|
||||
GroupId = GetGroupId(folderItem, folder.CreateBy, folder.FolderID.ToString())
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@ -11,6 +11,7 @@ import {
|
||||
RowContainer,
|
||||
utils,
|
||||
Box,
|
||||
Grid,
|
||||
} from "asc-web-components";
|
||||
import UserContent from "./userContent";
|
||||
import {
|
||||
@ -490,8 +491,12 @@ class SectionBodyContent extends React.PureComponent {
|
||||
headerText={t("NotFoundTitle")}
|
||||
descriptionText={t("NotFoundDescription")}
|
||||
buttons={
|
||||
<>
|
||||
<Box displayProp="inline-block" marginProp="0 8px 0 0">
|
||||
<Grid
|
||||
marginProp="13px 0"
|
||||
gridColumnGap="8px"
|
||||
columnsProp={["12px 1fr"]}
|
||||
>
|
||||
<Box>
|
||||
<IconButton
|
||||
className="empty-folder_container-icon"
|
||||
size="12"
|
||||
@ -501,7 +506,7 @@ class SectionBodyContent extends React.PureComponent {
|
||||
color="#657077"
|
||||
/>
|
||||
</Box>
|
||||
<Box displayProp="inline-block" marginProp="14px 0 0 0">
|
||||
<Box marginProp="-4px 0 0 0">
|
||||
<Link
|
||||
type="action"
|
||||
isHovered={true}
|
||||
@ -512,7 +517,7 @@ class SectionBodyContent extends React.PureComponent {
|
||||
{t("ClearButton")}
|
||||
</Link>
|
||||
</Box>
|
||||
</>
|
||||
</Grid>
|
||||
}
|
||||
/>
|
||||
);
|
||||
|
||||
@ -103,7 +103,7 @@ const UserContent = ({
|
||||
type="page"
|
||||
href={`/products/people/view/${userName}`}
|
||||
title={displayName}
|
||||
fontWeight="bold"
|
||||
fontWeight={600}
|
||||
onClick={onUserNameClick}
|
||||
fontSize="15px"
|
||||
color={nameColor}
|
||||
|
||||
@ -11,8 +11,8 @@
|
||||
"RemoveData": "Delete personal data",
|
||||
"DeleteSelfProfile": "Delete profile",
|
||||
"LoadingDescription": "Please wait...",
|
||||
"NotFoundDescription": "No people matching your filter can be displayed in this section. Please select other filter options or clear filter to view all the people in this section.",
|
||||
"NotFoundTitle": "No results matching your search could be found",
|
||||
"NotFoundDescription": "Change filter settings or add people to the section.",
|
||||
"NotFoundTitle": "Nothing found",
|
||||
"ClearButton": "Reset filter",
|
||||
"UserStatus": "Status",
|
||||
"LblActive": "Active",
|
||||
|
||||
@ -11,8 +11,8 @@
|
||||
"RemoveData": "Удалить личные данные",
|
||||
"DeleteSelfProfile": "Удалить профиль",
|
||||
"LoadingDescription": "Пожалуйста подождите...",
|
||||
"NotFoundDescription": "В данном разделе нет людей, соответствующих фильтру. Пожалуйста, выберите другие параметры или очистите фильтр, чтобы просмотреть всех людей в этом разделе.",
|
||||
"NotFoundTitle": "Результатов, соответствующих заданным критериям, не найдено",
|
||||
"NotFoundDescription": "Измените настройки фильтра или добавьте людей в раздел.",
|
||||
"NotFoundTitle": "Ничего не найдено",
|
||||
"ClearButton": "Сбросить фильтр",
|
||||
"UserStatus": "Статус",
|
||||
"LblActive": "Активный",
|
||||
|
||||
@ -37,10 +37,6 @@ const AvatarWrapper = styled.div`
|
||||
const EditButtonWrapper = styled.div`
|
||||
margin-top: 16px;
|
||||
width: 160px;
|
||||
|
||||
& > button {
|
||||
padding: 8px 20px 9px 20px;
|
||||
}
|
||||
`;
|
||||
|
||||
const ToggleWrapper = styled.div`
|
||||
@ -62,6 +58,7 @@ const ContactWrapper = styled.div`
|
||||
|
||||
.contact-link {
|
||||
padding: 0 8px;
|
||||
line-height: 16px;
|
||||
}
|
||||
`;
|
||||
|
||||
|
||||
@ -6,6 +6,7 @@ import { ComboBox, TextInput, IconButton } from "asc-web-components";
|
||||
const Container = styled.div`
|
||||
display: flex;
|
||||
margin: 0 0 16px 0;
|
||||
align-items: center;
|
||||
|
||||
.remove_icon {
|
||||
padding-left: 8px;
|
||||
@ -61,6 +62,7 @@ class ContactField extends React.Component {
|
||||
iconName={"CatalogTrashIcon"}
|
||||
isFill={true}
|
||||
isClickable={true}
|
||||
color="#A3A9AE"
|
||||
/>
|
||||
</Container>
|
||||
);
|
||||
|
||||
@ -66,7 +66,7 @@ class PasswordField extends React.Component {
|
||||
clipPasswordResource={`${t("Password")}: `}
|
||||
tooltipPasswordTitle={`${t("ErrorPasswordMessage")}:`}
|
||||
tooltipPasswordLength={t("ErrorPasswordLength", {
|
||||
from: passwordSettings.minLength,
|
||||
from: passwordSettings ? passwordSettings.minLength : 8,
|
||||
to: "30",
|
||||
})}
|
||||
tooltipPasswordDigits={t("ErrorPasswordNoDigits")}
|
||||
|
||||
@ -192,8 +192,6 @@
|
||||
"PeopleResource": [
|
||||
"LblSendEmail",
|
||||
"LblSendMessage",
|
||||
"NotFoundDescription",
|
||||
"NotFoundTitle",
|
||||
"ClearButton",
|
||||
"LblActive",
|
||||
"LblTerminated",
|
||||
|
||||
@ -24,10 +24,10 @@
|
||||
dependencies:
|
||||
"@babel/highlight" "^7.10.4"
|
||||
|
||||
"@babel/compat-data@^7.12.1", "@babel/compat-data@^7.12.5", "@babel/compat-data@^7.9.0":
|
||||
version "7.12.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.5.tgz#f56db0c4bb1bbbf221b4e81345aab4141e7cb0e9"
|
||||
integrity sha512-DTsS7cxrsH3by8nqQSpFSyjSfSYl57D6Cf4q8dW3LK83tBKBDCkfcay1nYkXq1nIHXnpX8WMMb/O25HOy3h1zg==
|
||||
"@babel/compat-data@^7.12.5", "@babel/compat-data@^7.12.7", "@babel/compat-data@^7.9.0":
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.7.tgz#9329b4782a7d6bbd7eef57e11addf91ee3ef1e41"
|
||||
integrity sha512-YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw==
|
||||
|
||||
"@babel/core@7.9.0":
|
||||
version "7.9.0"
|
||||
@ -52,18 +52,18 @@
|
||||
source-map "^0.5.0"
|
||||
|
||||
"@babel/core@^7.1.0", "@babel/core@^7.4.5", "@babel/core@^7.8.4":
|
||||
version "7.12.3"
|
||||
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.3.tgz#1b436884e1e3bff6fb1328dc02b208759de92ad8"
|
||||
integrity sha512-0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g==
|
||||
version "7.12.9"
|
||||
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.9.tgz#fd450c4ec10cdbb980e2928b7aa7a28484593fc8"
|
||||
integrity sha512-gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ==
|
||||
dependencies:
|
||||
"@babel/code-frame" "^7.10.4"
|
||||
"@babel/generator" "^7.12.1"
|
||||
"@babel/generator" "^7.12.5"
|
||||
"@babel/helper-module-transforms" "^7.12.1"
|
||||
"@babel/helpers" "^7.12.1"
|
||||
"@babel/parser" "^7.12.3"
|
||||
"@babel/template" "^7.10.4"
|
||||
"@babel/traverse" "^7.12.1"
|
||||
"@babel/types" "^7.12.1"
|
||||
"@babel/helpers" "^7.12.5"
|
||||
"@babel/parser" "^7.12.7"
|
||||
"@babel/template" "^7.12.7"
|
||||
"@babel/traverse" "^7.12.9"
|
||||
"@babel/types" "^7.12.7"
|
||||
convert-source-map "^1.7.0"
|
||||
debug "^4.1.0"
|
||||
gensync "^1.0.0-beta.1"
|
||||
@ -73,7 +73,7 @@
|
||||
semver "^5.4.1"
|
||||
source-map "^0.5.0"
|
||||
|
||||
"@babel/generator@^7.12.1", "@babel/generator@^7.12.5", "@babel/generator@^7.4.0", "@babel/generator@^7.9.0":
|
||||
"@babel/generator@^7.12.5", "@babel/generator@^7.4.0", "@babel/generator@^7.9.0":
|
||||
version "7.12.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.5.tgz#a2c50de5c8b6d708ab95be5e6053936c1884a4de"
|
||||
integrity sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==
|
||||
@ -97,7 +97,7 @@
|
||||
"@babel/helper-explode-assignable-expression" "^7.10.4"
|
||||
"@babel/types" "^7.10.4"
|
||||
|
||||
"@babel/helper-builder-react-jsx-experimental@^7.12.1":
|
||||
"@babel/helper-builder-react-jsx-experimental@^7.12.4":
|
||||
version "7.12.4"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.4.tgz#55fc1ead5242caa0ca2875dcb8eed6d311e50f48"
|
||||
integrity sha512-AjEa0jrQqNk7eDQOo0pTfUOwQBMF+xVqrausQwT9/rTKy0g04ggFNaJpaE09IQMn9yExluigWMJcj0WC7bq+Og==
|
||||
@ -114,7 +114,7 @@
|
||||
"@babel/helper-annotate-as-pure" "^7.10.4"
|
||||
"@babel/types" "^7.10.4"
|
||||
|
||||
"@babel/helper-compilation-targets@^7.12.1", "@babel/helper-compilation-targets@^7.8.7":
|
||||
"@babel/helper-compilation-targets@^7.12.5", "@babel/helper-compilation-targets@^7.8.7":
|
||||
version "7.12.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz#cb470c76198db6a24e9dbc8987275631e5d29831"
|
||||
integrity sha512-+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw==
|
||||
@ -136,12 +136,11 @@
|
||||
"@babel/helper-split-export-declaration" "^7.10.4"
|
||||
|
||||
"@babel/helper-create-regexp-features-plugin@^7.12.1":
|
||||
version "7.12.1"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.1.tgz#18b1302d4677f9dc4740fe8c9ed96680e29d37e8"
|
||||
integrity sha512-rsZ4LGvFTZnzdNZR5HZdmJVuXK8834R5QkF3WvcnBhrlVtF0HSIUC6zbreL9MgjTywhKokn8RIYRiq99+DLAxA==
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.7.tgz#2084172e95443fa0a09214ba1bb328f9aea1278f"
|
||||
integrity sha512-idnutvQPdpbduutvi3JVfEgcVIHooQnhvhx0Nk9isOINOIGYkZea1Pk2JlJRiUnMefrlvr0vkByATBY/mB4vjQ==
|
||||
dependencies:
|
||||
"@babel/helper-annotate-as-pure" "^7.10.4"
|
||||
"@babel/helper-regex" "^7.10.4"
|
||||
regexpu-core "^4.7.1"
|
||||
|
||||
"@babel/helper-define-map@^7.10.4":
|
||||
@ -184,13 +183,13 @@
|
||||
"@babel/types" "^7.10.4"
|
||||
|
||||
"@babel/helper-member-expression-to-functions@^7.12.1":
|
||||
version "7.12.1"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz#fba0f2fcff3fba00e6ecb664bb5e6e26e2d6165c"
|
||||
integrity sha512-k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz#aa77bd0396ec8114e5e30787efa78599d874a855"
|
||||
integrity sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==
|
||||
dependencies:
|
||||
"@babel/types" "^7.12.1"
|
||||
"@babel/types" "^7.12.7"
|
||||
|
||||
"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.8.3":
|
||||
"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.12.5", "@babel/helper-module-imports@^7.8.3":
|
||||
version "7.12.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz#1bfc0229f794988f76ed0a4d4e90860850b54dfb"
|
||||
integrity sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==
|
||||
@ -213,24 +212,17 @@
|
||||
lodash "^4.17.19"
|
||||
|
||||
"@babel/helper-optimise-call-expression@^7.10.4":
|
||||
version "7.10.4"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz#50dc96413d594f995a77905905b05893cd779673"
|
||||
integrity sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.7.tgz#7f94ae5e08721a49467346aa04fd22f750033b9c"
|
||||
integrity sha512-I5xc9oSJ2h59OwyUqjv95HRyzxj53DAubUERgQMrpcCEYQyToeHA+NEcUEsVWB4j53RDeskeBJ0SgRAYHDBckw==
|
||||
dependencies:
|
||||
"@babel/types" "^7.10.4"
|
||||
"@babel/types" "^7.12.7"
|
||||
|
||||
"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
|
||||
version "7.10.4"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375"
|
||||
integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==
|
||||
|
||||
"@babel/helper-regex@^7.10.4":
|
||||
version "7.10.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.5.tgz#32dfbb79899073c415557053a19bd055aae50ae0"
|
||||
integrity sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==
|
||||
dependencies:
|
||||
lodash "^4.17.19"
|
||||
|
||||
"@babel/helper-remap-async-to-generator@^7.12.1":
|
||||
version "7.12.1"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz#8c4dbbf916314f6047dc05e6a2217074238347fd"
|
||||
@ -291,7 +283,7 @@
|
||||
"@babel/traverse" "^7.10.4"
|
||||
"@babel/types" "^7.10.4"
|
||||
|
||||
"@babel/helpers@^7.12.1", "@babel/helpers@^7.9.0":
|
||||
"@babel/helpers@^7.12.5", "@babel/helpers@^7.9.0":
|
||||
version "7.12.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.5.tgz#1a1ba4a768d9b58310eda516c449913fe647116e"
|
||||
integrity sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA==
|
||||
@ -309,10 +301,10 @@
|
||||
chalk "^2.0.0"
|
||||
js-tokens "^4.0.0"
|
||||
|
||||
"@babel/parser@^7.1.0", "@babel/parser@^7.10.4", "@babel/parser@^7.12.3", "@babel/parser@^7.12.5", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.9.0":
|
||||
version "7.12.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.5.tgz#b4af32ddd473c0bfa643bd7ff0728b8e71b81ea0"
|
||||
integrity sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==
|
||||
"@babel/parser@^7.1.0", "@babel/parser@^7.12.7", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.9.0":
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.7.tgz#fee7b39fe809d0e73e5b25eecaf5780ef3d73056"
|
||||
integrity sha512-oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg==
|
||||
|
||||
"@babel/plugin-proposal-async-generator-functions@^7.12.1", "@babel/plugin-proposal-async-generator-functions@^7.8.3":
|
||||
version "7.12.1"
|
||||
@ -404,10 +396,10 @@
|
||||
"@babel/helper-plugin-utils" "^7.8.3"
|
||||
"@babel/plugin-syntax-numeric-separator" "^7.8.3"
|
||||
|
||||
"@babel/plugin-proposal-numeric-separator@^7.12.1", "@babel/plugin-proposal-numeric-separator@^7.8.3":
|
||||
version "7.12.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.5.tgz#b1ce757156d40ed79d59d467cb2b154a5c4149ba"
|
||||
integrity sha512-UiAnkKuOrCyjZ3sYNHlRlfuZJbBHknMQ9VMwVeX97Ofwx7RpD6gS2HfqTCh8KNUQgcOm8IKt103oR4KIjh7Q8g==
|
||||
"@babel/plugin-proposal-numeric-separator@^7.12.7", "@babel/plugin-proposal-numeric-separator@^7.8.3":
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz#8bf253de8139099fea193b297d23a9d406ef056b"
|
||||
integrity sha512-8c+uy0qmnRTeukiGsjLGy6uVs/TFjJchGXUeBqlG4VWYOdJWkhhVPdQ3uHwbmalfJwv2JsV0qffXP4asRfL2SQ==
|
||||
dependencies:
|
||||
"@babel/helper-plugin-utils" "^7.10.4"
|
||||
"@babel/plugin-syntax-numeric-separator" "^7.10.4"
|
||||
@ -437,10 +429,10 @@
|
||||
"@babel/helper-plugin-utils" "^7.8.3"
|
||||
"@babel/plugin-syntax-optional-chaining" "^7.8.0"
|
||||
|
||||
"@babel/plugin-proposal-optional-chaining@^7.12.1", "@babel/plugin-proposal-optional-chaining@^7.9.0":
|
||||
version "7.12.1"
|
||||
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.1.tgz#cce122203fc8a32794296fc377c6dedaf4363797"
|
||||
integrity sha512-c2uRpY6WzaVDzynVY9liyykS+kVU+WRZPMPYpkelXH8KBt1oXoI89kPbZKKG/jDT5UK92FTW2fZkZaJhdiBabw==
|
||||
"@babel/plugin-proposal-optional-chaining@^7.12.7", "@babel/plugin-proposal-optional-chaining@^7.9.0":
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz#e02f0ea1b5dc59d401ec16fb824679f683d3303c"
|
||||
integrity sha512-4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA==
|
||||
dependencies:
|
||||
"@babel/helper-plugin-utils" "^7.10.4"
|
||||
"@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
|
||||
@ -787,12 +779,12 @@
|
||||
dependencies:
|
||||
"@babel/helper-plugin-utils" "^7.10.4"
|
||||
|
||||
"@babel/plugin-transform-react-jsx-development@^7.12.5", "@babel/plugin-transform-react-jsx-development@^7.9.0":
|
||||
version "7.12.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.5.tgz#677de5b96da310430d6cfb7fee16a1603afa3d56"
|
||||
integrity sha512-1JJusg3iPgsZDthyWiCr3KQiGs31ikU/mSf2N2dSYEAO0GEImmVUbWf0VoSDGDFTAn5Dj4DUiR6SdIXHY7tELA==
|
||||
"@babel/plugin-transform-react-jsx-development@^7.12.7", "@babel/plugin-transform-react-jsx-development@^7.9.0":
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.7.tgz#4c2a647de79c7e2b16bfe4540677ba3121e82a08"
|
||||
integrity sha512-Rs3ETtMtR3VLXFeYRChle5SsP/P9Jp/6dsewBQfokDSzKJThlsuFcnzLTDRALiUmTC48ej19YD9uN1mupEeEDg==
|
||||
dependencies:
|
||||
"@babel/helper-builder-react-jsx-experimental" "^7.12.1"
|
||||
"@babel/helper-builder-react-jsx-experimental" "^7.12.4"
|
||||
"@babel/helper-plugin-utils" "^7.10.4"
|
||||
"@babel/plugin-syntax-jsx" "^7.12.1"
|
||||
|
||||
@ -810,13 +802,13 @@
|
||||
dependencies:
|
||||
"@babel/helper-plugin-utils" "^7.10.4"
|
||||
|
||||
"@babel/plugin-transform-react-jsx@^7.12.5", "@babel/plugin-transform-react-jsx@^7.9.1":
|
||||
version "7.12.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.5.tgz#39ede0e30159770561b6963be143e40af3bde00c"
|
||||
integrity sha512-2xkcPqqrYiOQgSlM/iwto1paPijjsDbUynN13tI6bosDz/jOW3CRzYguIE8wKX32h+msbBM22Dv5fwrFkUOZjQ==
|
||||
"@babel/plugin-transform-react-jsx@^7.12.7", "@babel/plugin-transform-react-jsx@^7.9.1":
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.7.tgz#8b14d45f6eccd41b7f924bcb65c021e9f0a06f7f"
|
||||
integrity sha512-YFlTi6MEsclFAPIDNZYiCRbneg1MFGao9pPG9uD5htwE0vDbPaMUMeYd6itWjw7K4kro4UbdQf3ljmFl9y48dQ==
|
||||
dependencies:
|
||||
"@babel/helper-builder-react-jsx" "^7.10.4"
|
||||
"@babel/helper-builder-react-jsx-experimental" "^7.12.1"
|
||||
"@babel/helper-builder-react-jsx-experimental" "^7.12.4"
|
||||
"@babel/helper-plugin-utils" "^7.10.4"
|
||||
"@babel/plugin-syntax-jsx" "^7.12.1"
|
||||
|
||||
@ -867,13 +859,12 @@
|
||||
"@babel/helper-plugin-utils" "^7.10.4"
|
||||
"@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
|
||||
|
||||
"@babel/plugin-transform-sticky-regex@^7.12.1", "@babel/plugin-transform-sticky-regex@^7.8.3":
|
||||
version "7.12.1"
|
||||
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.1.tgz#5c24cf50de396d30e99afc8d1c700e8bce0f5caf"
|
||||
integrity sha512-CiUgKQ3AGVk7kveIaPEET1jNDhZZEl1RPMWdTBE1799bdz++SwqDHStmxfCtDfBhQgCl38YRiSnrMuUMZIWSUQ==
|
||||
"@babel/plugin-transform-sticky-regex@^7.12.7", "@babel/plugin-transform-sticky-regex@^7.8.3":
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz#560224613ab23987453948ed21d0b0b193fa7fad"
|
||||
integrity sha512-VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg==
|
||||
dependencies:
|
||||
"@babel/helper-plugin-utils" "^7.10.4"
|
||||
"@babel/helper-regex" "^7.10.4"
|
||||
|
||||
"@babel/plugin-transform-template-literals@^7.12.1", "@babel/plugin-transform-template-literals@^7.8.3":
|
||||
version "7.12.1"
|
||||
@ -980,13 +971,13 @@
|
||||
semver "^5.5.0"
|
||||
|
||||
"@babel/preset-env@^7.4.5", "@babel/preset-env@^7.8.4":
|
||||
version "7.12.1"
|
||||
resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.1.tgz#9c7e5ca82a19efc865384bb4989148d2ee5d7ac2"
|
||||
integrity sha512-H8kxXmtPaAGT7TyBvSSkoSTUK6RHh61So05SyEbpmr0MCZrsNYn7mGMzzeYoOUCdHzww61k8XBft2TaES+xPLg==
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.7.tgz#54ea21dbe92caf6f10cb1a0a576adc4ebf094b55"
|
||||
integrity sha512-OnNdfAr1FUQg7ksb7bmbKoby4qFOHw6DKWWUNB9KqnnCldxhxJlP+21dpyaWFmf2h0rTbOkXJtAGevY3XW1eew==
|
||||
dependencies:
|
||||
"@babel/compat-data" "^7.12.1"
|
||||
"@babel/helper-compilation-targets" "^7.12.1"
|
||||
"@babel/helper-module-imports" "^7.12.1"
|
||||
"@babel/compat-data" "^7.12.7"
|
||||
"@babel/helper-compilation-targets" "^7.12.5"
|
||||
"@babel/helper-module-imports" "^7.12.5"
|
||||
"@babel/helper-plugin-utils" "^7.10.4"
|
||||
"@babel/helper-validator-option" "^7.12.1"
|
||||
"@babel/plugin-proposal-async-generator-functions" "^7.12.1"
|
||||
@ -996,10 +987,10 @@
|
||||
"@babel/plugin-proposal-json-strings" "^7.12.1"
|
||||
"@babel/plugin-proposal-logical-assignment-operators" "^7.12.1"
|
||||
"@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1"
|
||||
"@babel/plugin-proposal-numeric-separator" "^7.12.1"
|
||||
"@babel/plugin-proposal-numeric-separator" "^7.12.7"
|
||||
"@babel/plugin-proposal-object-rest-spread" "^7.12.1"
|
||||
"@babel/plugin-proposal-optional-catch-binding" "^7.12.1"
|
||||
"@babel/plugin-proposal-optional-chaining" "^7.12.1"
|
||||
"@babel/plugin-proposal-optional-chaining" "^7.12.7"
|
||||
"@babel/plugin-proposal-private-methods" "^7.12.1"
|
||||
"@babel/plugin-proposal-unicode-property-regex" "^7.12.1"
|
||||
"@babel/plugin-syntax-async-generators" "^7.8.0"
|
||||
@ -1041,14 +1032,14 @@
|
||||
"@babel/plugin-transform-reserved-words" "^7.12.1"
|
||||
"@babel/plugin-transform-shorthand-properties" "^7.12.1"
|
||||
"@babel/plugin-transform-spread" "^7.12.1"
|
||||
"@babel/plugin-transform-sticky-regex" "^7.12.1"
|
||||
"@babel/plugin-transform-sticky-regex" "^7.12.7"
|
||||
"@babel/plugin-transform-template-literals" "^7.12.1"
|
||||
"@babel/plugin-transform-typeof-symbol" "^7.12.1"
|
||||
"@babel/plugin-transform-unicode-escapes" "^7.12.1"
|
||||
"@babel/plugin-transform-unicode-regex" "^7.12.1"
|
||||
"@babel/preset-modules" "^0.1.3"
|
||||
"@babel/types" "^7.12.1"
|
||||
core-js-compat "^3.6.2"
|
||||
"@babel/types" "^7.12.7"
|
||||
core-js-compat "^3.7.0"
|
||||
semver "^5.5.0"
|
||||
|
||||
"@babel/preset-modules@^0.1.3":
|
||||
@ -1075,14 +1066,14 @@
|
||||
"@babel/plugin-transform-react-jsx-source" "^7.9.0"
|
||||
|
||||
"@babel/preset-react@^7.0.0":
|
||||
version "7.12.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.5.tgz#d45625f65d53612078a43867c5c6750e78772c56"
|
||||
integrity sha512-jcs++VPrgyFehkMezHtezS2BpnUlR7tQFAyesJn1vGTO9aTFZrgIQrA5YydlTwxbcjMwkFY6i04flCigRRr3GA==
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.7.tgz#36d61d83223b07b6ac4ec55cf016abb0f70be83b"
|
||||
integrity sha512-wKeTdnGUP5AEYCYQIMeXMMwU7j+2opxrG0WzuZfxuuW9nhKvvALBjl67653CWamZJVefuJGI219G591RSldrqQ==
|
||||
dependencies:
|
||||
"@babel/helper-plugin-utils" "^7.10.4"
|
||||
"@babel/plugin-transform-react-display-name" "^7.12.1"
|
||||
"@babel/plugin-transform-react-jsx" "^7.12.5"
|
||||
"@babel/plugin-transform-react-jsx-development" "^7.12.5"
|
||||
"@babel/plugin-transform-react-jsx" "^7.12.7"
|
||||
"@babel/plugin-transform-react-jsx-development" "^7.12.7"
|
||||
"@babel/plugin-transform-react-jsx-self" "^7.12.1"
|
||||
"@babel/plugin-transform-react-jsx-source" "^7.12.1"
|
||||
"@babel/plugin-transform-react-pure-annotations" "^7.12.1"
|
||||
@ -1117,34 +1108,34 @@
|
||||
dependencies:
|
||||
regenerator-runtime "^0.13.4"
|
||||
|
||||
"@babel/template@^7.10.4", "@babel/template@^7.4.0", "@babel/template@^7.8.6":
|
||||
version "7.10.4"
|
||||
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278"
|
||||
integrity sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==
|
||||
"@babel/template@^7.10.4", "@babel/template@^7.12.7", "@babel/template@^7.4.0", "@babel/template@^7.8.6":
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc"
|
||||
integrity sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==
|
||||
dependencies:
|
||||
"@babel/code-frame" "^7.10.4"
|
||||
"@babel/parser" "^7.10.4"
|
||||
"@babel/types" "^7.10.4"
|
||||
"@babel/parser" "^7.12.7"
|
||||
"@babel/types" "^7.12.7"
|
||||
|
||||
"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.5", "@babel/traverse@^7.4.3", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.9.0":
|
||||
version "7.12.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.5.tgz#78a0c68c8e8a35e4cacfd31db8bb303d5606f095"
|
||||
integrity sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==
|
||||
"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.5", "@babel/traverse@^7.12.9", "@babel/traverse@^7.4.3", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.9.0":
|
||||
version "7.12.9"
|
||||
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.9.tgz#fad26c972eabbc11350e0b695978de6cc8e8596f"
|
||||
integrity sha512-iX9ajqnLdoU1s1nHt36JDI9KG4k+vmI8WgjK5d+aDTwQbL2fUnzedNedssA645Ede3PM2ma1n8Q4h2ohwXgMXw==
|
||||
dependencies:
|
||||
"@babel/code-frame" "^7.10.4"
|
||||
"@babel/generator" "^7.12.5"
|
||||
"@babel/helper-function-name" "^7.10.4"
|
||||
"@babel/helper-split-export-declaration" "^7.11.0"
|
||||
"@babel/parser" "^7.12.5"
|
||||
"@babel/types" "^7.12.5"
|
||||
"@babel/parser" "^7.12.7"
|
||||
"@babel/types" "^7.12.7"
|
||||
debug "^4.1.0"
|
||||
globals "^11.1.0"
|
||||
lodash "^4.17.19"
|
||||
|
||||
"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.5", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.9.0":
|
||||
version "7.12.6"
|
||||
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.6.tgz#ae0e55ef1cce1fbc881cd26f8234eb3e657edc96"
|
||||
integrity sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==
|
||||
"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.9.0":
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.7.tgz#6039ff1e242640a29452c9ae572162ec9a8f5d13"
|
||||
integrity sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ==
|
||||
dependencies:
|
||||
"@babel/helper-validator-identifier" "^7.10.4"
|
||||
lodash "^4.17.19"
|
||||
@ -1548,17 +1539,17 @@
|
||||
"@babel/types" "^7.0.0"
|
||||
|
||||
"@types/babel__template@*":
|
||||
version "7.0.3"
|
||||
resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.3.tgz#b8aaeba0a45caca7b56a5de9459872dde3727214"
|
||||
integrity sha512-uCoznIPDmnickEi6D0v11SBpW0OuVqHJCa7syXqQHy5uktSCreIlt0iglsCnmvz8yCb38hGcWeseA8cWJSwv5Q==
|
||||
version "7.4.0"
|
||||
resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.0.tgz#0c888dd70b3ee9eebb6e4f200e809da0076262be"
|
||||
integrity sha512-NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A==
|
||||
dependencies:
|
||||
"@babel/parser" "^7.1.0"
|
||||
"@babel/types" "^7.0.0"
|
||||
|
||||
"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
|
||||
version "7.0.15"
|
||||
resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.15.tgz#db9e4238931eb69ef8aab0ad6523d4d4caa39d03"
|
||||
integrity sha512-Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A==
|
||||
version "7.0.16"
|
||||
resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.16.tgz#0bbbf70c7bc4193210dd27e252c51260a37cd6a7"
|
||||
integrity sha512-S63Dt4CZOkuTmpLGGWtT/mQdVORJOpx6SZWGVaP56dda/0Nx5nEe82K7/LAm8zYr6SfMq+1N2OreIOrHAx656w==
|
||||
dependencies:
|
||||
"@babel/types" "^7.3.0"
|
||||
|
||||
@ -1616,9 +1607,9 @@
|
||||
integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
|
||||
|
||||
"@types/node@*":
|
||||
version "14.14.7"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.7.tgz#8ea1e8f8eae2430cf440564b98c6dfce1ec5945d"
|
||||
integrity sha512-Zw1vhUSQZYw+7u5dAwNbIA9TuTotpzY/OF7sJM9FqPOF3SPjKnxrjoTktXDZgUjybf4cWVBP7O8wvKdSaGHweg==
|
||||
version "14.14.10"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.10.tgz#5958a82e41863cfc71f2307b3748e3491ba03785"
|
||||
integrity sha512-J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ==
|
||||
|
||||
"@types/parse-json@^4.0.0":
|
||||
version "4.0.0"
|
||||
@ -2121,12 +2112,14 @@ array-flatten@^2.1.0:
|
||||
integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
|
||||
|
||||
array-includes@^3.0.3, array-includes@^3.1.1:
|
||||
version "3.1.1"
|
||||
resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348"
|
||||
integrity sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==
|
||||
version "3.1.2"
|
||||
resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.2.tgz#a8db03e0b88c8c6aeddc49cb132f9bcab4ebf9c8"
|
||||
integrity sha512-w2GspexNQpx+PutG3QpT437/BenZBj0M/MZGn5mzv/MofYqo0xmRHzn4lFsoDlWJ+THYsGJmFlW68WlDFx7VRw==
|
||||
dependencies:
|
||||
call-bind "^1.0.0"
|
||||
define-properties "^1.1.3"
|
||||
es-abstract "^1.17.0"
|
||||
es-abstract "^1.18.0-next.1"
|
||||
get-intrinsic "^1.0.1"
|
||||
is-string "^1.0.5"
|
||||
|
||||
array-union@^1.0.1:
|
||||
@ -2147,12 +2140,13 @@ array-unique@^0.3.2:
|
||||
integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
|
||||
|
||||
array.prototype.flat@^1.2.1:
|
||||
version "1.2.3"
|
||||
resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b"
|
||||
integrity sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==
|
||||
version "1.2.4"
|
||||
resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz#6ef638b43312bd401b4c6199fdec7e2dc9e9a123"
|
||||
integrity sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==
|
||||
dependencies:
|
||||
call-bind "^1.0.0"
|
||||
define-properties "^1.1.3"
|
||||
es-abstract "^1.17.0-next.1"
|
||||
es-abstract "^1.18.0-next.1"
|
||||
|
||||
arrify@^1.0.1:
|
||||
version "1.0.1"
|
||||
@ -2165,7 +2159,7 @@ asap@~2.0.6:
|
||||
integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
|
||||
|
||||
"asc-web-common@file:../../../packages/asc-web-common":
|
||||
version "1.0.279"
|
||||
version "1.0.281"
|
||||
dependencies:
|
||||
axios "^0.19.1"
|
||||
history "4.10.1"
|
||||
@ -2182,7 +2176,7 @@ asap@~2.0.6:
|
||||
sjcl "^1.0.8"
|
||||
|
||||
"asc-web-components@file:../../../packages/asc-web-components":
|
||||
version "1.0.484"
|
||||
version "1.0.488"
|
||||
dependencies:
|
||||
email-addresses "^3.1.0"
|
||||
html-to-react "^1.4.2"
|
||||
@ -2421,9 +2415,9 @@ babel-plugin-named-asset-import@^0.3.6:
|
||||
integrity sha512-squySRkf+6JGnvjoUtDEjSREJEBirnXi9NqP6rjSYsylxQxqBTz+pkmf395i9E2zsvmYUaI40BHo6SqZUdydlw==
|
||||
|
||||
"babel-plugin-styled-components@>= 1":
|
||||
version "1.11.1"
|
||||
resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-1.11.1.tgz#5296a9e557d736c3186be079fff27c6665d63d76"
|
||||
integrity sha512-YwrInHyKUk1PU3avIRdiLyCpM++18Rs1NgyMXEAQC33rIXs/vro0A+stf4sT0Gf22Got+xRWB8Cm0tw+qkRzBA==
|
||||
version "1.12.0"
|
||||
resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-1.12.0.tgz#1dec1676512177de6b827211e9eda5a30db4f9b9"
|
||||
integrity sha512-FEiD7l5ZABdJPpLssKXjBUJMYqzbcNzBowfXDCdJhOpbhWiewapUaY+LZGT8R4Jg2TwOjGjG4RKeyrO5p9sBkA==
|
||||
dependencies:
|
||||
"@babel/helper-annotate-as-pure" "^7.0.0"
|
||||
"@babel/helper-module-imports" "^7.0.0"
|
||||
@ -2579,7 +2573,7 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.4.0:
|
||||
resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828"
|
||||
integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==
|
||||
|
||||
bn.js@^5.1.1:
|
||||
bn.js@^5.0.0, bn.js@^5.1.1:
|
||||
version "5.1.3"
|
||||
resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz#beca005408f642ebebea80b042b4d18d2ac0ee6b"
|
||||
integrity sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==
|
||||
@ -2697,11 +2691,11 @@ browserify-des@^1.0.0:
|
||||
safe-buffer "^5.1.2"
|
||||
|
||||
browserify-rsa@^4.0.0, browserify-rsa@^4.0.1:
|
||||
version "4.0.1"
|
||||
resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
|
||||
integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=
|
||||
version "4.1.0"
|
||||
resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d"
|
||||
integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==
|
||||
dependencies:
|
||||
bn.js "^4.1.0"
|
||||
bn.js "^5.0.0"
|
||||
randombytes "^2.0.1"
|
||||
|
||||
browserify-sign@^4.0.0:
|
||||
@ -2736,7 +2730,7 @@ browserslist@4.10.0:
|
||||
node-releases "^1.1.52"
|
||||
pkg-up "^3.1.0"
|
||||
|
||||
browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.14.6, browserslist@^4.6.2, browserslist@^4.6.4, browserslist@^4.9.1:
|
||||
browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.14.7, browserslist@^4.6.2, browserslist@^4.6.4, browserslist@^4.9.1:
|
||||
version "4.14.7"
|
||||
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.7.tgz#c071c1b3622c1c2e790799a37bb09473a4351cb6"
|
||||
integrity sha512-BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ==
|
||||
@ -2942,9 +2936,9 @@ caniuse-api@^3.0.0:
|
||||
lodash.uniq "^4.5.0"
|
||||
|
||||
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001157:
|
||||
version "1.0.30001157"
|
||||
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001157.tgz#2d11aaeb239b340bc1aa730eca18a37fdb07a9ab"
|
||||
integrity sha512-gOerH9Wz2IRZ2ZPdMfBvyOi3cjaz4O4dgNwPGzx8EhqAs4+2IL/O+fJsbt+znSigujoZG8bVcIAUM/I/E5K3MA==
|
||||
version "1.0.30001162"
|
||||
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001162.tgz#9f83aad1f42539ce9aab58bb177598f2f8e22ec6"
|
||||
integrity sha512-E9FktFxaNnp4ky3ucIGzEXLM+Knzlpuq1oN1sFAU0KeayygabGTmOsndpo8QrL4D9pcThlf4D2pUKaDxPCUmVw==
|
||||
|
||||
capture-exit@^2.0.0:
|
||||
version "2.0.0"
|
||||
@ -3411,28 +3405,28 @@ copy-webpack-plugin@^5.1.1:
|
||||
serialize-javascript "^4.0.0"
|
||||
webpack-log "^2.0.0"
|
||||
|
||||
core-js-compat@^3.6.2:
|
||||
version "3.7.0"
|
||||
resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.7.0.tgz#8479c5d3d672d83f1f5ab94cf353e57113e065ed"
|
||||
integrity sha512-V8yBI3+ZLDVomoWICO6kq/CD28Y4r1M7CWeO4AGpMdMfseu8bkSubBmUPySMGKRTS+su4XQ07zUkAsiu9FCWTg==
|
||||
core-js-compat@^3.6.2, core-js-compat@^3.7.0:
|
||||
version "3.8.0"
|
||||
resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.8.0.tgz#3248c6826f4006793bd637db608bca6e4cd688b1"
|
||||
integrity sha512-o9QKelQSxQMYWHXc/Gc4L8bx/4F7TTraE5rhuN8I7mKBt5dBIUpXpIR3omv70ebr8ST5R3PqbDQr+ZI3+Tt1FQ==
|
||||
dependencies:
|
||||
browserslist "^4.14.6"
|
||||
browserslist "^4.14.7"
|
||||
semver "7.0.0"
|
||||
|
||||
core-js-pure@^3.0.0:
|
||||
version "3.7.0"
|
||||
resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.7.0.tgz#28a57c861d5698e053f0ff36905f7a3301b4191e"
|
||||
integrity sha512-EZD2ckZysv8MMt4J6HSvS9K2GdtlZtdBncKAmF9lr2n0c9dJUaUN88PSTjvgwCgQPWKTkERXITgS6JJRAnljtg==
|
||||
version "3.8.0"
|
||||
resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.8.0.tgz#4cdd2eca37d49cda206b66e26204818dba77884a"
|
||||
integrity sha512-fRjhg3NeouotRoIV0L1FdchA6CK7ZD+lyINyMoz19SyV+ROpC4noS1xItWHFtwZdlqfMfVPJEyEGdfri2bD1pA==
|
||||
|
||||
core-js@^2.4.0, core-js@^2.6.4:
|
||||
version "2.6.11"
|
||||
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
|
||||
integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
|
||||
version "2.6.12"
|
||||
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
|
||||
integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
|
||||
|
||||
core-js@^3.5.0:
|
||||
version "3.7.0"
|
||||
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.7.0.tgz#b0a761a02488577afbf97179e4681bf49568520f"
|
||||
integrity sha512-NwS7fI5M5B85EwpWuIwJN4i/fbisQUwLwiSNUWeXlkAZ0sbBjLEvLvFLf1uzAUV66PcEPt4xCGCmOZSxVf3xzA==
|
||||
version "3.8.0"
|
||||
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.0.tgz#0fc2d4941cadf80538b030648bb64d230b4da0ce"
|
||||
integrity sha512-W2VYNB0nwQQE7tKS7HzXd7r2y/y2SVJl4ga6oH/dnaLFzM0o2lB2P3zCkWj5Wc/zyMYjtgd5Hmhk0ObkQFZOIA==
|
||||
|
||||
core-util-is@1.0.2, core-util-is@~1.0.0:
|
||||
version "1.0.2"
|
||||
@ -3670,12 +3664,12 @@ css-tree@1.0.0-alpha.37:
|
||||
mdn-data "2.0.4"
|
||||
source-map "^0.6.1"
|
||||
|
||||
css-tree@^1.0.0:
|
||||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.1.tgz#7726678dfe2a57993a018d9dce519bf1760e3b6d"
|
||||
integrity sha512-WroX+2MvsYcRGP8QA0p+rxzOniT/zpAoQ/DTKDSJzh5T3IQKUkFHeIIfgIapm2uaP178GWY3Mime1qbk8GO/tA==
|
||||
css-tree@^1.1.2:
|
||||
version "1.1.2"
|
||||
resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.2.tgz#9ae393b5dafd7dae8a622475caec78d3d8fbd7b5"
|
||||
integrity sha512-wCoWush5Aeo48GLhfHPbmvZs59Z+M7k5+B1xDnXbdWNcEF423DoFdqSWE0PM5aNk5nI5cp1q7ms36zGApY/sKQ==
|
||||
dependencies:
|
||||
mdn-data "2.0.12"
|
||||
mdn-data "2.0.14"
|
||||
source-map "^0.6.1"
|
||||
|
||||
css-what@2.1:
|
||||
@ -3782,11 +3776,11 @@ cssnano@^4.1.10:
|
||||
postcss "^7.0.0"
|
||||
|
||||
csso@^4.0.2:
|
||||
version "4.1.0"
|
||||
resolved "https://registry.yarnpkg.com/csso/-/csso-4.1.0.tgz#1d31193efa99b87aa6bad6c0cef155e543d09e8b"
|
||||
integrity sha512-h+6w/W1WqXaJA4tb1dk7r5tVbOm97MsKxzwnvOR04UQ6GILroryjMWu3pmCCtL2mLaEStQ0fZgeGiy99mo7iyg==
|
||||
version "4.2.0"
|
||||
resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529"
|
||||
integrity sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==
|
||||
dependencies:
|
||||
css-tree "^1.0.0"
|
||||
css-tree "^1.1.2"
|
||||
|
||||
cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0", cssom@^0.3.4:
|
||||
version "0.3.8"
|
||||
@ -3801,9 +3795,9 @@ cssstyle@^1.0.0, cssstyle@^1.1.1:
|
||||
cssom "0.3.x"
|
||||
|
||||
csstype@^3.0.2:
|
||||
version "3.0.4"
|
||||
resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.4.tgz#b156d7be03b84ff425c9a0a4b1e5f4da9c5ca888"
|
||||
integrity sha512-xc8DUsCLmjvCfoD7LTGE0ou2MIWLx0K9RCZwSHMOdynqRsP4MtUcLeqh1HcQ2dInwDTqn+3CE0/FZh1et+p4jA==
|
||||
version "3.0.5"
|
||||
resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.5.tgz#7fdec6a28a67ae18647c51668a9ff95bb2fa7bb8"
|
||||
integrity sha512-uVDi8LpBUKQj6sdxNaTetL6FpeCqTjOvAQuQUa/qAqq8oOd4ivkbhgnqayl0dnPal8Tb/yB1tF+gOvCBiicaiQ==
|
||||
|
||||
currently-unhandled@^0.4.1:
|
||||
version "0.4.1"
|
||||
@ -3861,16 +3855,16 @@ debug@=3.1.0:
|
||||
ms "2.0.0"
|
||||
|
||||
debug@^3.1.1, debug@^3.2.5:
|
||||
version "3.2.6"
|
||||
resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
|
||||
integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
|
||||
version "3.2.7"
|
||||
resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
|
||||
integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
|
||||
dependencies:
|
||||
ms "^2.1.1"
|
||||
|
||||
debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
|
||||
version "4.2.0"
|
||||
resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1"
|
||||
integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==
|
||||
version "4.3.1"
|
||||
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
|
||||
integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
|
||||
dependencies:
|
||||
ms "2.1.2"
|
||||
|
||||
@ -4234,9 +4228,9 @@ ejs@^2.6.1:
|
||||
integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
|
||||
|
||||
electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.591:
|
||||
version "1.3.593"
|
||||
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.593.tgz#947ccf6dc8e013e2b053d2463ecd1043c164fcef"
|
||||
integrity sha512-GvO7G1ZxvffnMvPCr4A7+iQPVuvpyqMrx2VWSERAjG+pHK6tmO9XqYdBfMIq9corRyi4bNImSDEiDvIoDb8HrA==
|
||||
version "1.3.610"
|
||||
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.610.tgz#1254eb394acd220a836ea1f203f8cded4e487052"
|
||||
integrity sha512-eFDC+yVQpEhtlapk4CYDPfV9ajF9cEof5TBcO49L1ETO+aYogrKWDmYpZyxBScMNe8Bo/gJamH4amQ4yyvXg4g==
|
||||
|
||||
elliptic@^6.5.3:
|
||||
version "6.5.3"
|
||||
@ -4321,7 +4315,7 @@ error-ex@^1.2.0, error-ex@^1.3.1:
|
||||
dependencies:
|
||||
is-arrayish "^0.2.1"
|
||||
|
||||
es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.17.5:
|
||||
es-abstract@^1.17.0-next.1, es-abstract@^1.17.2:
|
||||
version "1.17.7"
|
||||
resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz#a4de61b2f66989fc7421676c1cb9787573ace54c"
|
||||
integrity sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==
|
||||
@ -4401,7 +4395,7 @@ escape-html@~1.0.3:
|
||||
resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
|
||||
integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
|
||||
|
||||
escape-string-regexp@2.0.0:
|
||||
escape-string-regexp@2.0.0, escape-string-regexp@^2.0.0:
|
||||
version "2.0.0"
|
||||
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
|
||||
integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
|
||||
@ -4906,9 +4900,9 @@ file-loader@4.3.0:
|
||||
schema-utils "^2.5.0"
|
||||
|
||||
file-selector@^0.2.2:
|
||||
version "0.2.3"
|
||||
resolved "https://registry.yarnpkg.com/file-selector/-/file-selector-0.2.3.tgz#e2958cdd4366f95e59dc618b95c700abe72ed7a6"
|
||||
integrity sha512-d+hc9ctodLSVG55V2V5I4/eJBEr2p2na/kDN46Ty7PBhdp/Q5NmeQTXKa1Hx3AcIL1lgSFKZI0ve/v5ZXGCDkQ==
|
||||
version "0.2.4"
|
||||
resolved "https://registry.yarnpkg.com/file-selector/-/file-selector-0.2.4.tgz#7b98286f9dbb9925f420130ea5ed0a69238d4d80"
|
||||
integrity sha512-ZDsQNbrv6qRi1YTDOEWzf5J2KjZ9KMI1Q2SGeTkCJmNNW25Jg4TW4UMcmoqcg4WrAyKRcpBXdbWRxkfrOzVRbA==
|
||||
dependencies:
|
||||
tslib "^2.0.3"
|
||||
|
||||
@ -5241,7 +5235,7 @@ get-caller-file@^2.0.1:
|
||||
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
|
||||
integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
|
||||
|
||||
get-intrinsic@^1.0.0:
|
||||
get-intrinsic@^1.0.0, get-intrinsic@^1.0.1:
|
||||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.1.tgz#94a9768fcbdd0595a1c9273aacf4c89d075631be"
|
||||
integrity sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==
|
||||
@ -6071,9 +6065,9 @@ is-color-stop@^1.0.0:
|
||||
rgba-regex "^1.0.0"
|
||||
|
||||
is-core-module@^2.1.0:
|
||||
version "2.1.0"
|
||||
resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.1.0.tgz#a4cc031d9b1aca63eecbd18a650e13cb4eeab946"
|
||||
integrity sha512-YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA==
|
||||
version "2.2.0"
|
||||
resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
|
||||
integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
|
||||
dependencies:
|
||||
has "^1.0.3"
|
||||
|
||||
@ -7212,9 +7206,9 @@ lodash@4.17.19:
|
||||
integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
|
||||
|
||||
loglevel@^1.6.8:
|
||||
version "1.7.0"
|
||||
resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.0.tgz#728166855a740d59d38db01cf46f042caa041bb0"
|
||||
integrity sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==
|
||||
version "1.7.1"
|
||||
resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197"
|
||||
integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==
|
||||
|
||||
loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
|
||||
version "1.4.0"
|
||||
@ -7313,10 +7307,10 @@ md5.js@^1.3.4:
|
||||
inherits "^2.0.1"
|
||||
safe-buffer "^5.1.2"
|
||||
|
||||
mdn-data@2.0.12:
|
||||
version "2.0.12"
|
||||
resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.12.tgz#bbb658d08b38f574bbb88f7b83703defdcc46844"
|
||||
integrity sha512-ULbAlgzVb8IqZ0Hsxm6hHSlQl3Jckst2YEQS7fODu9ilNWy2LvcoSY7TRFIktABP2mdppBioc66va90T+NUs8Q==
|
||||
mdn-data@2.0.14:
|
||||
version "2.0.14"
|
||||
resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
|
||||
integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==
|
||||
|
||||
mdn-data@2.0.4:
|
||||
version "2.0.4"
|
||||
@ -7749,9 +7743,9 @@ node-notifier@^5.4.2:
|
||||
which "^1.3.0"
|
||||
|
||||
node-releases@^1.1.52, node-releases@^1.1.66:
|
||||
version "1.1.66"
|
||||
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.66.tgz#609bd0dc069381015cd982300bae51ab4f1b1814"
|
||||
integrity sha512-JHEQ1iWPGK+38VLB2H9ef2otU4l8s3yAMt9Xf934r6+ojCYDMHPMqvCc9TnzfeFSP1QEOeU6YZEd3+De0LTCgg==
|
||||
version "1.1.67"
|
||||
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.67.tgz#28ebfcccd0baa6aad8e8d4d8fe4cbc49ae239c12"
|
||||
integrity sha512-V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg==
|
||||
|
||||
node-sass@^4.13.0:
|
||||
version "4.14.1"
|
||||
@ -7894,12 +7888,12 @@ object-inspect@^1.8.0:
|
||||
integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==
|
||||
|
||||
object-is@^1.0.1:
|
||||
version "1.1.3"
|
||||
resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.3.tgz#2e3b9e65560137455ee3bd62aec4d90a2ea1cc81"
|
||||
integrity sha512-teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg==
|
||||
version "1.1.4"
|
||||
resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.4.tgz#63d6c83c00a43f4cbc9434eb9757c8a5b8565068"
|
||||
integrity sha512-1ZvAZ4wlF7IyPVOcE1Omikt7UpaFlOQq0HlSti+ZvDH3UiD2brwGMwDbyV43jao2bKJ+4+WdPJHSd7kgzKYVqg==
|
||||
dependencies:
|
||||
call-bind "^1.0.0"
|
||||
define-properties "^1.1.3"
|
||||
es-abstract "^1.18.0-next.1"
|
||||
|
||||
object-keys@^1.0.12, object-keys@^1.1.1:
|
||||
version "1.1.1"
|
||||
@ -7929,31 +7923,33 @@ object.assign@^4.1.0, object.assign@^4.1.1:
|
||||
object-keys "^1.1.1"
|
||||
|
||||
object.entries@^1.1.0, object.entries@^1.1.1:
|
||||
version "1.1.2"
|
||||
resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.2.tgz#bc73f00acb6b6bb16c203434b10f9a7e797d3add"
|
||||
integrity sha512-BQdB9qKmb/HyNdMNWVr7O3+z5MUIx3aiegEIJqjMBbBf0YT9RRxTJSim4mzFqtyr7PDAHigq0N9dO0m0tRakQA==
|
||||
version "1.1.3"
|
||||
resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.3.tgz#c601c7f168b62374541a07ddbd3e2d5e4f7711a6"
|
||||
integrity sha512-ym7h7OZebNS96hn5IJeyUmaWhaSM4SVtAPPfNLQEI2MYWCO2egsITb9nab2+i/Pwibx+R0mtn+ltKJXRSeTMGg==
|
||||
dependencies:
|
||||
call-bind "^1.0.0"
|
||||
define-properties "^1.1.3"
|
||||
es-abstract "^1.17.5"
|
||||
es-abstract "^1.18.0-next.1"
|
||||
has "^1.0.3"
|
||||
|
||||
object.fromentries@^2.0.2:
|
||||
version "2.0.2"
|
||||
resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz#4a09c9b9bb3843dd0f89acdb517a794d4f355ac9"
|
||||
integrity sha512-r3ZiBH7MQppDJVLx6fhD618GKNG40CZYH9wgwdhKxBDDbQgjeWGGd4AtkZad84d291YxvWe7bJGuE65Anh0dxQ==
|
||||
version "2.0.3"
|
||||
resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.3.tgz#13cefcffa702dc67750314a3305e8cb3fad1d072"
|
||||
integrity sha512-IDUSMXs6LOSJBWE++L0lzIbSqHl9KDCfff2x/JSEIDtEUavUnyMYC2ZGay/04Zq4UT8lvd4xNhU4/YHKibAOlw==
|
||||
dependencies:
|
||||
call-bind "^1.0.0"
|
||||
define-properties "^1.1.3"
|
||||
es-abstract "^1.17.0-next.1"
|
||||
function-bind "^1.1.1"
|
||||
es-abstract "^1.18.0-next.1"
|
||||
has "^1.0.3"
|
||||
|
||||
object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.0:
|
||||
version "2.1.0"
|
||||
resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649"
|
||||
integrity sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==
|
||||
version "2.1.1"
|
||||
resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.1.tgz#0dfda8d108074d9c563e80490c883b6661091544"
|
||||
integrity sha512-6DtXgZ/lIZ9hqx4GtZETobXLR/ZLaa0aqV0kzbn80Rf8Z2e/XFnhA0I7p07N2wH8bBBltr2xQPi6sbKWAY2Eng==
|
||||
dependencies:
|
||||
call-bind "^1.0.0"
|
||||
define-properties "^1.1.3"
|
||||
es-abstract "^1.17.0-next.1"
|
||||
es-abstract "^1.18.0-next.1"
|
||||
|
||||
object.pick@^1.3.0:
|
||||
version "1.3.0"
|
||||
@ -7963,13 +7959,13 @@ object.pick@^1.3.0:
|
||||
isobject "^3.0.1"
|
||||
|
||||
object.values@^1.1.0, object.values@^1.1.1:
|
||||
version "1.1.1"
|
||||
resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"
|
||||
integrity sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==
|
||||
version "1.1.2"
|
||||
resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.2.tgz#7a2015e06fcb0f546bd652486ce8583a4731c731"
|
||||
integrity sha512-MYC0jvJopr8EK6dPBiO8Nb9mvjdypOachO5REGk6MXzujbBrAisKo3HmdEI6kZDL6fC31Mwee/5YbtMebixeag==
|
||||
dependencies:
|
||||
call-bind "^1.0.0"
|
||||
define-properties "^1.1.3"
|
||||
es-abstract "^1.17.0-next.1"
|
||||
function-bind "^1.1.1"
|
||||
es-abstract "^1.18.0-next.1"
|
||||
has "^1.0.3"
|
||||
|
||||
obuf@^1.0.0, obuf@^1.1.2:
|
||||
@ -9412,9 +9408,9 @@ rc-util@^4.15.3, rc-util@^4.5.1:
|
||||
shallowequal "^1.1.0"
|
||||
|
||||
re-resizable@^6.7.0:
|
||||
version "6.8.0"
|
||||
resolved "https://registry.yarnpkg.com/re-resizable/-/re-resizable-6.8.0.tgz#8a99d98a37032276aea62c1c344612f7e8ddc506"
|
||||
integrity sha512-MffuegFHq5juSvLTe/lecTikc2DqIsLjrTAAZ44goPcNavjYgiCqwJa5RydGPsDOZ+OUZAZk1DP9S4AEu0Q1fQ==
|
||||
version "6.9.0"
|
||||
resolved "https://registry.yarnpkg.com/re-resizable/-/re-resizable-6.9.0.tgz#9c3059b389ced6ade602234cc5bb1e12d231cd47"
|
||||
integrity sha512-3cUDG81ylyqI0Pdgle/RHwwRYq0ORZzsUaySOCO8IbEtNyaRtrIHYm/jMQ5pjcNiKCxR3vsSymIQZHwJq4gg2Q==
|
||||
dependencies:
|
||||
fast-memoize "^2.5.1"
|
||||
|
||||
@ -9665,9 +9661,9 @@ react-scripts@3.4.3:
|
||||
fsevents "2.1.2"
|
||||
|
||||
react-svg@^11.0.9:
|
||||
version "11.1.1"
|
||||
resolved "https://registry.yarnpkg.com/react-svg/-/react-svg-11.1.1.tgz#0e9b11fbf0efc7df347d8f268e8d77fd9d022a3a"
|
||||
integrity sha512-bqj+2C/niy/V519ABD3fUD9+T33DiDUUUuu39d2O9G2RXTXSFHqA7zU7DEjF+yadMXmEbe0+NlNSZimHWN5jew==
|
||||
version "11.1.3"
|
||||
resolved "https://registry.yarnpkg.com/react-svg/-/react-svg-11.1.3.tgz#14c3f1552b0893319e7466e22797cf7f08a3bfb8"
|
||||
integrity sha512-OSrg4mVXgGK+Qypraa0d68bI8e6ubcBGes9lqcaMdSgPjfrzFTe4yaG94UdROwk5JvFVLKTquc4lRuvqOY92KQ==
|
||||
dependencies:
|
||||
"@babel/runtime" "^7.12.5"
|
||||
"@tanem/svg-injector" "^8.1.0"
|
||||
@ -10555,7 +10551,7 @@ shellwords@^0.1.1:
|
||||
resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
|
||||
integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
|
||||
|
||||
side-channel@^1.0.2:
|
||||
side-channel@^1.0.2, side-channel@^1.0.3:
|
||||
version "1.0.3"
|
||||
resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.3.tgz#cdc46b057550bbab63706210838df5d4c19519c3"
|
||||
integrity sha512-A6+ByhlLkksFoUepsGxfj5x1gTSrs+OydsRptUxeNCabQpCFUvcwIczgOigI8vhY/OJCnPnyE9rGiwgvr9cS1g==
|
||||
@ -10745,9 +10741,9 @@ spdx-expression-parse@^3.0.0:
|
||||
spdx-license-ids "^3.0.0"
|
||||
|
||||
spdx-license-ids@^3.0.0:
|
||||
version "3.0.6"
|
||||
resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz#c80757383c28abf7296744998cbc106ae8b854ce"
|
||||
integrity sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw==
|
||||
version "3.0.7"
|
||||
resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65"
|
||||
integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==
|
||||
|
||||
spdy-transport@^3.0.0:
|
||||
version "3.0.0"
|
||||
@ -10820,9 +10816,11 @@ stable@^0.1.8:
|
||||
integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==
|
||||
|
||||
stack-utils@^1.0.1:
|
||||
version "1.0.2"
|
||||
resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8"
|
||||
integrity sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA==
|
||||
version "1.0.4"
|
||||
resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.4.tgz#4b600971dcfc6aed0cbdf2a8268177cc916c87c8"
|
||||
integrity sha512-IPDJfugEGbfizBwBZRZ3xpccMdRyP5lqsBWXGQWimVjua/ccLCeMOAVjlc1R7LxFjo5sEDhyNIXd8mo/AiDS9w==
|
||||
dependencies:
|
||||
escape-string-regexp "^2.0.0"
|
||||
|
||||
static-extend@^0.1.1:
|
||||
version "0.1.2"
|
||||
@ -10938,32 +10936,33 @@ string-width@^4.1.0:
|
||||
strip-ansi "^6.0.0"
|
||||
|
||||
string.prototype.matchall@^4.0.2:
|
||||
version "4.0.2"
|
||||
resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz#48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e"
|
||||
integrity sha512-N/jp6O5fMf9os0JU3E72Qhf590RSRZU/ungsL/qJUYVTNv7hTG0P/dbPjxINVN9jpscu3nzYwKESU3P3RY5tOg==
|
||||
version "4.0.3"
|
||||
resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.3.tgz#24243399bc31b0a49d19e2b74171a15653ec996a"
|
||||
integrity sha512-OBxYDA2ifZQ2e13cP82dWFMaCV9CGF8GzmN4fljBVw5O5wep0lu4gacm1OL6MjROoUnB8VbkWRThqkV2YFLNxw==
|
||||
dependencies:
|
||||
call-bind "^1.0.0"
|
||||
define-properties "^1.1.3"
|
||||
es-abstract "^1.17.0"
|
||||
es-abstract "^1.18.0-next.1"
|
||||
has-symbols "^1.0.1"
|
||||
internal-slot "^1.0.2"
|
||||
regexp.prototype.flags "^1.3.0"
|
||||
side-channel "^1.0.2"
|
||||
side-channel "^1.0.3"
|
||||
|
||||
string.prototype.trimend@^1.0.1:
|
||||
version "1.0.2"
|
||||
resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz#6ddd9a8796bc714b489a3ae22246a208f37bfa46"
|
||||
integrity sha512-8oAG/hi14Z4nOVP0z6mdiVZ/wqjDtWSLygMigTzAb+7aPEDTleeFf+WrF+alzecxIRkckkJVn+dTlwzJXORATw==
|
||||
version "1.0.3"
|
||||
resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz#a22bd53cca5c7cf44d7c9d5c732118873d6cd18b"
|
||||
integrity sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==
|
||||
dependencies:
|
||||
call-bind "^1.0.0"
|
||||
define-properties "^1.1.3"
|
||||
es-abstract "^1.18.0-next.1"
|
||||
|
||||
string.prototype.trimstart@^1.0.1:
|
||||
version "1.0.2"
|
||||
resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz#22d45da81015309cd0cdd79787e8919fc5c613e7"
|
||||
integrity sha512-7F6CdBTl5zyu30BJFdzSTlSlLPwODC23Od+iLoVH8X6+3fvDPPuBVVj9iaB1GOsSTSIgVfsfm27R2FGrAPznWg==
|
||||
version "1.0.3"
|
||||
resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz#9b4cb590e123bb36564401d59824298de50fd5aa"
|
||||
integrity sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==
|
||||
dependencies:
|
||||
call-bind "^1.0.0"
|
||||
define-properties "^1.1.3"
|
||||
es-abstract "^1.18.0-next.1"
|
||||
|
||||
string_decoder@^1.0.0, string_decoder@^1.1.1:
|
||||
version "1.3.0"
|
||||
|
||||
@ -48,6 +48,13 @@ namespace ASC.Web.Api.Controllers
|
||||
EmailValidationKeyModelHelper = emailValidationKeyModelHelper;
|
||||
}
|
||||
|
||||
|
||||
[Read]
|
||||
public bool GetIsAuthentificated()
|
||||
{
|
||||
return SecurityContext.IsAuthenticated;
|
||||
}
|
||||
|
||||
[Create(false)]
|
||||
public AuthenticationTokenData AuthenticateMeFromBody([FromBody] AuthModel auth)
|
||||
{
|
||||
@ -61,6 +68,26 @@ namespace ASC.Web.Api.Controllers
|
||||
return AuthenticateMe(auth);
|
||||
}
|
||||
|
||||
[Create("logout")]
|
||||
public void Logout()
|
||||
{
|
||||
CookiesManager.ClearCookies(CookiesType.AuthKey);
|
||||
CookiesManager.ClearCookies(CookiesType.SocketIO);
|
||||
}
|
||||
|
||||
[Create("confirm", false)]
|
||||
public ValidationResult CheckConfirmFromBody([FromBody] EmailValidationKeyModel model)
|
||||
{
|
||||
return EmailValidationKeyModelHelper.Validate(model);
|
||||
}
|
||||
|
||||
[Create("confirm", false)]
|
||||
[Consumes("application/x-www-form-urlencoded")]
|
||||
public ValidationResult CheckConfirmFromForm([FromForm] EmailValidationKeyModel model)
|
||||
{
|
||||
return EmailValidationKeyModelHelper.Validate(model);
|
||||
}
|
||||
|
||||
private AuthenticationTokenData AuthenticateMe(AuthModel auth)
|
||||
{
|
||||
var tenant = TenantManager.GetCurrentTenant();
|
||||
@ -84,28 +111,6 @@ namespace ASC.Web.Api.Controllers
|
||||
}
|
||||
}
|
||||
|
||||
[Create("logout")]
|
||||
public void Logout()
|
||||
{
|
||||
CookiesManager.ClearCookies(CookiesType.AuthKey);
|
||||
CookiesManager.ClearCookies(CookiesType.SocketIO);
|
||||
}
|
||||
|
||||
[AllowAnonymous]
|
||||
[Create("confirm", false)]
|
||||
public ValidationResult CheckConfirmFromBody([FromBody] EmailValidationKeyModel model)
|
||||
{
|
||||
return EmailValidationKeyModelHelper.Validate(model);
|
||||
}
|
||||
|
||||
[AllowAnonymous]
|
||||
[Create("confirm", false)]
|
||||
[Consumes("application/x-www-form-urlencoded")]
|
||||
public ValidationResult CheckConfirmFromForm([FromForm] EmailValidationKeyModel model)
|
||||
{
|
||||
return EmailValidationKeyModelHelper.Validate(model);
|
||||
}
|
||||
|
||||
private UserInfo GetUser(int tenantId, AuthModel memberModel)
|
||||
{
|
||||
memberModel.PasswordHash = (memberModel.PasswordHash ?? "").Trim();
|
||||
|
||||
@ -65,8 +65,8 @@
|
||||
"ChooseOwner": "Choose owner",
|
||||
"DnsChangeMsg": "A link to confirm the operation has been sent to {{email}} (the email address of the portal owner).",
|
||||
"AccessRightsChangeOwnerConfirmText": "Changes will be applied after the confirmation via email.",
|
||||
"NotFoundTitle": "No results matching your search could be found",
|
||||
"NotFoundDescription": "No people matching your filter can be displayed in this section. Please select other filter options or clear filter to view all the people in this section.",
|
||||
"NotFoundTitle": "Nothing found",
|
||||
"NotFoundDescription": "Change filter settings or add people to the section.",
|
||||
"ClearButton": "Reset filter",
|
||||
"ProductUserOpportunities": "View profiles and groups",
|
||||
"LearnMore": "Learn more...",
|
||||
|
||||
@ -64,8 +64,8 @@
|
||||
"ChooseOwner": "Выбрать владельца",
|
||||
"DnsChangeMsg": "Ссылка для подтверждения операции была отправлена на {{email}} (адрес электронной почты владельца портала).",
|
||||
"AccessRightsChangeOwnerConfirmText": "Изменения будут применены после подтверждения по электронной почте.",
|
||||
"NotFoundTitle": "Результатов, соответствующих заданным критериям, не найдено",
|
||||
"NotFoundDescription": "В данном разделе нет людей, соответствующих фильтру. Пожалуйста, выберите другие параметры или очистите фильтр, чтобы просмотреть всех людей в этом разделе.",
|
||||
"NotFoundTitle": "Ничего не найдено",
|
||||
"NotFoundDescription": "Измените настройки фильтра или добавьте людей в раздел.",
|
||||
"ClearButton": "Сбросить фильтр",
|
||||
"LearnMore": "Подробнее...",
|
||||
"AccessRightsChangeOwnerButtonText": "Сменить владельца портала",
|
||||
|
||||
@ -24,10 +24,10 @@
|
||||
dependencies:
|
||||
"@babel/highlight" "^7.10.4"
|
||||
|
||||
"@babel/compat-data@^7.12.1", "@babel/compat-data@^7.12.5", "@babel/compat-data@^7.9.0":
|
||||
version "7.12.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.5.tgz#f56db0c4bb1bbbf221b4e81345aab4141e7cb0e9"
|
||||
integrity sha512-DTsS7cxrsH3by8nqQSpFSyjSfSYl57D6Cf4q8dW3LK83tBKBDCkfcay1nYkXq1nIHXnpX8WMMb/O25HOy3h1zg==
|
||||
"@babel/compat-data@^7.12.5", "@babel/compat-data@^7.12.7", "@babel/compat-data@^7.9.0":
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.7.tgz#9329b4782a7d6bbd7eef57e11addf91ee3ef1e41"
|
||||
integrity sha512-YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw==
|
||||
|
||||
"@babel/core@7.9.0":
|
||||
version "7.9.0"
|
||||
@ -52,18 +52,18 @@
|
||||
source-map "^0.5.0"
|
||||
|
||||
"@babel/core@^7.1.0", "@babel/core@^7.4.5", "@babel/core@^7.8.4":
|
||||
version "7.12.3"
|
||||
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.3.tgz#1b436884e1e3bff6fb1328dc02b208759de92ad8"
|
||||
integrity sha512-0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g==
|
||||
version "7.12.9"
|
||||
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.9.tgz#fd450c4ec10cdbb980e2928b7aa7a28484593fc8"
|
||||
integrity sha512-gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ==
|
||||
dependencies:
|
||||
"@babel/code-frame" "^7.10.4"
|
||||
"@babel/generator" "^7.12.1"
|
||||
"@babel/generator" "^7.12.5"
|
||||
"@babel/helper-module-transforms" "^7.12.1"
|
||||
"@babel/helpers" "^7.12.1"
|
||||
"@babel/parser" "^7.12.3"
|
||||
"@babel/template" "^7.10.4"
|
||||
"@babel/traverse" "^7.12.1"
|
||||
"@babel/types" "^7.12.1"
|
||||
"@babel/helpers" "^7.12.5"
|
||||
"@babel/parser" "^7.12.7"
|
||||
"@babel/template" "^7.12.7"
|
||||
"@babel/traverse" "^7.12.9"
|
||||
"@babel/types" "^7.12.7"
|
||||
convert-source-map "^1.7.0"
|
||||
debug "^4.1.0"
|
||||
gensync "^1.0.0-beta.1"
|
||||
@ -73,7 +73,7 @@
|
||||
semver "^5.4.1"
|
||||
source-map "^0.5.0"
|
||||
|
||||
"@babel/generator@^7.12.1", "@babel/generator@^7.12.5", "@babel/generator@^7.4.0", "@babel/generator@^7.9.0":
|
||||
"@babel/generator@^7.12.5", "@babel/generator@^7.4.0", "@babel/generator@^7.9.0":
|
||||
version "7.12.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.5.tgz#a2c50de5c8b6d708ab95be5e6053936c1884a4de"
|
||||
integrity sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==
|
||||
@ -97,7 +97,7 @@
|
||||
"@babel/helper-explode-assignable-expression" "^7.10.4"
|
||||
"@babel/types" "^7.10.4"
|
||||
|
||||
"@babel/helper-builder-react-jsx-experimental@^7.12.1":
|
||||
"@babel/helper-builder-react-jsx-experimental@^7.12.4":
|
||||
version "7.12.4"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.4.tgz#55fc1ead5242caa0ca2875dcb8eed6d311e50f48"
|
||||
integrity sha512-AjEa0jrQqNk7eDQOo0pTfUOwQBMF+xVqrausQwT9/rTKy0g04ggFNaJpaE09IQMn9yExluigWMJcj0WC7bq+Og==
|
||||
@ -114,7 +114,7 @@
|
||||
"@babel/helper-annotate-as-pure" "^7.10.4"
|
||||
"@babel/types" "^7.10.4"
|
||||
|
||||
"@babel/helper-compilation-targets@^7.12.1", "@babel/helper-compilation-targets@^7.8.7":
|
||||
"@babel/helper-compilation-targets@^7.12.5", "@babel/helper-compilation-targets@^7.8.7":
|
||||
version "7.12.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz#cb470c76198db6a24e9dbc8987275631e5d29831"
|
||||
integrity sha512-+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw==
|
||||
@ -136,12 +136,11 @@
|
||||
"@babel/helper-split-export-declaration" "^7.10.4"
|
||||
|
||||
"@babel/helper-create-regexp-features-plugin@^7.12.1":
|
||||
version "7.12.1"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.1.tgz#18b1302d4677f9dc4740fe8c9ed96680e29d37e8"
|
||||
integrity sha512-rsZ4LGvFTZnzdNZR5HZdmJVuXK8834R5QkF3WvcnBhrlVtF0HSIUC6zbreL9MgjTywhKokn8RIYRiq99+DLAxA==
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.7.tgz#2084172e95443fa0a09214ba1bb328f9aea1278f"
|
||||
integrity sha512-idnutvQPdpbduutvi3JVfEgcVIHooQnhvhx0Nk9isOINOIGYkZea1Pk2JlJRiUnMefrlvr0vkByATBY/mB4vjQ==
|
||||
dependencies:
|
||||
"@babel/helper-annotate-as-pure" "^7.10.4"
|
||||
"@babel/helper-regex" "^7.10.4"
|
||||
regexpu-core "^4.7.1"
|
||||
|
||||
"@babel/helper-define-map@^7.10.4":
|
||||
@ -184,13 +183,13 @@
|
||||
"@babel/types" "^7.10.4"
|
||||
|
||||
"@babel/helper-member-expression-to-functions@^7.12.1":
|
||||
version "7.12.1"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz#fba0f2fcff3fba00e6ecb664bb5e6e26e2d6165c"
|
||||
integrity sha512-k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz#aa77bd0396ec8114e5e30787efa78599d874a855"
|
||||
integrity sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==
|
||||
dependencies:
|
||||
"@babel/types" "^7.12.1"
|
||||
"@babel/types" "^7.12.7"
|
||||
|
||||
"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.8.3":
|
||||
"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.12.5", "@babel/helper-module-imports@^7.8.3":
|
||||
version "7.12.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz#1bfc0229f794988f76ed0a4d4e90860850b54dfb"
|
||||
integrity sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==
|
||||
@ -213,24 +212,17 @@
|
||||
lodash "^4.17.19"
|
||||
|
||||
"@babel/helper-optimise-call-expression@^7.10.4":
|
||||
version "7.10.4"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz#50dc96413d594f995a77905905b05893cd779673"
|
||||
integrity sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.7.tgz#7f94ae5e08721a49467346aa04fd22f750033b9c"
|
||||
integrity sha512-I5xc9oSJ2h59OwyUqjv95HRyzxj53DAubUERgQMrpcCEYQyToeHA+NEcUEsVWB4j53RDeskeBJ0SgRAYHDBckw==
|
||||
dependencies:
|
||||
"@babel/types" "^7.10.4"
|
||||
"@babel/types" "^7.12.7"
|
||||
|
||||
"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
|
||||
version "7.10.4"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375"
|
||||
integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==
|
||||
|
||||
"@babel/helper-regex@^7.10.4":
|
||||
version "7.10.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.5.tgz#32dfbb79899073c415557053a19bd055aae50ae0"
|
||||
integrity sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==
|
||||
dependencies:
|
||||
lodash "^4.17.19"
|
||||
|
||||
"@babel/helper-remap-async-to-generator@^7.12.1":
|
||||
version "7.12.1"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz#8c4dbbf916314f6047dc05e6a2217074238347fd"
|
||||
@ -291,7 +283,7 @@
|
||||
"@babel/traverse" "^7.10.4"
|
||||
"@babel/types" "^7.10.4"
|
||||
|
||||
"@babel/helpers@^7.12.1", "@babel/helpers@^7.9.0":
|
||||
"@babel/helpers@^7.12.5", "@babel/helpers@^7.9.0":
|
||||
version "7.12.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.5.tgz#1a1ba4a768d9b58310eda516c449913fe647116e"
|
||||
integrity sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA==
|
||||
@ -309,10 +301,10 @@
|
||||
chalk "^2.0.0"
|
||||
js-tokens "^4.0.0"
|
||||
|
||||
"@babel/parser@^7.1.0", "@babel/parser@^7.10.4", "@babel/parser@^7.12.3", "@babel/parser@^7.12.5", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.9.0":
|
||||
version "7.12.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.5.tgz#b4af32ddd473c0bfa643bd7ff0728b8e71b81ea0"
|
||||
integrity sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==
|
||||
"@babel/parser@^7.1.0", "@babel/parser@^7.12.7", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.9.0":
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.7.tgz#fee7b39fe809d0e73e5b25eecaf5780ef3d73056"
|
||||
integrity sha512-oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg==
|
||||
|
||||
"@babel/plugin-proposal-async-generator-functions@^7.12.1", "@babel/plugin-proposal-async-generator-functions@^7.8.3":
|
||||
version "7.12.1"
|
||||
@ -404,10 +396,10 @@
|
||||
"@babel/helper-plugin-utils" "^7.8.3"
|
||||
"@babel/plugin-syntax-numeric-separator" "^7.8.3"
|
||||
|
||||
"@babel/plugin-proposal-numeric-separator@^7.12.1", "@babel/plugin-proposal-numeric-separator@^7.8.3":
|
||||
version "7.12.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.5.tgz#b1ce757156d40ed79d59d467cb2b154a5c4149ba"
|
||||
integrity sha512-UiAnkKuOrCyjZ3sYNHlRlfuZJbBHknMQ9VMwVeX97Ofwx7RpD6gS2HfqTCh8KNUQgcOm8IKt103oR4KIjh7Q8g==
|
||||
"@babel/plugin-proposal-numeric-separator@^7.12.7", "@babel/plugin-proposal-numeric-separator@^7.8.3":
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz#8bf253de8139099fea193b297d23a9d406ef056b"
|
||||
integrity sha512-8c+uy0qmnRTeukiGsjLGy6uVs/TFjJchGXUeBqlG4VWYOdJWkhhVPdQ3uHwbmalfJwv2JsV0qffXP4asRfL2SQ==
|
||||
dependencies:
|
||||
"@babel/helper-plugin-utils" "^7.10.4"
|
||||
"@babel/plugin-syntax-numeric-separator" "^7.10.4"
|
||||
@ -437,10 +429,10 @@
|
||||
"@babel/helper-plugin-utils" "^7.8.3"
|
||||
"@babel/plugin-syntax-optional-chaining" "^7.8.0"
|
||||
|
||||
"@babel/plugin-proposal-optional-chaining@^7.12.1", "@babel/plugin-proposal-optional-chaining@^7.9.0":
|
||||
version "7.12.1"
|
||||
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.1.tgz#cce122203fc8a32794296fc377c6dedaf4363797"
|
||||
integrity sha512-c2uRpY6WzaVDzynVY9liyykS+kVU+WRZPMPYpkelXH8KBt1oXoI89kPbZKKG/jDT5UK92FTW2fZkZaJhdiBabw==
|
||||
"@babel/plugin-proposal-optional-chaining@^7.12.7", "@babel/plugin-proposal-optional-chaining@^7.9.0":
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz#e02f0ea1b5dc59d401ec16fb824679f683d3303c"
|
||||
integrity sha512-4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA==
|
||||
dependencies:
|
||||
"@babel/helper-plugin-utils" "^7.10.4"
|
||||
"@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
|
||||
@ -787,12 +779,12 @@
|
||||
dependencies:
|
||||
"@babel/helper-plugin-utils" "^7.10.4"
|
||||
|
||||
"@babel/plugin-transform-react-jsx-development@^7.12.5", "@babel/plugin-transform-react-jsx-development@^7.9.0":
|
||||
version "7.12.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.5.tgz#677de5b96da310430d6cfb7fee16a1603afa3d56"
|
||||
integrity sha512-1JJusg3iPgsZDthyWiCr3KQiGs31ikU/mSf2N2dSYEAO0GEImmVUbWf0VoSDGDFTAn5Dj4DUiR6SdIXHY7tELA==
|
||||
"@babel/plugin-transform-react-jsx-development@^7.12.7", "@babel/plugin-transform-react-jsx-development@^7.9.0":
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.7.tgz#4c2a647de79c7e2b16bfe4540677ba3121e82a08"
|
||||
integrity sha512-Rs3ETtMtR3VLXFeYRChle5SsP/P9Jp/6dsewBQfokDSzKJThlsuFcnzLTDRALiUmTC48ej19YD9uN1mupEeEDg==
|
||||
dependencies:
|
||||
"@babel/helper-builder-react-jsx-experimental" "^7.12.1"
|
||||
"@babel/helper-builder-react-jsx-experimental" "^7.12.4"
|
||||
"@babel/helper-plugin-utils" "^7.10.4"
|
||||
"@babel/plugin-syntax-jsx" "^7.12.1"
|
||||
|
||||
@ -810,13 +802,13 @@
|
||||
dependencies:
|
||||
"@babel/helper-plugin-utils" "^7.10.4"
|
||||
|
||||
"@babel/plugin-transform-react-jsx@^7.12.5", "@babel/plugin-transform-react-jsx@^7.9.1":
|
||||
version "7.12.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.5.tgz#39ede0e30159770561b6963be143e40af3bde00c"
|
||||
integrity sha512-2xkcPqqrYiOQgSlM/iwto1paPijjsDbUynN13tI6bosDz/jOW3CRzYguIE8wKX32h+msbBM22Dv5fwrFkUOZjQ==
|
||||
"@babel/plugin-transform-react-jsx@^7.12.7", "@babel/plugin-transform-react-jsx@^7.9.1":
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.7.tgz#8b14d45f6eccd41b7f924bcb65c021e9f0a06f7f"
|
||||
integrity sha512-YFlTi6MEsclFAPIDNZYiCRbneg1MFGao9pPG9uD5htwE0vDbPaMUMeYd6itWjw7K4kro4UbdQf3ljmFl9y48dQ==
|
||||
dependencies:
|
||||
"@babel/helper-builder-react-jsx" "^7.10.4"
|
||||
"@babel/helper-builder-react-jsx-experimental" "^7.12.1"
|
||||
"@babel/helper-builder-react-jsx-experimental" "^7.12.4"
|
||||
"@babel/helper-plugin-utils" "^7.10.4"
|
||||
"@babel/plugin-syntax-jsx" "^7.12.1"
|
||||
|
||||
@ -867,13 +859,12 @@
|
||||
"@babel/helper-plugin-utils" "^7.10.4"
|
||||
"@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
|
||||
|
||||
"@babel/plugin-transform-sticky-regex@^7.12.1", "@babel/plugin-transform-sticky-regex@^7.8.3":
|
||||
version "7.12.1"
|
||||
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.1.tgz#5c24cf50de396d30e99afc8d1c700e8bce0f5caf"
|
||||
integrity sha512-CiUgKQ3AGVk7kveIaPEET1jNDhZZEl1RPMWdTBE1799bdz++SwqDHStmxfCtDfBhQgCl38YRiSnrMuUMZIWSUQ==
|
||||
"@babel/plugin-transform-sticky-regex@^7.12.7", "@babel/plugin-transform-sticky-regex@^7.8.3":
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz#560224613ab23987453948ed21d0b0b193fa7fad"
|
||||
integrity sha512-VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg==
|
||||
dependencies:
|
||||
"@babel/helper-plugin-utils" "^7.10.4"
|
||||
"@babel/helper-regex" "^7.10.4"
|
||||
|
||||
"@babel/plugin-transform-template-literals@^7.12.1", "@babel/plugin-transform-template-literals@^7.8.3":
|
||||
version "7.12.1"
|
||||
@ -980,13 +971,13 @@
|
||||
semver "^5.5.0"
|
||||
|
||||
"@babel/preset-env@^7.4.5", "@babel/preset-env@^7.8.4":
|
||||
version "7.12.1"
|
||||
resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.1.tgz#9c7e5ca82a19efc865384bb4989148d2ee5d7ac2"
|
||||
integrity sha512-H8kxXmtPaAGT7TyBvSSkoSTUK6RHh61So05SyEbpmr0MCZrsNYn7mGMzzeYoOUCdHzww61k8XBft2TaES+xPLg==
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.7.tgz#54ea21dbe92caf6f10cb1a0a576adc4ebf094b55"
|
||||
integrity sha512-OnNdfAr1FUQg7ksb7bmbKoby4qFOHw6DKWWUNB9KqnnCldxhxJlP+21dpyaWFmf2h0rTbOkXJtAGevY3XW1eew==
|
||||
dependencies:
|
||||
"@babel/compat-data" "^7.12.1"
|
||||
"@babel/helper-compilation-targets" "^7.12.1"
|
||||
"@babel/helper-module-imports" "^7.12.1"
|
||||
"@babel/compat-data" "^7.12.7"
|
||||
"@babel/helper-compilation-targets" "^7.12.5"
|
||||
"@babel/helper-module-imports" "^7.12.5"
|
||||
"@babel/helper-plugin-utils" "^7.10.4"
|
||||
"@babel/helper-validator-option" "^7.12.1"
|
||||
"@babel/plugin-proposal-async-generator-functions" "^7.12.1"
|
||||
@ -996,10 +987,10 @@
|
||||
"@babel/plugin-proposal-json-strings" "^7.12.1"
|
||||
"@babel/plugin-proposal-logical-assignment-operators" "^7.12.1"
|
||||
"@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1"
|
||||
"@babel/plugin-proposal-numeric-separator" "^7.12.1"
|
||||
"@babel/plugin-proposal-numeric-separator" "^7.12.7"
|
||||
"@babel/plugin-proposal-object-rest-spread" "^7.12.1"
|
||||
"@babel/plugin-proposal-optional-catch-binding" "^7.12.1"
|
||||
"@babel/plugin-proposal-optional-chaining" "^7.12.1"
|
||||
"@babel/plugin-proposal-optional-chaining" "^7.12.7"
|
||||
"@babel/plugin-proposal-private-methods" "^7.12.1"
|
||||
"@babel/plugin-proposal-unicode-property-regex" "^7.12.1"
|
||||
"@babel/plugin-syntax-async-generators" "^7.8.0"
|
||||
@ -1041,14 +1032,14 @@
|
||||
"@babel/plugin-transform-reserved-words" "^7.12.1"
|
||||
"@babel/plugin-transform-shorthand-properties" "^7.12.1"
|
||||
"@babel/plugin-transform-spread" "^7.12.1"
|
||||
"@babel/plugin-transform-sticky-regex" "^7.12.1"
|
||||
"@babel/plugin-transform-sticky-regex" "^7.12.7"
|
||||
"@babel/plugin-transform-template-literals" "^7.12.1"
|
||||
"@babel/plugin-transform-typeof-symbol" "^7.12.1"
|
||||
"@babel/plugin-transform-unicode-escapes" "^7.12.1"
|
||||
"@babel/plugin-transform-unicode-regex" "^7.12.1"
|
||||
"@babel/preset-modules" "^0.1.3"
|
||||
"@babel/types" "^7.12.1"
|
||||
core-js-compat "^3.6.2"
|
||||
"@babel/types" "^7.12.7"
|
||||
core-js-compat "^3.7.0"
|
||||
semver "^5.5.0"
|
||||
|
||||
"@babel/preset-modules@^0.1.3":
|
||||
@ -1075,14 +1066,14 @@
|
||||
"@babel/plugin-transform-react-jsx-source" "^7.9.0"
|
||||
|
||||
"@babel/preset-react@^7.0.0":
|
||||
version "7.12.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.5.tgz#d45625f65d53612078a43867c5c6750e78772c56"
|
||||
integrity sha512-jcs++VPrgyFehkMezHtezS2BpnUlR7tQFAyesJn1vGTO9aTFZrgIQrA5YydlTwxbcjMwkFY6i04flCigRRr3GA==
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.7.tgz#36d61d83223b07b6ac4ec55cf016abb0f70be83b"
|
||||
integrity sha512-wKeTdnGUP5AEYCYQIMeXMMwU7j+2opxrG0WzuZfxuuW9nhKvvALBjl67653CWamZJVefuJGI219G591RSldrqQ==
|
||||
dependencies:
|
||||
"@babel/helper-plugin-utils" "^7.10.4"
|
||||
"@babel/plugin-transform-react-display-name" "^7.12.1"
|
||||
"@babel/plugin-transform-react-jsx" "^7.12.5"
|
||||
"@babel/plugin-transform-react-jsx-development" "^7.12.5"
|
||||
"@babel/plugin-transform-react-jsx" "^7.12.7"
|
||||
"@babel/plugin-transform-react-jsx-development" "^7.12.7"
|
||||
"@babel/plugin-transform-react-jsx-self" "^7.12.1"
|
||||
"@babel/plugin-transform-react-jsx-source" "^7.12.1"
|
||||
"@babel/plugin-transform-react-pure-annotations" "^7.12.1"
|
||||
@ -1117,34 +1108,34 @@
|
||||
dependencies:
|
||||
regenerator-runtime "^0.13.4"
|
||||
|
||||
"@babel/template@^7.10.4", "@babel/template@^7.4.0", "@babel/template@^7.8.6":
|
||||
version "7.10.4"
|
||||
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278"
|
||||
integrity sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==
|
||||
"@babel/template@^7.10.4", "@babel/template@^7.12.7", "@babel/template@^7.4.0", "@babel/template@^7.8.6":
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc"
|
||||
integrity sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==
|
||||
dependencies:
|
||||
"@babel/code-frame" "^7.10.4"
|
||||
"@babel/parser" "^7.10.4"
|
||||
"@babel/types" "^7.10.4"
|
||||
"@babel/parser" "^7.12.7"
|
||||
"@babel/types" "^7.12.7"
|
||||
|
||||
"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.5", "@babel/traverse@^7.4.3", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.9.0":
|
||||
version "7.12.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.5.tgz#78a0c68c8e8a35e4cacfd31db8bb303d5606f095"
|
||||
integrity sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==
|
||||
"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.5", "@babel/traverse@^7.12.9", "@babel/traverse@^7.4.3", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.9.0":
|
||||
version "7.12.9"
|
||||
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.9.tgz#fad26c972eabbc11350e0b695978de6cc8e8596f"
|
||||
integrity sha512-iX9ajqnLdoU1s1nHt36JDI9KG4k+vmI8WgjK5d+aDTwQbL2fUnzedNedssA645Ede3PM2ma1n8Q4h2ohwXgMXw==
|
||||
dependencies:
|
||||
"@babel/code-frame" "^7.10.4"
|
||||
"@babel/generator" "^7.12.5"
|
||||
"@babel/helper-function-name" "^7.10.4"
|
||||
"@babel/helper-split-export-declaration" "^7.11.0"
|
||||
"@babel/parser" "^7.12.5"
|
||||
"@babel/types" "^7.12.5"
|
||||
"@babel/parser" "^7.12.7"
|
||||
"@babel/types" "^7.12.7"
|
||||
debug "^4.1.0"
|
||||
globals "^11.1.0"
|
||||
lodash "^4.17.19"
|
||||
|
||||
"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.5", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.9.0":
|
||||
version "7.12.6"
|
||||
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.6.tgz#ae0e55ef1cce1fbc881cd26f8234eb3e657edc96"
|
||||
integrity sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==
|
||||
"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.9.0":
|
||||
version "7.12.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.7.tgz#6039ff1e242640a29452c9ae572162ec9a8f5d13"
|
||||
integrity sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ==
|
||||
dependencies:
|
||||
"@babel/helper-validator-identifier" "^7.10.4"
|
||||
lodash "^4.17.19"
|
||||
@ -1548,17 +1539,17 @@
|
||||
"@babel/types" "^7.0.0"
|
||||
|
||||
"@types/babel__template@*":
|
||||
version "7.0.3"
|
||||
resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.3.tgz#b8aaeba0a45caca7b56a5de9459872dde3727214"
|
||||
integrity sha512-uCoznIPDmnickEi6D0v11SBpW0OuVqHJCa7syXqQHy5uktSCreIlt0iglsCnmvz8yCb38hGcWeseA8cWJSwv5Q==
|
||||
version "7.4.0"
|
||||
resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.0.tgz#0c888dd70b3ee9eebb6e4f200e809da0076262be"
|
||||
integrity sha512-NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A==
|
||||
dependencies:
|
||||
"@babel/parser" "^7.1.0"
|
||||
"@babel/types" "^7.0.0"
|
||||
|
||||
"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
|
||||
version "7.0.15"
|
||||
resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.15.tgz#db9e4238931eb69ef8aab0ad6523d4d4caa39d03"
|
||||
integrity sha512-Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A==
|
||||
version "7.0.16"
|
||||
resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.16.tgz#0bbbf70c7bc4193210dd27e252c51260a37cd6a7"
|
||||
integrity sha512-S63Dt4CZOkuTmpLGGWtT/mQdVORJOpx6SZWGVaP56dda/0Nx5nEe82K7/LAm8zYr6SfMq+1N2OreIOrHAx656w==
|
||||
dependencies:
|
||||
"@babel/types" "^7.3.0"
|
||||
|
||||
@ -1616,9 +1607,9 @@
|
||||
integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
|
||||
|
||||
"@types/node@*":
|
||||
version "14.14.7"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.7.tgz#8ea1e8f8eae2430cf440564b98c6dfce1ec5945d"
|
||||
integrity sha512-Zw1vhUSQZYw+7u5dAwNbIA9TuTotpzY/OF7sJM9FqPOF3SPjKnxrjoTktXDZgUjybf4cWVBP7O8wvKdSaGHweg==
|
||||
version "14.14.10"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.10.tgz#5958a82e41863cfc71f2307b3748e3491ba03785"
|
||||
integrity sha512-J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ==
|
||||
|
||||
"@types/parse-json@^4.0.0":
|
||||
version "4.0.0"
|
||||
@ -2121,12 +2112,14 @@ array-flatten@^2.1.0:
|
||||
integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
|
||||
|
||||
array-includes@^3.0.3, array-includes@^3.1.1:
|
||||
version "3.1.1"
|
||||
resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348"
|
||||
integrity sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==
|
||||
version "3.1.2"
|
||||
resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.2.tgz#a8db03e0b88c8c6aeddc49cb132f9bcab4ebf9c8"
|
||||
integrity sha512-w2GspexNQpx+PutG3QpT437/BenZBj0M/MZGn5mzv/MofYqo0xmRHzn4lFsoDlWJ+THYsGJmFlW68WlDFx7VRw==
|
||||
dependencies:
|
||||
call-bind "^1.0.0"
|
||||
define-properties "^1.1.3"
|
||||
es-abstract "^1.17.0"
|
||||
es-abstract "^1.18.0-next.1"
|
||||
get-intrinsic "^1.0.1"
|
||||
is-string "^1.0.5"
|
||||
|
||||
array-union@^1.0.1:
|
||||
@ -2147,12 +2140,13 @@ array-unique@^0.3.2:
|
||||
integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
|
||||
|
||||
array.prototype.flat@^1.2.1:
|
||||
version "1.2.3"
|
||||
resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b"
|
||||
integrity sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==
|
||||
version "1.2.4"
|
||||
resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz#6ef638b43312bd401b4c6199fdec7e2dc9e9a123"
|
||||
integrity sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==
|
||||
dependencies:
|
||||
call-bind "^1.0.0"
|
||||
define-properties "^1.1.3"
|
||||
es-abstract "^1.17.0-next.1"
|
||||
es-abstract "^1.18.0-next.1"
|
||||
|
||||
arrify@^1.0.1:
|
||||
version "1.0.1"
|
||||
@ -2165,7 +2159,7 @@ asap@~2.0.6:
|
||||
integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
|
||||
|
||||
"asc-web-common@file:../../packages/asc-web-common":
|
||||
version "1.0.279"
|
||||
version "1.0.281"
|
||||
dependencies:
|
||||
axios "^0.19.1"
|
||||
history "4.10.1"
|
||||
@ -2182,7 +2176,7 @@ asap@~2.0.6:
|
||||
sjcl "^1.0.8"
|
||||
|
||||
"asc-web-components@file:../../packages/asc-web-components":
|
||||
version "1.0.484"
|
||||
version "1.0.488"
|
||||
dependencies:
|
||||
email-addresses "^3.1.0"
|
||||
html-to-react "^1.4.2"
|
||||
@ -2421,9 +2415,9 @@ babel-plugin-named-asset-import@^0.3.6:
|
||||
integrity sha512-squySRkf+6JGnvjoUtDEjSREJEBirnXi9NqP6rjSYsylxQxqBTz+pkmf395i9E2zsvmYUaI40BHo6SqZUdydlw==
|
||||
|
||||
"babel-plugin-styled-components@>= 1":
|
||||
version "1.11.1"
|
||||
resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-1.11.1.tgz#5296a9e557d736c3186be079fff27c6665d63d76"
|
||||
integrity sha512-YwrInHyKUk1PU3avIRdiLyCpM++18Rs1NgyMXEAQC33rIXs/vro0A+stf4sT0Gf22Got+xRWB8Cm0tw+qkRzBA==
|
||||
version "1.12.0"
|
||||
resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-1.12.0.tgz#1dec1676512177de6b827211e9eda5a30db4f9b9"
|
||||
integrity sha512-FEiD7l5ZABdJPpLssKXjBUJMYqzbcNzBowfXDCdJhOpbhWiewapUaY+LZGT8R4Jg2TwOjGjG4RKeyrO5p9sBkA==
|
||||
dependencies:
|
||||
"@babel/helper-annotate-as-pure" "^7.0.0"
|
||||
"@babel/helper-module-imports" "^7.0.0"
|
||||
@ -2579,7 +2573,7 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.4.0:
|
||||
resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828"
|
||||
integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==
|
||||
|
||||
bn.js@^5.1.1:
|
||||
bn.js@^5.0.0, bn.js@^5.1.1:
|
||||
version "5.1.3"
|
||||
resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz#beca005408f642ebebea80b042b4d18d2ac0ee6b"
|
||||
integrity sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==
|
||||
@ -2697,11 +2691,11 @@ browserify-des@^1.0.0:
|
||||
safe-buffer "^5.1.2"
|
||||
|
||||
browserify-rsa@^4.0.0, browserify-rsa@^4.0.1:
|
||||
version "4.0.1"
|
||||
resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
|
||||
integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=
|
||||
version "4.1.0"
|
||||
resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d"
|
||||
integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==
|
||||
dependencies:
|
||||
bn.js "^4.1.0"
|
||||
bn.js "^5.0.0"
|
||||
randombytes "^2.0.1"
|
||||
|
||||
browserify-sign@^4.0.0:
|
||||
@ -2736,7 +2730,7 @@ browserslist@4.10.0:
|
||||
node-releases "^1.1.52"
|
||||
pkg-up "^3.1.0"
|
||||
|
||||
browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.14.6, browserslist@^4.6.2, browserslist@^4.6.4, browserslist@^4.9.1:
|
||||
browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.14.7, browserslist@^4.6.2, browserslist@^4.6.4, browserslist@^4.9.1:
|
||||
version "4.14.7"
|
||||
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.7.tgz#c071c1b3622c1c2e790799a37bb09473a4351cb6"
|
||||
integrity sha512-BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ==
|
||||
@ -2942,9 +2936,9 @@ caniuse-api@^3.0.0:
|
||||
lodash.uniq "^4.5.0"
|
||||
|
||||
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001157:
|
||||
version "1.0.30001157"
|
||||
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001157.tgz#2d11aaeb239b340bc1aa730eca18a37fdb07a9ab"
|
||||
integrity sha512-gOerH9Wz2IRZ2ZPdMfBvyOi3cjaz4O4dgNwPGzx8EhqAs4+2IL/O+fJsbt+znSigujoZG8bVcIAUM/I/E5K3MA==
|
||||
version "1.0.30001162"
|
||||
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001162.tgz#9f83aad1f42539ce9aab58bb177598f2f8e22ec6"
|
||||
integrity sha512-E9FktFxaNnp4ky3ucIGzEXLM+Knzlpuq1oN1sFAU0KeayygabGTmOsndpo8QrL4D9pcThlf4D2pUKaDxPCUmVw==
|
||||
|
||||
capture-exit@^2.0.0:
|
||||
version "2.0.0"
|
||||
@ -3404,28 +3398,28 @@ copy-webpack-plugin@^5.1.1:
|
||||
serialize-javascript "^4.0.0"
|
||||
webpack-log "^2.0.0"
|
||||
|
||||
core-js-compat@^3.6.2:
|
||||
version "3.7.0"
|
||||
resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.7.0.tgz#8479c5d3d672d83f1f5ab94cf353e57113e065ed"
|
||||
integrity sha512-V8yBI3+ZLDVomoWICO6kq/CD28Y4r1M7CWeO4AGpMdMfseu8bkSubBmUPySMGKRTS+su4XQ07zUkAsiu9FCWTg==
|
||||
core-js-compat@^3.6.2, core-js-compat@^3.7.0:
|
||||
version "3.8.0"
|
||||
resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.8.0.tgz#3248c6826f4006793bd637db608bca6e4cd688b1"
|
||||
integrity sha512-o9QKelQSxQMYWHXc/Gc4L8bx/4F7TTraE5rhuN8I7mKBt5dBIUpXpIR3omv70ebr8ST5R3PqbDQr+ZI3+Tt1FQ==
|
||||
dependencies:
|
||||
browserslist "^4.14.6"
|
||||
browserslist "^4.14.7"
|
||||
semver "7.0.0"
|
||||
|
||||
core-js-pure@^3.0.0:
|
||||
version "3.7.0"
|
||||
resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.7.0.tgz#28a57c861d5698e053f0ff36905f7a3301b4191e"
|
||||
integrity sha512-EZD2ckZysv8MMt4J6HSvS9K2GdtlZtdBncKAmF9lr2n0c9dJUaUN88PSTjvgwCgQPWKTkERXITgS6JJRAnljtg==
|
||||
version "3.8.0"
|
||||
resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.8.0.tgz#4cdd2eca37d49cda206b66e26204818dba77884a"
|
||||
integrity sha512-fRjhg3NeouotRoIV0L1FdchA6CK7ZD+lyINyMoz19SyV+ROpC4noS1xItWHFtwZdlqfMfVPJEyEGdfri2bD1pA==
|
||||
|
||||
core-js@^2.4.0, core-js@^2.6.4:
|
||||
version "2.6.11"
|
||||
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
|
||||
integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
|
||||
version "2.6.12"
|
||||
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
|
||||
integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
|
||||
|
||||
core-js@^3.5.0:
|
||||
version "3.7.0"
|
||||
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.7.0.tgz#b0a761a02488577afbf97179e4681bf49568520f"
|
||||
integrity sha512-NwS7fI5M5B85EwpWuIwJN4i/fbisQUwLwiSNUWeXlkAZ0sbBjLEvLvFLf1uzAUV66PcEPt4xCGCmOZSxVf3xzA==
|
||||
version "3.8.0"
|
||||
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.0.tgz#0fc2d4941cadf80538b030648bb64d230b4da0ce"
|
||||
integrity sha512-W2VYNB0nwQQE7tKS7HzXd7r2y/y2SVJl4ga6oH/dnaLFzM0o2lB2P3zCkWj5Wc/zyMYjtgd5Hmhk0ObkQFZOIA==
|
||||
|
||||
core-util-is@1.0.2, core-util-is@~1.0.0:
|
||||
version "1.0.2"
|
||||
@ -3663,12 +3657,12 @@ css-tree@1.0.0-alpha.37:
|
||||
mdn-data "2.0.4"
|
||||
source-map "^0.6.1"
|
||||
|
||||
css-tree@^1.0.0:
|
||||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.1.tgz#7726678dfe2a57993a018d9dce519bf1760e3b6d"
|
||||
integrity sha512-WroX+2MvsYcRGP8QA0p+rxzOniT/zpAoQ/DTKDSJzh5T3IQKUkFHeIIfgIapm2uaP178GWY3Mime1qbk8GO/tA==
|
||||
css-tree@^1.1.2:
|
||||
version "1.1.2"
|
||||
resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.2.tgz#9ae393b5dafd7dae8a622475caec78d3d8fbd7b5"
|
||||
integrity sha512-wCoWush5Aeo48GLhfHPbmvZs59Z+M7k5+B1xDnXbdWNcEF423DoFdqSWE0PM5aNk5nI5cp1q7ms36zGApY/sKQ==
|
||||
dependencies:
|
||||
mdn-data "2.0.12"
|
||||
mdn-data "2.0.14"
|
||||
source-map "^0.6.1"
|
||||
|
||||
css-what@2.1:
|
||||
@ -3775,11 +3769,11 @@ cssnano@^4.1.10:
|
||||
postcss "^7.0.0"
|
||||
|
||||
csso@^4.0.2:
|
||||
version "4.1.0"
|
||||
resolved "https://registry.yarnpkg.com/csso/-/csso-4.1.0.tgz#1d31193efa99b87aa6bad6c0cef155e543d09e8b"
|
||||
integrity sha512-h+6w/W1WqXaJA4tb1dk7r5tVbOm97MsKxzwnvOR04UQ6GILroryjMWu3pmCCtL2mLaEStQ0fZgeGiy99mo7iyg==
|
||||
version "4.2.0"
|
||||
resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529"
|
||||
integrity sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==
|
||||
dependencies:
|
||||
css-tree "^1.0.0"
|
||||
css-tree "^1.1.2"
|
||||
|
||||
cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0", cssom@^0.3.4:
|
||||
version "0.3.8"
|
||||
@ -3794,9 +3788,9 @@ cssstyle@^1.0.0, cssstyle@^1.1.1:
|
||||
cssom "0.3.x"
|
||||
|
||||
csstype@^3.0.2:
|
||||
version "3.0.4"
|
||||
resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.4.tgz#b156d7be03b84ff425c9a0a4b1e5f4da9c5ca888"
|
||||
integrity sha512-xc8DUsCLmjvCfoD7LTGE0ou2MIWLx0K9RCZwSHMOdynqRsP4MtUcLeqh1HcQ2dInwDTqn+3CE0/FZh1et+p4jA==
|
||||
version "3.0.5"
|
||||
resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.5.tgz#7fdec6a28a67ae18647c51668a9ff95bb2fa7bb8"
|
||||
integrity sha512-uVDi8LpBUKQj6sdxNaTetL6FpeCqTjOvAQuQUa/qAqq8oOd4ivkbhgnqayl0dnPal8Tb/yB1tF+gOvCBiicaiQ==
|
||||
|
||||
currently-unhandled@^0.4.1:
|
||||
version "0.4.1"
|
||||
@ -3854,16 +3848,16 @@ debug@=3.1.0:
|
||||
ms "2.0.0"
|
||||
|
||||
debug@^3.1.1, debug@^3.2.5:
|
||||
version "3.2.6"
|
||||
resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
|
||||
integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
|
||||
version "3.2.7"
|
||||
resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
|
||||
integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
|
||||
dependencies:
|
||||
ms "^2.1.1"
|
||||
|
||||
debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
|
||||
version "4.2.0"
|
||||
resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1"
|
||||
integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==
|
||||
version "4.3.1"
|
||||
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
|
||||
integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
|
||||
dependencies:
|
||||
ms "2.1.2"
|
||||
|
||||
@ -4227,9 +4221,9 @@ ejs@^2.6.1:
|
||||
integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
|
||||
|
||||
electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.591:
|
||||
version "1.3.593"
|
||||
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.593.tgz#947ccf6dc8e013e2b053d2463ecd1043c164fcef"
|
||||
integrity sha512-GvO7G1ZxvffnMvPCr4A7+iQPVuvpyqMrx2VWSERAjG+pHK6tmO9XqYdBfMIq9corRyi4bNImSDEiDvIoDb8HrA==
|
||||
version "1.3.610"
|
||||
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.610.tgz#1254eb394acd220a836ea1f203f8cded4e487052"
|
||||
integrity sha512-eFDC+yVQpEhtlapk4CYDPfV9ajF9cEof5TBcO49L1ETO+aYogrKWDmYpZyxBScMNe8Bo/gJamH4amQ4yyvXg4g==
|
||||
|
||||
elliptic@^6.5.3:
|
||||
version "6.5.3"
|
||||
@ -4314,7 +4308,7 @@ error-ex@^1.2.0, error-ex@^1.3.1:
|
||||
dependencies:
|
||||
is-arrayish "^0.2.1"
|
||||
|
||||
es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.17.5:
|
||||
es-abstract@^1.17.0-next.1, es-abstract@^1.17.2:
|
||||
version "1.17.7"
|
||||
resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz#a4de61b2f66989fc7421676c1cb9787573ace54c"
|
||||
integrity sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==
|
||||
@ -4394,7 +4388,7 @@ escape-html@~1.0.3:
|
||||
resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
|
||||
integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
|
||||
|
||||
escape-string-regexp@2.0.0:
|
||||
escape-string-regexp@2.0.0, escape-string-regexp@^2.0.0:
|
||||
version "2.0.0"
|
||||
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
|
||||
integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
|
||||
@ -4899,9 +4893,9 @@ file-loader@4.3.0:
|
||||
schema-utils "^2.5.0"
|
||||
|
||||
file-selector@^0.2.2:
|
||||
version "0.2.3"
|
||||
resolved "https://registry.yarnpkg.com/file-selector/-/file-selector-0.2.3.tgz#e2958cdd4366f95e59dc618b95c700abe72ed7a6"
|
||||
integrity sha512-d+hc9ctodLSVG55V2V5I4/eJBEr2p2na/kDN46Ty7PBhdp/Q5NmeQTXKa1Hx3AcIL1lgSFKZI0ve/v5ZXGCDkQ==
|
||||
version "0.2.4"
|
||||
resolved "https://registry.yarnpkg.com/file-selector/-/file-selector-0.2.4.tgz#7b98286f9dbb9925f420130ea5ed0a69238d4d80"
|
||||
integrity sha512-ZDsQNbrv6qRi1YTDOEWzf5J2KjZ9KMI1Q2SGeTkCJmNNW25Jg4TW4UMcmoqcg4WrAyKRcpBXdbWRxkfrOzVRbA==
|
||||
dependencies:
|
||||
tslib "^2.0.3"
|
||||
|
||||
@ -5234,7 +5228,7 @@ get-caller-file@^2.0.1:
|
||||
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
|
||||
integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
|
||||
|
||||
get-intrinsic@^1.0.0:
|
||||
get-intrinsic@^1.0.0, get-intrinsic@^1.0.1:
|
||||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.1.tgz#94a9768fcbdd0595a1c9273aacf4c89d075631be"
|
||||
integrity sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==
|
||||
@ -6064,9 +6058,9 @@ is-color-stop@^1.0.0:
|
||||
rgba-regex "^1.0.0"
|
||||
|
||||
is-core-module@^2.1.0:
|
||||
version "2.1.0"
|
||||
resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.1.0.tgz#a4cc031d9b1aca63eecbd18a650e13cb4eeab946"
|
||||
integrity sha512-YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA==
|
||||
version "2.2.0"
|
||||
resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
|
||||
integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
|
||||
dependencies:
|
||||
has "^1.0.3"
|
||||
|
||||
@ -7205,9 +7199,9 @@ lodash@4.17.19:
|
||||
integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
|
||||
|
||||
loglevel@^1.6.8:
|
||||
version "1.7.0"
|
||||
resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.0.tgz#728166855a740d59d38db01cf46f042caa041bb0"
|
||||
integrity sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==
|
||||
version "1.7.1"
|
||||
resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197"
|
||||
integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==
|
||||
|
||||
loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
|
||||
version "1.4.0"
|
||||
@ -7306,10 +7300,10 @@ md5.js@^1.3.4:
|
||||
inherits "^2.0.1"
|
||||
safe-buffer "^5.1.2"
|
||||
|
||||
mdn-data@2.0.12:
|
||||
version "2.0.12"
|
||||
resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.12.tgz#bbb658d08b38f574bbb88f7b83703defdcc46844"
|
||||
integrity sha512-ULbAlgzVb8IqZ0Hsxm6hHSlQl3Jckst2YEQS7fODu9ilNWy2LvcoSY7TRFIktABP2mdppBioc66va90T+NUs8Q==
|
||||
mdn-data@2.0.14:
|
||||
version "2.0.14"
|
||||
resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
|
||||
integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==
|
||||
|
||||
mdn-data@2.0.4:
|
||||
version "2.0.4"
|
||||
@ -7742,9 +7736,9 @@ node-notifier@^5.4.2:
|
||||
which "^1.3.0"
|
||||
|
||||
node-releases@^1.1.52, node-releases@^1.1.66:
|
||||
version "1.1.66"
|
||||
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.66.tgz#609bd0dc069381015cd982300bae51ab4f1b1814"
|
||||
integrity sha512-JHEQ1iWPGK+38VLB2H9ef2otU4l8s3yAMt9Xf934r6+ojCYDMHPMqvCc9TnzfeFSP1QEOeU6YZEd3+De0LTCgg==
|
||||
version "1.1.67"
|
||||
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.67.tgz#28ebfcccd0baa6aad8e8d4d8fe4cbc49ae239c12"
|
||||
integrity sha512-V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg==
|
||||
|
||||
node-sass@^4.13.0:
|
||||
version "4.14.1"
|
||||
@ -7887,12 +7881,12 @@ object-inspect@^1.8.0:
|
||||
integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==
|
||||
|
||||
object-is@^1.0.1:
|
||||
version "1.1.3"
|
||||
resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.3.tgz#2e3b9e65560137455ee3bd62aec4d90a2ea1cc81"
|
||||
integrity sha512-teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg==
|
||||
version "1.1.4"
|
||||
resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.4.tgz#63d6c83c00a43f4cbc9434eb9757c8a5b8565068"
|
||||
integrity sha512-1ZvAZ4wlF7IyPVOcE1Omikt7UpaFlOQq0HlSti+ZvDH3UiD2brwGMwDbyV43jao2bKJ+4+WdPJHSd7kgzKYVqg==
|
||||
dependencies:
|
||||
call-bind "^1.0.0"
|
||||
define-properties "^1.1.3"
|
||||
es-abstract "^1.18.0-next.1"
|
||||
|
||||
object-keys@^1.0.12, object-keys@^1.1.1:
|
||||
version "1.1.1"
|
||||
@ -7922,31 +7916,33 @@ object.assign@^4.1.0, object.assign@^4.1.1:
|
||||
object-keys "^1.1.1"
|
||||
|
||||
object.entries@^1.1.0, object.entries@^1.1.1:
|
||||
version "1.1.2"
|
||||
resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.2.tgz#bc73f00acb6b6bb16c203434b10f9a7e797d3add"
|
||||
integrity sha512-BQdB9qKmb/HyNdMNWVr7O3+z5MUIx3aiegEIJqjMBbBf0YT9RRxTJSim4mzFqtyr7PDAHigq0N9dO0m0tRakQA==
|
||||
version "1.1.3"
|
||||
resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.3.tgz#c601c7f168b62374541a07ddbd3e2d5e4f7711a6"
|
||||
integrity sha512-ym7h7OZebNS96hn5IJeyUmaWhaSM4SVtAPPfNLQEI2MYWCO2egsITb9nab2+i/Pwibx+R0mtn+ltKJXRSeTMGg==
|
||||
dependencies:
|
||||
call-bind "^1.0.0"
|
||||
define-properties "^1.1.3"
|
||||
es-abstract "^1.17.5"
|
||||
es-abstract "^1.18.0-next.1"
|
||||
has "^1.0.3"
|
||||
|
||||
object.fromentries@^2.0.2:
|
||||
version "2.0.2"
|
||||
resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz#4a09c9b9bb3843dd0f89acdb517a794d4f355ac9"
|
||||
integrity sha512-r3ZiBH7MQppDJVLx6fhD618GKNG40CZYH9wgwdhKxBDDbQgjeWGGd4AtkZad84d291YxvWe7bJGuE65Anh0dxQ==
|
||||
version "2.0.3"
|
||||
resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.3.tgz#13cefcffa702dc67750314a3305e8cb3fad1d072"
|
||||
integrity sha512-IDUSMXs6LOSJBWE++L0lzIbSqHl9KDCfff2x/JSEIDtEUavUnyMYC2ZGay/04Zq4UT8lvd4xNhU4/YHKibAOlw==
|
||||
dependencies:
|
||||
call-bind "^1.0.0"
|
||||
define-properties "^1.1.3"
|
||||
es-abstract "^1.17.0-next.1"
|
||||
function-bind "^1.1.1"
|
||||
es-abstract "^1.18.0-next.1"
|
||||
has "^1.0.3"
|
||||
|
||||
object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.0:
|
||||
version "2.1.0"
|
||||
resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649"
|
||||
integrity sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==
|
||||
version "2.1.1"
|
||||
resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.1.tgz#0dfda8d108074d9c563e80490c883b6661091544"
|
||||
integrity sha512-6DtXgZ/lIZ9hqx4GtZETobXLR/ZLaa0aqV0kzbn80Rf8Z2e/XFnhA0I7p07N2wH8bBBltr2xQPi6sbKWAY2Eng==
|
||||
dependencies:
|
||||
call-bind "^1.0.0"
|
||||
define-properties "^1.1.3"
|
||||
es-abstract "^1.17.0-next.1"
|
||||
es-abstract "^1.18.0-next.1"
|
||||
|
||||
object.pick@^1.3.0:
|
||||
version "1.3.0"
|
||||
@ -7956,13 +7952,13 @@ object.pick@^1.3.0:
|
||||
isobject "^3.0.1"
|
||||
|
||||
object.values@^1.1.0, object.values@^1.1.1:
|
||||
version "1.1.1"
|
||||
resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"
|
||||
integrity sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==
|
||||
version "1.1.2"
|
||||
resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.2.tgz#7a2015e06fcb0f546bd652486ce8583a4731c731"
|
||||
integrity sha512-MYC0jvJopr8EK6dPBiO8Nb9mvjdypOachO5REGk6MXzujbBrAisKo3HmdEI6kZDL6fC31Mwee/5YbtMebixeag==
|
||||
dependencies:
|
||||
call-bind "^1.0.0"
|
||||
define-properties "^1.1.3"
|
||||
es-abstract "^1.17.0-next.1"
|
||||
function-bind "^1.1.1"
|
||||
es-abstract "^1.18.0-next.1"
|
||||
has "^1.0.3"
|
||||
|
||||
obuf@^1.0.0, obuf@^1.1.2:
|
||||
@ -9405,9 +9401,9 @@ rc-util@^4.15.3, rc-util@^4.5.1:
|
||||
shallowequal "^1.1.0"
|
||||
|
||||
re-resizable@^6.7.0:
|
||||
version "6.8.0"
|
||||
resolved "https://registry.yarnpkg.com/re-resizable/-/re-resizable-6.8.0.tgz#8a99d98a37032276aea62c1c344612f7e8ddc506"
|
||||
integrity sha512-MffuegFHq5juSvLTe/lecTikc2DqIsLjrTAAZ44goPcNavjYgiCqwJa5RydGPsDOZ+OUZAZk1DP9S4AEu0Q1fQ==
|
||||
version "6.9.0"
|
||||
resolved "https://registry.yarnpkg.com/re-resizable/-/re-resizable-6.9.0.tgz#9c3059b389ced6ade602234cc5bb1e12d231cd47"
|
||||
integrity sha512-3cUDG81ylyqI0Pdgle/RHwwRYq0ORZzsUaySOCO8IbEtNyaRtrIHYm/jMQ5pjcNiKCxR3vsSymIQZHwJq4gg2Q==
|
||||
dependencies:
|
||||
fast-memoize "^2.5.1"
|
||||
|
||||
@ -9663,9 +9659,9 @@ react-string-format@^0.1.0:
|
||||
integrity sha512-xkIhnh2t1YmS4r8Zz92qs0Ia8EMbBoRlMEvvMtC0sQBSxxBmBujfssSA4PYYi0w2WvJYSEktgilB+320/mlsOQ==
|
||||
|
||||
react-svg@^11.0.9:
|
||||
version "11.1.1"
|
||||
resolved "https://registry.yarnpkg.com/react-svg/-/react-svg-11.1.1.tgz#0e9b11fbf0efc7df347d8f268e8d77fd9d022a3a"
|
||||
integrity sha512-bqj+2C/niy/V519ABD3fUD9+T33DiDUUUuu39d2O9G2RXTXSFHqA7zU7DEjF+yadMXmEbe0+NlNSZimHWN5jew==
|
||||
version "11.1.3"
|
||||
resolved "https://registry.yarnpkg.com/react-svg/-/react-svg-11.1.3.tgz#14c3f1552b0893319e7466e22797cf7f08a3bfb8"
|
||||
integrity sha512-OSrg4mVXgGK+Qypraa0d68bI8e6ubcBGes9lqcaMdSgPjfrzFTe4yaG94UdROwk5JvFVLKTquc4lRuvqOY92KQ==
|
||||
dependencies:
|
||||
"@babel/runtime" "^7.12.5"
|
||||
"@tanem/svg-injector" "^8.1.0"
|
||||
@ -10553,7 +10549,7 @@ shellwords@^0.1.1:
|
||||
resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
|
||||
integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
|
||||
|
||||
side-channel@^1.0.2:
|
||||
side-channel@^1.0.2, side-channel@^1.0.3:
|
||||
version "1.0.3"
|
||||
resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.3.tgz#cdc46b057550bbab63706210838df5d4c19519c3"
|
||||
integrity sha512-A6+ByhlLkksFoUepsGxfj5x1gTSrs+OydsRptUxeNCabQpCFUvcwIczgOigI8vhY/OJCnPnyE9rGiwgvr9cS1g==
|
||||
@ -10743,9 +10739,9 @@ spdx-expression-parse@^3.0.0:
|
||||
spdx-license-ids "^3.0.0"
|
||||
|
||||
spdx-license-ids@^3.0.0:
|
||||
version "3.0.6"
|
||||
resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz#c80757383c28abf7296744998cbc106ae8b854ce"
|
||||
integrity sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw==
|
||||
version "3.0.7"
|
||||
resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65"
|
||||
integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==
|
||||
|
||||
spdy-transport@^3.0.0:
|
||||
version "3.0.0"
|
||||
@ -10818,9 +10814,11 @@ stable@^0.1.8:
|
||||
integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==
|
||||
|
||||
stack-utils@^1.0.1:
|
||||
version "1.0.2"
|
||||
resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8"
|
||||
integrity sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA==
|
||||
version "1.0.4"
|
||||
resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.4.tgz#4b600971dcfc6aed0cbdf2a8268177cc916c87c8"
|
||||
integrity sha512-IPDJfugEGbfizBwBZRZ3xpccMdRyP5lqsBWXGQWimVjua/ccLCeMOAVjlc1R7LxFjo5sEDhyNIXd8mo/AiDS9w==
|
||||
dependencies:
|
||||
escape-string-regexp "^2.0.0"
|
||||
|
||||
static-extend@^0.1.1:
|
||||
version "0.1.2"
|
||||
@ -10936,32 +10934,33 @@ string-width@^4.1.0:
|
||||
strip-ansi "^6.0.0"
|
||||
|
||||
string.prototype.matchall@^4.0.2:
|
||||
version "4.0.2"
|
||||
resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz#48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e"
|
||||
integrity sha512-N/jp6O5fMf9os0JU3E72Qhf590RSRZU/ungsL/qJUYVTNv7hTG0P/dbPjxINVN9jpscu3nzYwKESU3P3RY5tOg==
|
||||
version "4.0.3"
|
||||
resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.3.tgz#24243399bc31b0a49d19e2b74171a15653ec996a"
|
||||
integrity sha512-OBxYDA2ifZQ2e13cP82dWFMaCV9CGF8GzmN4fljBVw5O5wep0lu4gacm1OL6MjROoUnB8VbkWRThqkV2YFLNxw==
|
||||
dependencies:
|
||||
call-bind "^1.0.0"
|
||||
define-properties "^1.1.3"
|
||||
es-abstract "^1.17.0"
|
||||
es-abstract "^1.18.0-next.1"
|
||||
has-symbols "^1.0.1"
|
||||
internal-slot "^1.0.2"
|
||||
regexp.prototype.flags "^1.3.0"
|
||||
side-channel "^1.0.2"
|
||||
side-channel "^1.0.3"
|
||||
|
||||
string.prototype.trimend@^1.0.1:
|
||||
version "1.0.2"
|
||||
resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz#6ddd9a8796bc714b489a3ae22246a208f37bfa46"
|
||||
integrity sha512-8oAG/hi14Z4nOVP0z6mdiVZ/wqjDtWSLygMigTzAb+7aPEDTleeFf+WrF+alzecxIRkckkJVn+dTlwzJXORATw==
|
||||
version "1.0.3"
|
||||
resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz#a22bd53cca5c7cf44d7c9d5c732118873d6cd18b"
|
||||
integrity sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==
|
||||
dependencies:
|
||||
call-bind "^1.0.0"
|
||||
define-properties "^1.1.3"
|
||||
es-abstract "^1.18.0-next.1"
|
||||
|
||||
string.prototype.trimstart@^1.0.1:
|
||||
version "1.0.2"
|
||||
resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz#22d45da81015309cd0cdd79787e8919fc5c613e7"
|
||||
integrity sha512-7F6CdBTl5zyu30BJFdzSTlSlLPwODC23Od+iLoVH8X6+3fvDPPuBVVj9iaB1GOsSTSIgVfsfm27R2FGrAPznWg==
|
||||
version "1.0.3"
|
||||
resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz#9b4cb590e123bb36564401d59824298de50fd5aa"
|
||||
integrity sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==
|
||||
dependencies:
|
||||
call-bind "^1.0.0"
|
||||
define-properties "^1.1.3"
|
||||
es-abstract "^1.18.0-next.1"
|
||||
|
||||
string_decoder@^1.0.0, string_decoder@^1.1.1:
|
||||
version "1.3.0"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "asc-web-common",
|
||||
"version": "1.0.280",
|
||||
"version": "1.0.281",
|
||||
"description": "Ascensio System SIA common components and solutions library",
|
||||
"license": "AGPL-3.0",
|
||||
"files": [
|
||||
|
||||
@ -16,7 +16,7 @@ import {
|
||||
} from "asc-web-components";
|
||||
import PageLayout from "../../components/PageLayout";
|
||||
import { connect } from "react-redux";
|
||||
import styled from "styled-components";
|
||||
import styled, { css } from "styled-components";
|
||||
import { withTranslation } from "react-i18next";
|
||||
import i18n from "./i18n";
|
||||
import ForgotPasswordModalDialog from "./sub-components/forgot-password-modal-dialog";
|
||||
@ -28,7 +28,6 @@ import {
|
||||
import { sendInstructionsToChangePassword } from "../../api/people";
|
||||
import Register from "./sub-components/register-container";
|
||||
import { createPasswordHash } from "../../utils";
|
||||
//import history from "../../history";
|
||||
import { redirectToDefaultPage } from "../../utils";
|
||||
const { getLanguage } = store.auth.selectors;
|
||||
const LoginContainer = styled.div`
|
||||
@ -125,6 +124,13 @@ const LoginContainer = styled.div`
|
||||
}
|
||||
`;
|
||||
|
||||
const LoginFormWrapper = styled.div`
|
||||
display: grid;
|
||||
grid-template-rows: ${props => props.enabledJoin ? css`1fr 66px` : css`1fr`};
|
||||
width: 100%;
|
||||
height: calc(100vh-56px);
|
||||
`;
|
||||
|
||||
class Form extends Component {
|
||||
constructor(props) {
|
||||
super(props);
|
||||
@ -205,7 +211,7 @@ class Form extends Component {
|
||||
|
||||
onSubmit = () => {
|
||||
const { errorText, identifier, password } = this.state;
|
||||
const { login, setIsLoaded, history, hashSettings, homepage } = this.props;
|
||||
const { login, setIsLoaded, hashSettings } = this.props;
|
||||
|
||||
errorText && this.setState({ errorText: "" });
|
||||
let hasError = false;
|
||||
@ -434,7 +440,8 @@ class Form extends Component {
|
||||
Form.propTypes = {
|
||||
login: PropTypes.func.isRequired,
|
||||
match: PropTypes.object.isRequired,
|
||||
//history: PropTypes.object.isRequired,
|
||||
hashSettings: PropTypes.object,
|
||||
reloadPortalSettings: PropTypes.func,
|
||||
setIsLoaded: PropTypes.func.isRequired,
|
||||
greetingTitle: PropTypes.string.isRequired,
|
||||
t: PropTypes.func.isRequired,
|
||||
@ -452,30 +459,23 @@ Form.defaultProps = {
|
||||
};
|
||||
|
||||
const FormWrapper = withTranslation()(Form);
|
||||
const RegisterWrapper = withTranslation()(Register);
|
||||
|
||||
const LoginForm = (props) => {
|
||||
const { language, isLoaded, enabledJoin } = props;
|
||||
const { language, enabledJoin } = props;
|
||||
|
||||
useEffect(() => {
|
||||
i18n.changeLanguage(language);
|
||||
}, [language]);
|
||||
|
||||
return (
|
||||
<>
|
||||
{isLoaded && (
|
||||
<>
|
||||
<PageLayout>
|
||||
<PageLayout.SectionBody>
|
||||
<>
|
||||
<FormWrapper i18n={i18n} {...props} />
|
||||
{enabledJoin && <RegisterWrapper i18n={i18n} {...props} />}
|
||||
</>
|
||||
</PageLayout.SectionBody>
|
||||
</PageLayout>
|
||||
</>
|
||||
)}
|
||||
</>
|
||||
<LoginFormWrapper enabledJoin={enabledJoin}>
|
||||
<PageLayout>
|
||||
<PageLayout.SectionBody>
|
||||
<FormWrapper i18n={i18n} {...props} />
|
||||
</PageLayout.SectionBody>
|
||||
</PageLayout>
|
||||
<Register />
|
||||
</LoginFormWrapper>
|
||||
);
|
||||
};
|
||||
|
||||
@ -487,20 +487,15 @@ LoginForm.propTypes = {
|
||||
|
||||
function mapStateToProps(state) {
|
||||
const { isLoaded, settings } = state.auth;
|
||||
const {
|
||||
greetingSettings,
|
||||
enabledJoin,
|
||||
organizationName,
|
||||
hashSettings,
|
||||
} = settings;
|
||||
const { greetingSettings, organizationName, hashSettings, enabledJoin } = settings;
|
||||
|
||||
return {
|
||||
isLoaded,
|
||||
enabledJoin,
|
||||
organizationName,
|
||||
language: getLanguage(state),
|
||||
greetingTitle: greetingSettings,
|
||||
hashSettings,
|
||||
enabledJoin
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -1,12 +1,15 @@
|
||||
import React, { useState } from "react";
|
||||
import React, { useEffect, useState } from "react";
|
||||
import { Box, Text, toastr } from "asc-web-components";
|
||||
import RegisterModalDialog from "./register-modal-dialog";
|
||||
import styled from "styled-components";
|
||||
import PropTypes from "prop-types";
|
||||
import { sendRegisterRequest } from "../../../api/settings/index";
|
||||
import { I18nextProvider, withTranslation } from "react-i18next";
|
||||
import { getLanguage } from "../../../store/auth/selectors";
|
||||
import { connect } from "react-redux";
|
||||
import i18n from "../i18n";
|
||||
|
||||
const StyledRegister = styled(Box)`
|
||||
position: absolute;
|
||||
z-index: 184;
|
||||
width: 100%;
|
||||
height: 66px;
|
||||
@ -82,4 +85,38 @@ Register.propTypes = {
|
||||
t: PropTypes.func.isRequired,
|
||||
};
|
||||
|
||||
export default Register;
|
||||
const RegisterTranslationWrapper = withTranslation()(Register);
|
||||
|
||||
const RegisterWrapper = (props) => {
|
||||
const { language, isAuthenticated, enabledJoin } = props;
|
||||
|
||||
useEffect(() => {
|
||||
i18n.changeLanguage(language);
|
||||
}, [language]);
|
||||
|
||||
return (
|
||||
<I18nextProvider i18n={i18n}>
|
||||
{enabledJoin && !isAuthenticated && (
|
||||
<RegisterTranslationWrapper {...props} />
|
||||
)}
|
||||
</I18nextProvider>
|
||||
);
|
||||
};
|
||||
|
||||
RegisterWrapper.propTypes = {
|
||||
language: PropTypes.string,
|
||||
isAuthenticated: PropTypes.bool,
|
||||
enabledJoin: PropTypes.bool,
|
||||
};
|
||||
|
||||
function mapStateToProps(state) {
|
||||
const { isAuthenticated, settings } = state.auth;
|
||||
const { enabledJoin } = settings;
|
||||
return {
|
||||
language: getLanguage(state),
|
||||
isAuthenticated,
|
||||
enabledJoin,
|
||||
};
|
||||
}
|
||||
|
||||
export default connect(mapStateToProps, null)(RegisterWrapper);
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "asc-web-components",
|
||||
"version": "1.0.486",
|
||||
"version": "1.0.488",
|
||||
"description": "Ascensio System SIA component library",
|
||||
"license": "AGPL-3.0",
|
||||
"main": "dist/asc-web-components.js",
|
||||
|
||||
@ -108,10 +108,10 @@ const StyledButton = styled(ButtonWrapper).attrs((props) => ({
|
||||
: "0px"
|
||||
: props.icon
|
||||
? props.label
|
||||
? "11px 24px 13px 24px"
|
||||
: "11px 11px 13px 11px"
|
||||
? "10px 24px 13px 24px"
|
||||
: "10px 11px 13px 11px"
|
||||
: props.label
|
||||
? "12px 20px 12px 20px"
|
||||
? "11px 20px 12px 20px"
|
||||
: "0px")) ||
|
||||
(props.size === "big" &&
|
||||
(props.primary
|
||||
@ -124,10 +124,10 @@ const StyledButton = styled(ButtonWrapper).attrs((props) => ({
|
||||
: "0px"
|
||||
: props.icon
|
||||
? props.label
|
||||
? "8px 24px 9px 24px"
|
||||
: "8px 10px 9px 10px"
|
||||
? "7px 24px 9px 24px"
|
||||
: "7px 10px 9px 10px"
|
||||
: props.label
|
||||
? "8px 16px 8px 16px"
|
||||
? "7px 16px 8px 16px"
|
||||
: "0px")) ||
|
||||
(props.size === "medium" &&
|
||||
(props.primary
|
||||
@ -140,10 +140,10 @@ const StyledButton = styled(ButtonWrapper).attrs((props) => ({
|
||||
: "0px"
|
||||
: props.icon
|
||||
? props.label
|
||||
? "6px 24px 7px 24px"
|
||||
: "6px 10px 7px 10px"
|
||||
? "5px 24px 7px 24px"
|
||||
: "5px 10px 7px 10px"
|
||||
: props.label
|
||||
? "7px 16px 7px 16px"
|
||||
? "6px 16px 7px 16px"
|
||||
: "0px")) ||
|
||||
(props.size === "base" &&
|
||||
(props.primary
|
||||
@ -156,10 +156,10 @@ const StyledButton = styled(ButtonWrapper).attrs((props) => ({
|
||||
: "0px"
|
||||
: props.icon
|
||||
? props.label
|
||||
? "3px 20px 5px 20px"
|
||||
: "3px 5px 5px 5px"
|
||||
? "2px 20px 5px 20px"
|
||||
: "2px 5px 5px 5px"
|
||||
: props.label
|
||||
? "4px 12px 5px 12px"
|
||||
? "3px 12px 5px 12px"
|
||||
: "0px"))};
|
||||
|
||||
${(props) => (props.minwidth ? `min-width: ${props.minwidth};` : null)}
|
||||
|
||||
@ -106,9 +106,9 @@ const StyledOptionalItem = styled.div`
|
||||
`;
|
||||
|
||||
const StyledIcon = styled.div`
|
||||
margin: -6px 8px 0px 0px;
|
||||
width: 16px;
|
||||
margin-right: 8px;
|
||||
margin-top: -2px;
|
||||
height: 16px;
|
||||
`;
|
||||
|
||||
const StyledArrowIcon = styled.div`
|
||||
|
||||
@ -14,8 +14,7 @@ import Heading from "../heading";
|
||||
import throttle from "lodash/throttle";
|
||||
|
||||
const DateInputStyle = styled.div`
|
||||
max-width: 110px;
|
||||
width: 110px;
|
||||
width: 115px;
|
||||
`;
|
||||
|
||||
const DropDownStyle = styled.div`
|
||||
@ -127,14 +126,18 @@ class DatePicker extends Component {
|
||||
};
|
||||
|
||||
onChange = (value) => {
|
||||
this.onClick(!this.state.isOpen);
|
||||
const formatValue = moment(value).format("L");
|
||||
this.props.onChange && this.props.onChange(value);
|
||||
this.setState({ selectedDate: value, value: formatValue, hasError: false });
|
||||
this.setState({
|
||||
selectedDate: value,
|
||||
value: formatValue,
|
||||
hasError: false,
|
||||
isOpen: !this.state.isOpen,
|
||||
});
|
||||
};
|
||||
|
||||
onClick = (isOpen) => {
|
||||
this.setState({ isOpen });
|
||||
onClick = () => {
|
||||
this.setState({ isOpen: !this.state.isOpen });
|
||||
};
|
||||
|
||||
onClose = () => {
|
||||
@ -359,9 +362,8 @@ class DatePicker extends Component {
|
||||
isDisabled={isDisabled}
|
||||
isReadOnly={isReadOnly}
|
||||
hasError={hasError}
|
||||
//onFocus={this.onClick.bind(this, true)}
|
||||
iconName={"CalendarIcon"}
|
||||
onIconClick={this.onClick.bind(this, !isOpen)}
|
||||
iconName="CalendarIcon"
|
||||
onIconClick={this.onClick}
|
||||
value={value}
|
||||
onChange={this.handleChange}
|
||||
mask={mask}
|
||||
|
||||
@ -57,7 +57,7 @@ function getVerticalCss() {
|
||||
.icon-button {
|
||||
position: relative;
|
||||
margin: 0;
|
||||
padding: 1px 8px;
|
||||
padding: 0px 8px;
|
||||
width: 13px;
|
||||
height: 13px;
|
||||
}
|
||||
|
||||
@ -85,7 +85,7 @@ const StyledGrid = styled.div`
|
||||
${(props) => props.columnsProp && columnsStyle(props)}
|
||||
display: grid;
|
||||
${(props) => props.gridArea && gridAreaStyle(props.gridArea)}
|
||||
${(props) => props.gridColumnGap && gridColumnGapStyle(props)}
|
||||
${(props) => props.gridColumnGap && gridColumnGapStyle(props.gridColumnGap)}
|
||||
${(props) => props.gridGap && gridGapStyle(props.gridGap)}
|
||||
${(props) => props.gridRowGap && gridRowGapStyle(props)}
|
||||
${(props) => props.heightProp && heightStyle(props.heightProp)}
|
||||
|
||||
@ -248,6 +248,7 @@ HelpButton.defaultProps = {
|
||||
displayType: "auto",
|
||||
className: "icon-button",
|
||||
iconName: "QuestionIcon",
|
||||
color: "#A3A9AE",
|
||||
};
|
||||
|
||||
export default HelpButton;
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M2 0C0.895508 0 0 0.895508 0 2V14C0 15.1045 0.895508 16 2 16H14C15.1045 16 16 15.1045 16 14V2C16 0.895508 15.1045 0 14 0H2ZM13.625 7.3833C14.0691 7.9502 14.0718 8.59521 14.0757 9.4873C14.0764 9.66992 14.0818 10.1348 14.082 10.1348C14.0696 11.29 13.709 12.2607 13.0391 12.9419C12.3679 13.6245 11.4207 13.9902 10.2996 13.9995H10.2893H5.91699L5.83496 14C4.57837 14 3.6084 13.6499 2.95239 12.9595C2.2959 12.2686 2.08569 11.3345 2.08569 10.0361C2.08618 9.99951 2.08496 9.96289 2.08374 9.92676C2.08203 9.875 2.08032 9.82373 2.08374 9.77344L2.08594 5.21045C2.14014 4.07861 2.65161 3.37891 3.03687 2.97803C3.65918 2.33057 4.53882 2.00195 5.65186 2.00195L5.68262 2.00244L8.54468 2L8.57178 2.00098C10.4429 2.05176 11.791 3.33887 11.8044 5.12988C11.8535 5.66748 11.8228 6.16504 11.7168 6.61377C12.3459 6.63232 13.1218 6.74121 13.625 7.3833ZM8.36011 4.43066L5.91479 4.43359C5.33765 4.42822 4.86426 4.87891 4.85498 5.44873C4.8457 6.01807 5.30542 6.4873 5.88184 6.49609L8.34399 6.49512C8.9126 6.49512 9.37793 6.0835 9.38721 5.51953C9.39648 4.9502 8.93652 4.43994 8.36011 4.43066ZM5.62061 11.2227H10.5112C11.0876 11.2227 11.5549 10.7607 11.5549 10.1909C11.5549 9.62158 11.0879 9.15967 10.5112 9.15967H5.62061C5.04443 9.15967 4.5769 9.62158 4.5769 10.1909C4.5769 10.7607 5.04443 11.2227 5.62061 11.2227Z" fill="#333333"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M2 0C0.895431 0 0 0.895431 0 2V14C0 15.1046 0.895431 16 2 16H14C15.1046 16 16 15.1046 16 14V2C16 0.895431 15.1046 0 14 0H2ZM14.0757 9.48723V9.48754C14.0765 9.67003 14.0818 10.135 14.0819 10.135C14.0696 11.2898 13.7089 12.2606 13.0391 12.9419C12.3679 13.6245 11.4206 13.9902 10.2996 13.9995H10.2892H5.91699C5.88953 13.9999 5.86206 14 5.83485 14C4.57826 14 3.60831 13.6499 2.95236 12.9593C2.2959 12.2687 2.08569 11.3343 2.08569 10.036C2.08615 9.99929 2.08496 9.96295 2.08377 9.92691C2.08206 9.87522 2.08038 9.82413 2.08366 9.77335L2.08594 5.21036C2.14011 4.07874 2.65165 3.3789 3.03677 2.97827C3.65906 2.33059 4.5389 2.00213 5.65198 2.00213L5.68273 2.00225L8.54473 2L8.57168 2.00075C10.4429 2.05178 11.7911 3.339 11.8045 5.1298C11.8535 5.66753 11.8228 6.16498 11.7169 6.61365C12.3459 6.63216 13.1218 6.74099 13.6249 7.38316C14.069 7.95034 14.0718 8.59506 14.0757 9.48723ZM8.3602 4.43085L5.91484 4.43372C5.33773 4.42822 4.86415 4.87901 4.85504 5.44864C4.8458 6.01801 5.30546 6.48707 5.88181 6.4962L8.344 6.4952C8.91263 6.4952 9.37799 6.08368 9.3871 5.51968C9.39646 4.95006 8.93655 4.43985 8.3602 4.43085ZM5.62059 11.2226H10.5112C11.0877 11.2226 11.5549 10.7609 11.5549 10.1911C11.5549 9.6215 11.0878 9.1597 10.5113 9.1597H5.62059C5.04437 9.1597 4.57699 9.6215 4.57699 10.1911C4.57699 10.7609 5.04437 11.2226 5.62059 11.2226Z" fill="#333333"/>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.5 KiB |
@ -1,12 +1,3 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24px" height="24px" viewBox="0 0 16 16">
|
||||
<title>calendar</title>
|
||||
<g>
|
||||
<path fill="#83888d" d="M14,2H12V1H11V2H5V1H4V2H2a.86.86,0,0,0-.39.06,1.08,1.08,0,0,0-.34.21,1.08,1.08,0,0,0-.21.34A.86.86,0,0,0,1,3V14a.86.86,0,0,0,.06.39,1.08,1.08,0,0,0,.21.34,1.08,1.08,0,0,0,.34.21A.86.86,0,0,0,2,15H14a.86.86,0,0,0,.39-.06.87.87,0,0,0,.55-.55A.86.86,0,0,0,15,14V3a.86.86,0,0,0-.06-.39,1.08,1.08,0,0,0-.21-.34,1.08,1.08,0,0,0-.34-.21A.86.86,0,0,0,14,2Zm0,12H2V5H14Z"/>
|
||||
<path fill="#83888d" d="M6,7H4V9H6Z"/>
|
||||
<path fill="#83888d" d="M9,7H7V9H9Z"/>
|
||||
<path fill="#83888d" d="M12,7H10V9h2Z"/>
|
||||
<path fill="#83888d" d="M6,10H4v2H6Z"/>
|
||||
<path fill="#83888d" d="M9,10H7v2H9Z"/>
|
||||
<path fill="#83888d" d="M12,10H10v2h2Z"/>
|
||||
</g>
|
||||
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M14.4444 1H12.6667V0H11.1111V1H4.88889V0H3.33333V1H1.55556C0.696134 1 0.00780207 1.71599 0.00780207 2.60001L0 14.4C0 15.284 0.696097 16 1.55556 16H14.4444C15.3039 16 16 15.284 16 14.4V2.59997C16 1.71599 15.3039 1 14.4444 1ZM14 14H2V5H14V14ZM4 7H7V9H4V7ZM12 7H9V9H12V7ZM4 10H7V12H4V10ZM12 10H9V12H12V10Z" fill="#A3A9AE"/>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 792 B After Width: | Height: | Size: 473 B |
@ -1,3 +1,3 @@
|
||||
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M15.6868 8.78273L15.5718 8.60175C15.3878 8.33117 15.2047 8.06059 14.9282 7.88014C14.6984 7.72192 14.4223 7.60956 14.1702 7.49649C14.8824 7.158 15.3697 6.68457 15.5999 6.0755C15.7606 5.57878 15.4667 5.17362 15.4667 4.76739V4.72242C15.4667 4.2705 14.8417 3.9777 14.2673 3.81965C13.9215 3.75209 13.5403 3.75209 13.1958 3.77396L12.4407 3.93218L12.6968 3.36862C12.9261 2.6463 12.8589 1.94745 12.4681 1.29269L12.3995 1.18069C12.0544 0.616059 11.549 0.277922 10.859 0.0976536C10.1469 -0.0831484 9.54045 -0.0155921 8.89689 0.322901C8.25226 0.662104 7.64443 1.18104 7.64443 1.85696V1.90194L7.56318 2.06016L7.44194 1.90194L7.19714 1.4966C6.82913 0.93233 6.36246 0.593837 5.78734 0.435613C5.28138 0.323078 4.86502 0.368234 4.42804 0.593837C3.9459 0.88664 3.6675 1.33909 3.55229 1.97003C3.43709 2.62426 3.55194 3.25627 3.89683 3.88721L4.05666 4.11352L3.50518 3.93218C2.81522 3.77396 2.17184 3.86463 1.52845 4.20294C0.861243 4.54108 0.447727 5.01522 0.171457 5.66927C-0.0813453 6.30092 -0.0578784 6.90929 0.263725 7.47391C0.40186 7.72209 0.608618 7.92512 0.792087 8.06059C1.06836 8.33099 1.41325 8.48904 1.82694 8.55659L1.9873 8.60157L1.64312 8.89562C1.3208 9.16673 1.13751 9.50469 1.02249 9.84283C0.907821 10.2487 0.953688 10.6549 1.18338 11.0391C1.29858 11.2192 1.41325 11.3758 1.59725 11.49C1.78125 11.6469 2.01094 11.7602 2.2865 11.7829C2.79246 11.8962 3.32136 11.8962 3.89541 11.7148L3.48118 12.392L3.36723 12.6852C3.137 13.4059 3.20545 14.0377 3.55052 14.6919C3.71159 14.9412 3.89541 15.1664 4.07941 15.3693C4.35515 15.6175 4.69933 15.7755 5.11391 15.8888C5.80228 16.0687 6.49224 16.0452 7.15962 15.7074C7.80319 15.3693 8.21617 14.8271 8.42364 14.1511L8.44586 14.0164C8.88302 14.4889 9.29671 14.8052 9.75699 14.9181C10.2164 15.053 10.6759 15.0313 11.0898 14.7599C11.4806 14.5339 11.7563 14.1508 11.8939 13.6766C12.0087 13.1806 12.0087 12.6848 11.8939 12.122C12.1232 12.2786 12.3538 12.3917 12.6292 12.4587C13.3643 12.6848 14.0086 12.6617 14.652 12.3236C15.2726 11.9858 15.6863 11.4432 15.8929 10.7444C16.0778 10.0679 16.0319 9.41402 15.6868 8.78273ZM12.3542 5.0154L12.6296 4.90215C13.0441 4.72242 13.434 4.67673 13.8486 4.72242C14.2379 4.76739 14.5151 4.94713 14.6523 5.21842L14.7442 5.51122L14.6984 5.73736C14.5378 6.14341 14.1924 6.45915 13.6184 6.70715C13.3885 6.81933 13.136 6.86502 12.8603 6.90928L10.0329 7.24867L9.98632 7.09044L9.94046 7.02235L10.0329 6.90911L12.3542 5.0154ZM8.44604 2.17305C8.56088 1.72203 8.8832 1.38371 9.29689 1.15793C9.71076 0.93233 10.1703 0.886818 10.6068 1.04486C11.0902 1.15793 11.4342 1.40593 11.6418 1.78941C11.7567 2.01519 11.8249 2.28594 11.8249 2.5791L11.7565 3.07493C11.6647 3.32311 11.5495 3.54907 11.4119 3.75227L9.34329 6.23337C9.13671 6.0755 8.90684 5.96243 8.67626 5.8499L8.44604 3.30107L8.42382 2.3983L8.44604 2.17305ZM4.51693 2.24043C4.53897 1.83456 4.69933 1.5638 4.97578 1.40611C5.11391 1.29304 5.32067 1.29304 5.50414 1.38371C5.91837 1.49678 6.26344 1.78958 6.53828 2.35368C6.65349 2.57946 6.76815 2.80488 6.81473 3.07529L7.27411 5.73789L6.92993 5.85043L4.88351 3.66178L4.76884 3.43636C4.58484 3.02995 4.47035 2.64666 4.51693 2.24043ZM1.13716 7.02253C0.953511 6.68475 0.953511 6.34661 1.09165 6.00812C1.25236 5.57878 1.55103 5.241 1.98694 5.06038C2.40153 4.8346 2.81451 4.76757 3.2746 4.87957L3.89523 5.12775L5.91801 6.5715C5.73419 6.79764 5.61898 7.02235 5.54965 7.24867L2.23992 7.65472L2.01059 7.60974C1.5969 7.54165 1.3208 7.36209 1.13716 7.02253ZM7.64443 13.6777L7.56318 13.9037C7.40212 14.3095 7.09705 14.648 6.68353 14.8274C6.26948 15.0536 5.81721 15.0985 5.40458 14.9867C4.9436 14.8735 4.59213 14.6029 4.40813 14.2416C4.29381 14.0169 4.19888 13.7456 4.19888 13.4745L4.31035 12.9566C4.35693 12.7307 4.47177 12.5045 4.65542 12.3245L6.58522 10.0677C6.81509 10.1811 7.10291 10.2939 7.35625 10.317C7.40158 11.0834 7.64443 11.8967 7.64443 12.7753V13.6777ZM6.76798 9.16709C6.46931 8.89597 6.30913 8.51161 6.30913 8.10592C6.30913 7.69969 6.46931 7.36173 6.76798 7.04546C7.04425 6.79764 7.41207 6.63959 7.8487 6.63959C8.26257 6.63959 8.65333 6.79782 8.90684 7.04546C9.22738 7.36173 9.36623 7.69969 9.36623 8.10592C9.36623 8.51161 9.22738 8.89562 8.90684 9.16709C8.60746 9.46007 8.26257 9.61687 7.8487 9.61687C7.41207 9.61723 7.04442 9.46042 6.76798 9.16709ZM11.0214 13.1138C10.9753 13.5209 10.8374 13.8139 10.5607 13.927C10.4007 14.0386 10.2165 14.0386 10.0325 14.0173C9.59592 13.9039 9.25103 13.5661 8.99858 13.0237L8.72195 12.2795L8.37777 10.3171L8.76764 10.181L9.0672 10.0243L10.0327 10.9929L10.6304 11.7152L10.7451 11.9403C10.9518 12.3245 11.0672 12.6857 11.0214 13.1138ZM14.9745 10.4741C14.8594 10.9264 14.5837 11.2644 14.1924 11.4441C13.7794 11.6702 13.3648 11.7154 12.906 11.5575C12.6296 11.4905 12.4459 11.376 12.2854 11.1966L9.87148 9.23411L10.0325 8.89597L10.1021 8.62468L12.6989 8.39872L13.618 8.37686L13.8486 8.39872C14.1924 8.51197 14.5151 8.71499 14.698 9.05295C14.9279 9.3022 15.0431 9.64034 15.0431 10.0247L14.9745 10.4741Z" fill="black"/>
|
||||
<path d="M15.6868 8.78273L15.5718 8.60175C15.3878 8.33117 15.2047 8.06059 14.9282 7.88014C14.6984 7.72192 14.4223 7.60956 14.1702 7.49649C14.8824 7.158 15.3697 6.68457 15.5999 6.0755C15.7606 5.57878 15.4667 5.17362 15.4667 4.76739V4.72242C15.4667 4.2705 14.8417 3.9777 14.2673 3.81965C13.9215 3.75209 13.5403 3.75209 13.1958 3.77396L12.4407 3.93218L12.6968 3.36862C12.9261 2.6463 12.8589 1.94745 12.4681 1.29269L12.3995 1.18069C12.0544 0.616059 11.549 0.277922 10.859 0.0976536C10.1469 -0.0831484 9.54045 -0.0155921 8.89689 0.322901C8.25226 0.662104 7.64443 1.18104 7.64443 1.85696V1.90194L7.56318 2.06016L7.44194 1.90194L7.19714 1.4966C6.82913 0.93233 6.36246 0.593837 5.78734 0.435613C5.28138 0.323078 4.86502 0.368234 4.42804 0.593837C3.9459 0.88664 3.6675 1.33909 3.55229 1.97003C3.43709 2.62426 3.55194 3.25627 3.89683 3.88721L4.05666 4.11352L3.50518 3.93218C2.81522 3.77396 2.17184 3.86463 1.52845 4.20294C0.861243 4.54108 0.447727 5.01522 0.171457 5.66927C-0.0813453 6.30092 -0.0578784 6.90929 0.263725 7.47391C0.40186 7.72209 0.608618 7.92512 0.792087 8.06059C1.06836 8.33099 1.41325 8.48904 1.82694 8.55659L1.9873 8.60157L1.64312 8.89562C1.3208 9.16673 1.13751 9.50469 1.02249 9.84283C0.907821 10.2487 0.953688 10.6549 1.18338 11.0391C1.29858 11.2192 1.41325 11.3758 1.59725 11.49C1.78125 11.6469 2.01094 11.7602 2.2865 11.7829C2.79246 11.8962 3.32136 11.8962 3.89541 11.7148L3.48118 12.392L3.36723 12.6852C3.137 13.4059 3.20545 14.0377 3.55052 14.6919C3.71159 14.9412 3.89541 15.1664 4.07941 15.3693C4.35515 15.6175 4.69933 15.7755 5.11391 15.8888C5.80228 16.0687 6.49224 16.0452 7.15962 15.7074C7.80319 15.3693 8.21617 14.8271 8.42364 14.1511L8.44586 14.0164C8.88302 14.4889 9.29671 14.8052 9.75699 14.9181C10.2164 15.053 10.6759 15.0313 11.0898 14.7599C11.4806 14.5339 11.7563 14.1508 11.8939 13.6766C12.0087 13.1806 12.0087 12.6848 11.8939 12.122C12.1232 12.2786 12.3538 12.3917 12.6292 12.4587C13.3643 12.6848 14.0086 12.6617 14.652 12.3236C15.2726 11.9858 15.6863 11.4432 15.8929 10.7444C16.0778 10.0679 16.0319 9.41402 15.6868 8.78273ZM12.3542 5.0154L12.6296 4.90215C13.0441 4.72242 13.434 4.67673 13.8486 4.72242C14.2379 4.76739 14.5151 4.94713 14.6523 5.21842L14.7442 5.51122L14.6984 5.73736C14.5378 6.14341 14.1924 6.45915 13.6184 6.70715C13.3885 6.81933 13.136 6.86502 12.8603 6.90928L10.0329 7.24867L9.98632 7.09044L9.94046 7.02235L10.0329 6.90911L12.3542 5.0154ZM8.44604 2.17305C8.56088 1.72203 8.8832 1.38371 9.29689 1.15793C9.71076 0.93233 10.1703 0.886818 10.6068 1.04486C11.0902 1.15793 11.4342 1.40593 11.6418 1.78941C11.7567 2.01519 11.8249 2.28594 11.8249 2.5791L11.7565 3.07493C11.6647 3.32311 11.5495 3.54907 11.4119 3.75227L9.34329 6.23337C9.13671 6.0755 8.90684 5.96243 8.67626 5.8499L8.44604 3.30107L8.42382 2.3983L8.44604 2.17305ZM4.51693 2.24043C4.53897 1.83456 4.69933 1.5638 4.97578 1.40611C5.11391 1.29304 5.32067 1.29304 5.50414 1.38371C5.91837 1.49678 6.26344 1.78958 6.53828 2.35368C6.65349 2.57946 6.76815 2.80488 6.81473 3.07529L7.27411 5.73789L6.92993 5.85043L4.88351 3.66178L4.76884 3.43636C4.58484 3.02995 4.47035 2.64666 4.51693 2.24043ZM1.13716 7.02253C0.953511 6.68475 0.953511 6.34661 1.09165 6.00812C1.25236 5.57878 1.55103 5.241 1.98694 5.06038C2.40153 4.8346 2.81451 4.76757 3.2746 4.87957L3.89523 5.12775L5.91801 6.5715C5.73419 6.79764 5.61898 7.02235 5.54965 7.24867L2.23992 7.65472L2.01059 7.60974C1.5969 7.54165 1.3208 7.36209 1.13716 7.02253ZM7.64443 13.6777L7.56318 13.9037C7.40212 14.3095 7.09705 14.648 6.68353 14.8274C6.26948 15.0536 5.81721 15.0985 5.40458 14.9867C4.9436 14.8735 4.59213 14.6029 4.40813 14.2416C4.29381 14.0169 4.19888 13.7456 4.19888 13.4745L4.31035 12.9566C4.35693 12.7307 4.47177 12.5045 4.65542 12.3245L6.58522 10.0677C6.81509 10.1811 7.10291 10.2939 7.35625 10.317C7.40158 11.0834 7.64443 11.8967 7.64443 12.7753V13.6777ZM6.76798 9.16709C6.46931 8.89597 6.30913 8.51161 6.30913 8.10592C6.30913 7.69969 6.46931 7.36173 6.76798 7.04546C7.04425 6.79764 7.41207 6.63959 7.8487 6.63959C8.26257 6.63959 8.65333 6.79782 8.90684 7.04546C9.22738 7.36173 9.36623 7.69969 9.36623 8.10592C9.36623 8.51161 9.22738 8.89562 8.90684 9.16709C8.60746 9.46007 8.26257 9.61687 7.8487 9.61687C7.41207 9.61723 7.04442 9.46042 6.76798 9.16709ZM11.0214 13.1138C10.9753 13.5209 10.8374 13.8139 10.5607 13.927C10.4007 14.0386 10.2165 14.0386 10.0325 14.0173C9.59592 13.9039 9.25103 13.5661 8.99858 13.0237L8.72195 12.2795L8.37777 10.3171L8.76764 10.181L9.0672 10.0243L10.0327 10.9929L10.6304 11.7152L10.7451 11.9403C10.9518 12.3245 11.0672 12.6857 11.0214 13.1138ZM14.9745 10.4741C14.8594 10.9264 14.5837 11.2644 14.1924 11.4441C13.7794 11.6702 13.3648 11.7154 12.906 11.5575C12.6296 11.4905 12.4459 11.376 12.2854 11.1966L9.87148 9.23411L10.0325 8.89597L10.1021 8.62468L12.6989 8.39872L13.618 8.37686L13.8486 8.39872C14.1924 8.51197 14.5151 8.71499 14.698 9.05295C14.9279 9.3022 15.0431 9.64034 15.0431 10.0247L14.9745 10.4741Z" fill="#333333"/>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 4.9 KiB After Width: | Height: | Size: 4.9 KiB |
@ -1,3 +1,3 @@
|
||||
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M3.2 4H20.8C22.01 4 23 4.97122 23 6.15826V18.8417C23 20.0288 22.01 21 20.8 21H3.2C1.99 21 1 20.0288 1 18.8417V6.15826C1 4.97122 1.99 4 3.2 4ZM12 13L21 8V6L12 11L3 6V8L12 13Z" fill="#7A95B0"/>
|
||||
</svg>
|
||||
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M14.4 1H1.6C0.72 1 0 1.7427 0 2.65044V12.3496C0 13.2573 0.72 14 1.6 14H14.4C15.28 14 16 13.2573 16 12.3496V2.65044C16 1.7427 15.28 1 14.4 1ZM14.5455 4.15152L8 8.09091L1.45455 4.15152V2.57576L8 6.51515L14.5455 2.57576V4.15152Z" fill="#333333"/>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 343 B After Width: | Height: | Size: 396 B |
@ -1,3 +1,3 @@
|
||||
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M15.9673 3.8126C15.973 3.88308 15.9792 3.95889 15.9862 4.04092C15.9862 4.04092 15.9997 4.15334 16 4.20071C16 4.64509 15.7014 5 15.334 5H12.6497C12.2904 4.98609 11.9999 4.63457 11.9999 4.19807L11.9956 3.87975C11.9956 3.39288 11.6675 3 11.2593 3H4.74139C4.33412 3 4.00391 3.39288 4.00391 3.87975L4.00235 4.18304C4.00235 4.61953 3.71036 4.98609 3.35165 5H0.667302C0.301382 5 0 4.64509 0 4.20071C0 4.15221 0.0144112 4.04092 0.0144112 4.04092C0.11059 2.90702 0.139086 2.84377 1 1.83093C2.03761 0.611313 5.14992 0 8.00115 0C10.8499 0 13.9636 0.610561 15 1.83093C15.8916 2.88079 15.8938 2.90886 15.9673 3.8126ZM11 4.83335V5L15.4756 8.80793C15.798 9.11119 16 9.53414 16 10L16.0007 13.6669C16.0007 14.4047 15.3796 14.9999 14.6094 14.9999H14.0007V15.1653C14.0007 15.6255 13.481 15.9999 13.0007 15.9999C12.5218 15.9999 12.0007 15.6255 12.0007 15.1653V14.9999H4.00073V15.1653C4.00073 15.6255 3.48259 15.9999 3.00073 15.9999C2.52214 15.9999 2.00073 15.6255 2.00073 15.1653V14.9999H1.39204C0.623812 14.9999 0.000732422 14.4044 0.000732422 13.6669L0 10C0 9.53382 0.2017 9.11119 0.525335 8.80793L5 5V4.83335C5 4.37438 5.51978 4 6 4C6.48055 4 7 4.3747 7 4.83335V5H9V4.83335C9 4.37438 9.52141 4 10 4C10.4789 4 11 4.3747 11 4.83335ZM8 13C9.65685 13 11 11.6569 11 10C11 8.34315 9.65685 7 8 7C6.34315 7 5 8.34315 5 10C5 11.6569 6.34315 13 8 13ZM8 11C8.55229 11 9 10.5523 9 10C9 9.44771 8.55229 9 8 9C7.44772 9 7 9.44771 7 10C7 10.5523 7.44772 11 8 11Z" fill="#333333"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M15.9665 3.81262C15.9723 3.8831 15.9784 3.95891 15.9855 4.04094C15.9855 4.04094 15.999 4.15335 15.9993 4.20073C15.9993 4.64511 15.7007 5.00002 15.3332 5.00002H12.6491C12.2898 4.98611 11.9994 4.63459 11.9994 4.19809L11.995 3.87977C11.995 3.3929 11.667 3.00001 11.2588 3.00001H4.74118C4.33392 3.00001 4.00373 3.3929 4.00373 3.87977L4.00217 4.18306C4.00217 4.61955 3.71019 4.98611 3.3515 5.00002H0.667272C0.301369 5.00002 0 4.64511 0 4.20073C0 4.15223 0.0144106 4.04094 0.0144106 4.04094C0.110585 2.90704 0.13908 2.84378 0.999954 1.83094C2.03751 0.611316 5.14968 0 8.00078 0C10.8494 0 13.963 0.610564 14.9993 1.83094C15.8908 2.88081 15.8931 2.90887 15.9665 3.81262ZM10.9995 4.83336V5L15.4749 8.80795C15.7972 9.11122 15.9993 9.53416 15.9993 10L16 13.6669C16 14.4047 15.3789 15 14.6088 15H14.0001V15.1654C14.0001 15.6256 13.4803 16 13.0001 16C12.5212 16 12.0002 15.6256 12.0002 15.1654V15H4.00055V15.1654C4.00055 15.6256 3.48243 16 3.0006 16C2.52203 16 2.00064 15.6256 2.00064 15.1654V15H1.39197C0.623783 15 0.000732388 14.4044 0.000732388 13.6669L0 10C0 9.53385 0.201691 9.11122 0.525311 8.80795L4.99977 5V4.83336C4.99977 4.37438 5.51953 4 5.99973 4C6.48025 4 6.99968 4.3747 6.99968 4.83336V5H8.99959V4.83336C8.99959 4.37438 9.52098 4 9.99954 4C10.4784 4 10.9995 4.3747 10.9995 4.83336ZM7.99963 13.0001C9.65641 13.0001 10.9995 11.6569 10.9995 10C10.9995 8.34318 9.65641 7.00003 7.99963 7.00003C6.34286 7.00003 4.99977 8.34318 4.99977 10C4.99977 11.6569 6.34286 13.0001 7.99963 13.0001ZM7.99968 11C8.55196 11 8.99968 10.5523 8.99968 10C8.99968 9.44776 8.55196 9.00004 7.99968 9.00004C7.44739 9.00004 6.99968 9.44776 6.99968 10C6.99968 10.5523 7.44739 11 7.99968 11Z" fill="#333333"/>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.8 KiB |
@ -1,3 +1,3 @@
|
||||
<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M15.75 0H2.25C1.00912 0 0 1.00912 0 2.25V15.75C0 16.9909 1.00912 18 2.25 18H9V11.4579H6.54346V9H9V6.64499C9 4.78087 10.5109 3.26999 12.375 3.26999H14.7237V5.73094H13.401C12.78 5.73094 12.276 5.92288 12.276 6.54388V9H15.1875L14.0625 11.4579H12.276V18H15.75C16.9909 18 18 16.9909 18 15.75V2.25C18 1.00912 16.9909 0 15.75 0Z" fill="#4469B0"/>
|
||||
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M14 0H2C0.897 0 0 0.897 0 2V14C0 15.103 0.897 16 2 16H8V10.1848H5.81641V8H8V5.90666C8 4.24966 9.343 2.90666 11 2.90666H13.0877V5.09417H11.912C11.36 5.09417 10.912 5.26478 10.912 5.81678V8H13.5L12.5 10.1848H10.912V16H14C15.103 16 16 15.103 16 14V2C16 0.897 15.103 0 14 0Z" fill="#333333"/>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 494 B After Width: | Height: | Size: 441 B |
@ -1,3 +1,3 @@
|
||||
<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M16.2 0H1.8C0.81 0 0 0.81 0 1.8V16.2C0 17.19 0.81 18 1.8 18H16.2C17.19 18 18 17.19 18 16.2V1.8C18 0.81 17.19 0 16.2 0ZM14.13 6.57002C14.04 10.71 11.43 13.59 7.47 13.77C5.85 13.86 4.68 13.32 3.6 12.69C4.77 12.8701 6.3 12.4201 7.11 11.7C5.94 11.61 5.22 10.98 4.86 9.99002C5.22 10.08 5.58 9.99002 5.85 9.99002C4.77 9.63002 4.05 9.00002 3.96 7.56002C4.23 7.74002 4.59 7.83002 4.95 7.83002C4.14 7.38002 3.6 5.67002 4.23 4.59002C5.4 5.85002 6.84 6.93002 9.18 7.11002C8.55 4.59002 11.97 3.24002 13.32 4.95002C13.95 4.86002 14.4 4.59002 14.85 4.41002C14.67 5.04002 14.31 5.40002 13.86 5.76002C14.31 5.67002 14.76 5.58002 15.12 5.40002C15.03 5.85002 14.58 6.21002 14.13 6.57002Z" fill="#2AA3EF"/>
|
||||
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M14.4 0H1.6C0.72 0 0 0.72 0 1.6V14.4C0 15.28 0.72 16 1.6 16H14.4C15.28 16 16 15.28 16 14.4V1.6C16 0.72 15.28 0 14.4 0ZM12.56 5.84C12.48 9.52 10.16 12.08 6.64 12.24C5.2 12.32 4.16 11.84 3.2 11.28C4.24 11.44 5.6 11.04 6.32 10.4C5.28 10.32 4.64 9.76 4.32 8.88C4.64 8.96 4.96 8.88 5.2 8.88C4.24 8.56 3.6 8 3.52 6.72C3.76 6.88 4.08 6.96 4.4 6.96C3.68 6.56 3.2 5.04 3.76 4.08C4.8 5.2 6.08 6.16 8.16 6.32C7.6 4.08 10.64 2.88 11.84 4.4C12.4 4.32 12.8 4.08 13.2 3.92C13.04 4.48 12.72 4.8 12.32 5.12C12.72 5.04 13.12 4.96 13.44 4.8C13.36 5.2 12.96 5.52 12.56 5.84Z" fill="#333333"/>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 842 B After Width: | Height: | Size: 725 B |
@ -1,3 +1,3 @@
|
||||
<svg width="16" height="17" viewBox="0 0 16 17" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M15.0135 9.35418C15.0975 8.91623 15.1419 8.46432 15.1419 8.00193C15.1419 4.05724 11.9439 0.859468 7.99934 0.859468C7.5369 0.859468 7.08494 0.903932 6.64694 0.987915C5.07009 -0.386639 2.67602 -0.324331 1.17452 1.17712C-0.327022 2.67852 -0.389378 5.07274 0.985321 6.64968C0.901387 7.08758 0.856923 7.53954 0.856923 8.00193C0.856923 11.9467 4.05489 15.1444 7.99938 15.1444C8.46187 15.1444 8.91388 15.1 9.35192 15.016C10.9287 16.3905 13.3228 16.3282 14.8243 14.8268C16.3256 13.3253 16.3881 10.9311 15.0135 9.35418ZM8.13544 12.4011C6.02003 12.4011 4.25723 11.4556 4.25723 10.3016C4.25723 9.78888 4.54554 9.32397 5.20252 9.32397C6.21234 9.32397 6.30859 10.7663 8.03963 10.7663C8.87276 10.7663 9.40172 10.3977 9.40172 9.91703C9.40172 9.32397 8.88891 9.22787 8.05558 9.01956L6.67734 8.6831C5.31486 8.34644 4.25723 7.78557 4.25723 6.21493C4.25723 4.30778 6.14819 3.60271 7.76688 3.60271C9.54597 3.60271 11.3409 4.30778 11.3409 5.38146C11.3409 5.92628 10.972 6.40738 10.3632 6.40738C9.44963 6.40738 9.41733 5.33356 7.94328 5.33356C7.12601 5.33356 6.59714 5.55786 6.59714 6.05477C6.59714 6.59959 7.12601 6.72765 7.84737 6.88805L8.82471 7.1125C10.1547 7.41677 11.7416 7.97778 11.7416 9.61277C11.7416 11.5196 9.89824 12.4011 8.13544 12.4011Z" fill="#333333"/>
|
||||
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M15.0133 9.35222C15.0972 8.91428 15.1416 8.46236 15.1416 7.99998C15.1416 4.05529 11.9436 0.857515 7.99909 0.857515C7.53666 0.857515 7.08469 0.901979 6.6467 0.985961C5.06985 -0.388592 2.67578 -0.326284 1.17428 1.17516C-0.327266 2.67656 -0.389623 5.07078 0.985076 6.64773C0.901143 7.08563 0.856679 7.53759 0.856679 7.99998C0.856679 11.9447 4.05464 15.1425 7.99914 15.1425C8.46162 15.1425 8.91363 15.098 9.35168 15.014C10.9284 16.3886 13.3226 16.3263 14.824 14.8248C16.3254 13.3234 16.3879 10.9292 15.0133 9.35222ZM8.1352 12.3991C6.01979 12.3991 4.25699 11.4536 4.25699 10.2997C4.25699 9.78693 4.5453 9.32202 5.20227 9.32202C6.21209 9.32202 6.30834 10.7644 8.03939 10.7644C8.87252 10.7644 9.40148 10.3957 9.40148 9.91508C9.40148 9.32202 8.88866 9.22591 8.05534 9.0176L6.6771 8.68114C5.31462 8.34449 4.25699 7.78362 4.25699 6.21298C4.25699 4.30583 6.14794 3.60076 7.76664 3.60076C9.54573 3.60076 11.3406 4.30583 11.3406 5.37951C11.3406 5.92433 10.9717 6.40543 10.363 6.40543C9.44938 6.40543 9.41709 5.3316 7.94304 5.3316C7.12576 5.3316 6.5969 5.55591 6.5969 6.05282C6.5969 6.59764 7.12576 6.7257 7.84713 6.8861L8.82446 7.11055C10.1544 7.41482 11.7413 7.97583 11.7413 9.61081C11.7413 11.5176 9.898 12.3991 8.1352 12.3991Z" fill="#333333"/>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
@ -1,3 +1,3 @@
|
||||
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M0 7V3L6 2V7H0ZM8 1.5L15.9979 0V7H8V1.5ZM15.9979 9V16L8 14.5V9H15.9979ZM6 14L0 13L0.00520002 9H6V14Z" fill="#333333"/>
|
||||
<path d="M0 7V3L6.00078 2V7H0ZM8.00103 1.5L16 0V7H8.00103V1.5ZM16 9V16L8.00103 14.5V9H16ZM6.00078 14L0 13L0.00520069 9H6.00078V14Z" fill="#333333"/>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 231 B After Width: | Height: | Size: 252 B |
@ -102,7 +102,7 @@ class InputBlock extends React.Component {
|
||||
} else {
|
||||
switch (size) {
|
||||
case "base":
|
||||
iconButtonSize = 15;
|
||||
iconButtonSize = 16;
|
||||
break;
|
||||
case "middle":
|
||||
iconButtonSize = 18;
|
||||
|
||||
@ -3,7 +3,7 @@ import styled from "styled-components";
|
||||
import PropTypes from "prop-types";
|
||||
import isEqual from "lodash/isEqual";
|
||||
|
||||
import { tablet } from "../../utils/device";
|
||||
import { tablet, mobile } from "../../utils/device";
|
||||
import InputBlock from "../input-block";
|
||||
import { Icons } from "../icons";
|
||||
import Link from "../link";
|
||||
@ -47,6 +47,15 @@ const StyledInput = styled(SimpleInput)`
|
||||
line-height: 14px;
|
||||
margin-top: -2px;
|
||||
}
|
||||
|
||||
.password-field-wrapper {
|
||||
display: flex;
|
||||
width: auto;
|
||||
|
||||
@media ${mobile} {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
`;
|
||||
|
||||
const PasswordProgress = styled.div`
|
||||
@ -402,45 +411,46 @@ class PasswordInput extends React.Component {
|
||||
)
|
||||
: null;
|
||||
|
||||
const tooltipContent = !isDisableTooltip ? (
|
||||
<StyledTooltipContainer forwardedAs="div" title={tooltipPasswordTitle}>
|
||||
{tooltipPasswordTitle}
|
||||
<StyledTooltipItem
|
||||
forwardedAs="div"
|
||||
title={tooltipPasswordLength}
|
||||
valid={validLength}
|
||||
>
|
||||
{tooltipPasswordLength}
|
||||
</StyledTooltipItem>
|
||||
{passwordSettings.digits && (
|
||||
const tooltipContent =
|
||||
!isDisableTooltip && !isDisabled ? (
|
||||
<StyledTooltipContainer forwardedAs="div" title={tooltipPasswordTitle}>
|
||||
{tooltipPasswordTitle}
|
||||
<StyledTooltipItem
|
||||
forwardedAs="div"
|
||||
title={tooltipPasswordDigits}
|
||||
valid={validDigits}
|
||||
title={tooltipPasswordLength}
|
||||
valid={validLength}
|
||||
>
|
||||
{tooltipPasswordDigits}
|
||||
{tooltipPasswordLength}
|
||||
</StyledTooltipItem>
|
||||
)}
|
||||
{passwordSettings.upperCase && (
|
||||
<StyledTooltipItem
|
||||
forwardedAs="div"
|
||||
title={tooltipPasswordCapital}
|
||||
valid={validCapital}
|
||||
>
|
||||
{tooltipPasswordCapital}
|
||||
</StyledTooltipItem>
|
||||
)}
|
||||
{passwordSettings.specSymbols && (
|
||||
<StyledTooltipItem
|
||||
forwardedAs="div"
|
||||
title={tooltipPasswordSpecial}
|
||||
valid={validSpecial}
|
||||
>
|
||||
{tooltipPasswordSpecial}
|
||||
</StyledTooltipItem>
|
||||
)}
|
||||
</StyledTooltipContainer>
|
||||
) : null;
|
||||
{passwordSettings.digits && (
|
||||
<StyledTooltipItem
|
||||
forwardedAs="div"
|
||||
title={tooltipPasswordDigits}
|
||||
valid={validDigits}
|
||||
>
|
||||
{tooltipPasswordDigits}
|
||||
</StyledTooltipItem>
|
||||
)}
|
||||
{passwordSettings.upperCase && (
|
||||
<StyledTooltipItem
|
||||
forwardedAs="div"
|
||||
title={tooltipPasswordCapital}
|
||||
valid={validCapital}
|
||||
>
|
||||
{tooltipPasswordCapital}
|
||||
</StyledTooltipItem>
|
||||
)}
|
||||
{passwordSettings.specSymbols && (
|
||||
<StyledTooltipItem
|
||||
forwardedAs="div"
|
||||
title={tooltipPasswordSpecial}
|
||||
valid={validSpecial}
|
||||
>
|
||||
{tooltipPasswordSpecial}
|
||||
</StyledTooltipItem>
|
||||
)}
|
||||
</StyledTooltipContainer>
|
||||
) : null;
|
||||
|
||||
const inputGroup = (
|
||||
<>
|
||||
@ -500,25 +510,27 @@ class PasswordInput extends React.Component {
|
||||
</>
|
||||
) : (
|
||||
<>
|
||||
<PasswordProgress
|
||||
inputWidth={inputWidth}
|
||||
data-for="tooltipContent"
|
||||
data-tip=""
|
||||
data-event="click"
|
||||
ref={this.ref}
|
||||
>
|
||||
{inputGroup}
|
||||
</PasswordProgress>
|
||||
{!hideNewPasswordButton ? (
|
||||
<NewPasswordButton>
|
||||
<Icons.RefreshIcon
|
||||
size="medium"
|
||||
color={iconsColor}
|
||||
isfill={true}
|
||||
onClick={this.onGeneratePassword}
|
||||
/>
|
||||
</NewPasswordButton>
|
||||
) : null}
|
||||
<div className="password-field-wrapper">
|
||||
<PasswordProgress
|
||||
inputWidth={inputWidth}
|
||||
data-for="tooltipContent"
|
||||
data-tip=""
|
||||
data-event="click"
|
||||
ref={this.ref}
|
||||
>
|
||||
{inputGroup}
|
||||
</PasswordProgress>
|
||||
{!hideNewPasswordButton ? (
|
||||
<NewPasswordButton>
|
||||
<Icons.RefreshIcon
|
||||
size="medium"
|
||||
color={iconsColor}
|
||||
isfill={true}
|
||||
onClick={this.onGeneratePassword}
|
||||
/>
|
||||
</NewPasswordButton>
|
||||
) : null}
|
||||
</div>
|
||||
{textTooltip}
|
||||
<CopyLink>
|
||||
<Link
|
||||
@ -609,6 +621,12 @@ PasswordInput.defaultProps = {
|
||||
tooltipOffsetLeft: 110,
|
||||
|
||||
simpleView: false,
|
||||
passwordSettings: {
|
||||
minLength: 8,
|
||||
upperCase: false,
|
||||
digits: false,
|
||||
specSymbols: false,
|
||||
},
|
||||
};
|
||||
|
||||
export default PasswordInput;
|
||||
|
||||
@ -102,6 +102,7 @@ const MainContainer = styled.div`
|
||||
`;
|
||||
|
||||
const MainIcons = styled.div`
|
||||
height: 19px;
|
||||
align-self: center;
|
||||
white-space: nowrap;
|
||||
`;
|
||||
|
||||
@ -130,7 +130,7 @@ const TreeNodeMenu = styled(TreeNode)`
|
||||
}
|
||||
`}
|
||||
.draggable {
|
||||
color: #333;
|
||||
color: #555F65;
|
||||
/* Required to make elements draggable in old WebKit */
|
||||
-khtml-user-drag: none;
|
||||
-webkit-user-drag: none;
|
||||
@ -291,7 +291,7 @@ const TreeNodeMenu = styled(TreeNode)`
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
color: #333;
|
||||
color: #555F65;
|
||||
padding-left: ${(props) =>
|
||||
props.icon || props.disableSwitch ? "0" : "20px"};
|
||||
}
|
||||
|
||||
@ -18,6 +18,7 @@ export { default as EmailInput } from "./components/email-input";
|
||||
export { default as EmptyScreenContainer } from "./components/empty-screen-container";
|
||||
export { default as FieldContainer } from "./components/field-container";
|
||||
export { default as FileInput } from "./components/file-input";
|
||||
export { default as Grid } from "./components/grid";
|
||||
export { default as GroupButton } from "./components/group-button";
|
||||
export { default as GroupButtonsMenu } from "./components/group-buttons-menu";
|
||||
export { default as Heading } from "./components/heading";
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user