[#664980] Add uri attribute

comindware · Jul 25, 2021 · ec88929 · ec88929
1 parent 7975ac9
commit ec88929
Show file tree

Hide file tree

Showing 22 changed files with 491 additions and 8 deletions.
diff --git a/dist/localization/localization.de.json b/dist/localization/localization.de.json
diff --git a/dist/localization/localization.en.json b/dist/localization/localization.en.json
diff --git a/dist/localization/localization.ru.json b/dist/localization/localization.ru.json
diff --git a/localization/localization.n3 b/localization/localization.n3
@@ -107,6 +107,8 @@
 
 <http://comindware.com/text/core/form/editors#time> a l10n:Resource; l10n:descr ""; l10n:isLocalizable false; l10n:createdBy ""; l10n:modifiedBy "Alexey Prykin"; l10n:creationDate "2015-07-20T09:03:54.6770417Z"; l10n:modificationDate "2015-07-31T11:53:29.8063851Z"; l10n:text [a l10n:Text; l10n:lang l10n:en; l10n:data "time"].
 
+<http://comindware.com/text/core/form/editors#uriEditor> a l10n:Resource; l10n:descr ""; l10n:isLocalizable true; l10n:needsReview true; l10n:createdBy "Anton Podkolzin"; l10n:modifiedBy "Anton Podkolzin"; l10n:creationDate "2021-07-14T09:36:55.6060488Z"; l10n:modificationDate "2021-07-14T09:36:55.6060488Z"; l10n:text [a l10n:Text; l10n:lang l10n:en; l10n:data "uriEditor"; l10n:originalData "{62D69EB8-800C-480F-9571-E11F3DF477C0}"].
+
 <http://comindware.com/text/core/form/editors#workSpaceItemSplit> a l10n:Resource; l10n:descr ""; l10n:isLocalizable true; l10n:needsReview true; l10n:createdBy "Vladislav Smirnov"; l10n:modifiedBy "Vladislav Smirnov"; l10n:creationDate "2017-10-04T07:00:24.5503380Z"; l10n:modificationDate "2017-10-04T07:00:24.5503380Z"; l10n:text [a l10n:Text; l10n:lang l10n:en; l10n:data "workSpaceItemSplit"; l10n:originalData "{62D69EB8-800C-480F-9571-E11F3DF477C0}"].
 
 <http://comindware.com/text/core/form/editors/avatar#change> a l10n:Resource; l10n:descr ""; l10n:isLocalizable true; l10n:needsReview true; l10n:createdBy "Oleg Verevkin"; l10n:modifiedBy "Vasiliy Zorin"; l10n:creationDate "2016-02-24T15:13:59.1410444Z"; l10n:modificationDate "2018-12-13T14:58:15.6684977Z"; l10n:text [a l10n:Text; l10n:lang l10n:en; l10n:data "Change"; l10n:originalData "{62D69EB8-800C-480F-9571-E11F3DF477C0}"].
@@ -429,6 +431,24 @@
 
 <http://comindware.com/text/core/form/editors/time#readonlyPlaceholder> a l10n:Resource; l10n:descr ""; l10n:isLocalizable false; l10n:createdBy ""; l10n:modifiedBy "Alexey Prykin"; l10n:creationDate "2015-07-20T09:04:17.2918241Z"; l10n:modificationDate "2015-09-03T15:22:13.2352889Z"; l10n:param <http://comindware.com/text/core/form/editors/textEditor#readonlyPlaceholder>; l10n:text [a l10n:Text; l10n:lang l10n:en; l10n:data "{0}"].
 
+<http://comindware.com/text/core/form/editors/uriEditor#msgValidatorCallTo> a l10n:Resource; l10n:descr ""; l10n:isLocalizable true; l10n:needsReview true; l10n:createdBy "Anton Podkolzin"; l10n:modifiedBy "Anton Podkolzin"; l10n:creationDate "2021-07-14T10:16:42.6482777Z"; l10n:modificationDate "2021-07-14T10:17:53.5304578Z"; l10n:text [a l10n:Text; l10n:lang l10n:en; l10n:data "Doesn't match the phone call link format"; l10n:originalData "{62D69EB8-800C-480F-9571-E11F3DF477C0}"].
+
+<http://comindware.com/text/core/form/editors/uriEditor#msgValidatorFtp> a l10n:Resource; l10n:descr ""; l10n:isLocalizable true; l10n:needsReview true; l10n:createdBy "Anton Podkolzin"; l10n:modifiedBy "Anton Podkolzin"; l10n:creationDate "2021-07-14T10:14:35.3473699Z"; l10n:modificationDate "2021-07-14T10:15:04.3736195Z"; l10n:text [a l10n:Text; l10n:lang l10n:en; l10n:data "Doesn't match FTP link format"; l10n:originalData "{62D69EB8-800C-480F-9571-E11F3DF477C0}"].
+
+<http://comindware.com/text/core/form/editors/uriEditor#msgValidatorFtps> a l10n:Resource; l10n:descr ""; l10n:isLocalizable true; l10n:needsReview true; l10n:createdBy "Anton Podkolzin"; l10n:modifiedBy "Anton Podkolzin"; l10n:creationDate "2021-07-23T16:42:06.8525743Z"; l10n:modificationDate "2021-07-23T16:42:22.8480527Z"; l10n:text [a l10n:Text; l10n:lang l10n:en; l10n:data "Doesn't match FTPS link format"; l10n:originalData "{62D69EB8-800C-480F-9571-E11F3DF477C0}"].
+
+<http://comindware.com/text/core/form/editors/uriEditor#msgValidatorGit> a l10n:Resource; l10n:descr ""; l10n:isLocalizable true; l10n:needsReview true; l10n:createdBy "Anton Podkolzin"; l10n:modifiedBy "Anton Podkolzin"; l10n:creationDate "2021-07-14T10:30:40.6012610Z"; l10n:modificationDate "2021-07-14T10:30:50.1206418Z"; l10n:text [a l10n:Text; l10n:lang l10n:en; l10n:data "Doesn't match GIT link format"; l10n:originalData "{62D69EB8-800C-480F-9571-E11F3DF477C0}"].
+
+<http://comindware.com/text/core/form/editors/uriEditor#msgValidatorHttp> a l10n:Resource; l10n:descr ""; l10n:isLocalizable true; l10n:needsReview true; l10n:createdBy "Anton Podkolzin"; l10n:modifiedBy "Anton Podkolzin"; l10n:creationDate "2021-07-14T09:37:19.7612342Z"; l10n:modificationDate "2021-07-14T10:11:39.7541419Z"; l10n:text [a l10n:Text; l10n:lang l10n:en; l10n:data "Doesn't match HTTP link format"; l10n:originalData "{62D69EB8-800C-480F-9571-E11F3DF477C0}"].
+
+<http://comindware.com/text/core/form/editors/uriEditor#msgValidatorHttps> a l10n:Resource; l10n:descr ""; l10n:isLocalizable true; l10n:needsReview true; l10n:createdBy "Anton Podkolzin"; l10n:modifiedBy "Anton Podkolzin"; l10n:creationDate "2021-07-14T10:12:57.6918047Z"; l10n:modificationDate "2021-07-14T10:13:19.9109059Z"; l10n:text [a l10n:Text; l10n:lang l10n:en; l10n:data "Doesn't match HTTPS link format"; l10n:originalData "{62D69EB8-800C-480F-9571-E11F3DF477C0}"].
+
+<http://comindware.com/text/core/form/editors/uriEditor#msgValidatorMailTo> a l10n:Resource; l10n:descr ""; l10n:isLocalizable true; l10n:needsReview true; l10n:createdBy "Anton Podkolzin"; l10n:modifiedBy "Anton Podkolzin"; l10n:creationDate "2021-07-14T10:19:08.6754411Z"; l10n:modificationDate "2021-07-14T10:19:28.0919745Z"; l10n:text [a l10n:Text; l10n:lang l10n:en; l10n:data "Doesn't match the email link format"; l10n:originalData "{62D69EB8-800C-480F-9571-E11F3DF477C0}"].
+
+<http://comindware.com/text/core/form/editors/uriEditor#msgValidatorSsh> a l10n:Resource; l10n:descr ""; l10n:isLocalizable true; l10n:needsReview true; l10n:createdBy "Anton Podkolzin"; l10n:modifiedBy "Anton Podkolzin"; l10n:creationDate "2021-07-14T10:40:55.4457541Z"; l10n:modificationDate "2021-07-14T10:41:14.2055912Z"; l10n:text [a l10n:Text; l10n:lang l10n:en; l10n:data "Doesn't match SSH link format"; l10n:originalData "{62D69EB8-800C-480F-9571-E11F3DF477C0}"].
+
+<http://comindware.com/text/core/form/editors/uriEditor#msgValidatorTelegram> a l10n:Resource; l10n:descr ""; l10n:isLocalizable true; l10n:needsReview true; l10n:createdBy "Anton Podkolzin"; l10n:modifiedBy "Anton Podkolzin"; l10n:creationDate "2021-07-14T10:15:55.1909664Z"; l10n:modificationDate "2021-07-14T10:16:07.4466811Z"; l10n:text [a l10n:Text; l10n:lang l10n:en; l10n:data "Doesn't match the Telegram messenger link format"; l10n:originalData "{62D69EB8-800C-480F-9571-E11F3DF477C0}"].
+
 <http://comindware.com/text/core/form/editors/workSpaceItemSplit#availableSections> a l10n:Resource; l10n:descr ""; l10n:isLocalizable true; l10n:needsReview true; l10n:createdBy "Vladislav Smirnov"; l10n:modifiedBy "Vladislav Smirnov"; l10n:creationDate "2017-10-04T07:00:32.6818720Z"; l10n:modificationDate "2017-10-04T07:01:53.1359092Z"; l10n:text [a l10n:Text; l10n:lang l10n:en; l10n:data "Available"; l10n:originalData "{62D69EB8-800C-480F-9571-E11F3DF477C0}"].
 
 <http://comindware.com/text/core/form/editors/workSpaceItemSplit#cancel> a l10n:Resource; l10n:descr ""; l10n:isLocalizable true; l10n:needsReview true; l10n:createdBy "Vladislav Smirnov"; l10n:modifiedBy "Vladislav Smirnov"; l10n:creationDate "2017-10-04T07:01:46.0803260Z"; l10n:modificationDate "2017-10-04T07:02:06.3275712Z"; l10n:text [a l10n:Text; l10n:lang l10n:en; l10n:data "Cancel"; l10n:originalData "{62D69EB8-800C-480F-9571-E11F3DF477C0}"].

diff --git a/localization/localization.ru.n3 b/localization/localization.ru.n3
@@ -290,6 +290,24 @@
 
 <http://comindware.com/text/core/form/editors/time#emptyPlaceholder> l10n:text [a l10n:Text; l10n:lang l10n:ru; l10n:data "Время"; l10n:originalData "Time"].
 
+<http://comindware.com/text/core/form/editors/uriEditor#msgValidatorCallTo> l10n:text [a l10n:Text; l10n:lang l10n:ru; l10n:data "Не соответствует формату ссылки телефонных звонков"; l10n:originalData "Doesn't match the phone call link format"].
+
+<http://comindware.com/text/core/form/editors/uriEditor#msgValidatorFtp> l10n:text [a l10n:Text; l10n:lang l10n:ru; l10n:data "Не соответствует формату FTP ссылки"; l10n:originalData "Не соответствует формату FTP URI"].
+
+<http://comindware.com/text/core/form/editors/uriEditor#msgValidatorFtps> l10n:text [a l10n:Text; l10n:lang l10n:ru; l10n:data "Не соответствует формату FTPS ссылки"; l10n:originalData "Doesn't match FTPS link format"].
+
+<http://comindware.com/text/core/form/editors/uriEditor#msgValidatorGit> l10n:text [a l10n:Text; l10n:lang l10n:ru; l10n:data "Не соответствует формату GIT ссылки"; l10n:originalData "Doesn't match GIT link format"].
+
+<http://comindware.com/text/core/form/editors/uriEditor#msgValidatorHttp> l10n:text [a l10n:Text; l10n:lang l10n:ru; l10n:data "Не соответствует формату HTTP ссылки"; l10n:originalData "Doesn't match HTTP link format"].
+
+<http://comindware.com/text/core/form/editors/uriEditor#msgValidatorHttps> l10n:text [a l10n:Text; l10n:lang l10n:ru; l10n:data "Не соответствует формату HTTPS ссылки"; l10n:originalData "Doesn't match HTTPS link format"].
+
+<http://comindware.com/text/core/form/editors/uriEditor#msgValidatorMailTo> l10n:text [a l10n:Text; l10n:lang l10n:ru; l10n:data "Не соответствует формату ссылки электронной почты"; l10n:originalData "Doesn't match the email link format"].
+
+<http://comindware.com/text/core/form/editors/uriEditor#msgValidatorSsh> l10n:text [a l10n:Text; l10n:lang l10n:ru; l10n:data "Не соответствует формату SSH ссылки"; l10n:originalData "msgValidatorSsh"].
+
+<http://comindware.com/text/core/form/editors/uriEditor#msgValidatorTelegram> l10n:text [a l10n:Text; l10n:lang l10n:ru; l10n:data "Не соответствует формату ссылки мессенджера Telegram"; l10n:originalData "The link does not match the Telegram messenger format"].
+
 <http://comindware.com/text/core/form/editors/workSpaceItemSplit#availableSections> l10n:text [a l10n:Text; l10n:lang l10n:ru; l10n:data "Доступно"; l10n:originalData "Available"].
 
 <http://comindware.com/text/core/form/editors/workSpaceItemSplit#cancel> l10n:text [a l10n:Text; l10n:lang l10n:ru; l10n:data "Отмена"; l10n:originalData "Cancel"].

diff --git a/resources/styles/baseStyles.css b/resources/styles/baseStyles.css
@@ -1,5 +1,6 @@
 .editor_focused:not(.editor_readonly):not(.editor_disabled) .input,
 .editor_focused:not(.editor_readonly):not(.editor_disabled) .textarea,
+.editor_focused:not(.editor_readonly):not(.editor_disabled) .editor_uri,
 .editor_bubble:not(.editor_readonly):not(.editor_disabled) .bubbles.editor_focused,
 .editor_checkbox.editor_focused:not(.editor_readonly):not(.editor_disabled) .checkbox,
 .editor_date-time.editor_focused:not(.editor_readonly):not(.editor_disabled) {

diff --git a/resources/styles/form.css b/resources/styles/form.css
@@ -543,10 +543,31 @@ td > .icon-true {
     font-size: 11px;
 }
 
+.editor_uri,
 .bubbles {
     position: relative;
 }
 
+.icon-edit_uri {
+    position: absolute;
+    top: 50%;
+    cursor: pointer;
+    transform: translateY(-50%);
+}
+
+.uri-form a {
+    overflow: hidden;
+    max-width: 95%;
+    text-overflow: ellipsis;
+}
+
+.editor_uri {
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    align-items: center;
+}
+
 .bubbles__list {
     height: 100%;
     display: flex;
@@ -617,6 +638,7 @@ td > .icon-true {
     min-width: 0;
 }
 
+.uri-input,
 .bubbles__input {
     width: 100%;
     height: 100%;
@@ -1205,3 +1227,18 @@ input[type="color"],
 .cell .complex-editor-field .dev-complex-editor-item {
     flex: 2;
 }
+
+.uri-form {
+    width: 100%;
+    max-width: 100%;
+    display: inline-flex;
+    line-height: initial;
+}
+
+.editor_uri:hover .icon-edit_uri {
+    visibility: visible;
+}
+
+.icon-edit_uri {
+    visibility: hidden;
+}
diff --git a/resources/styles/theme.css b/resources/styles/theme.css
@@ -862,12 +862,14 @@ tr:not(:first-child) .cell_selection {
 
 /* Dropdown Bubbles */
 
+.editor_uri,
 .bubbles {
   border-radius: 4px;
   background-color: var(--theme-colors__main);
   border: 1px solid var(--editors-color-border);
   padding: var(--dropdown-padding);
-  line-height: 26px;
+  flex: none;
+  height: 30px;
 }
 
 .editor_readonly .bubbles__caret, .editor_disabled .bubbles__caret {

diff --git a/src/Meta.ts b/src/Meta.ts
@@ -5,6 +5,7 @@ const meta = {
     socialLinksLoginPage: 'globe',
     linksLoginPage: 'external-link',
     infoNewsItem: 'info-square',
+    uri: 'arrow-alt-from-bottom',
     formRoot: 'window',
     reference: 'link',
     instance: 'link',
@@ -74,11 +75,13 @@ export const objectPropertyTypes = {
     INSTANCE: 'Instance',
     COLLECTION: 'Collection',
     ENUM: 'Enum',
-    ROLE: 'Role',
-    ORGANIZATION_UNIT: 'OrganizationalUnit'
+    ROLE: 'Role',    
+    ORGANIZATION_UNIT: 'OrganizationalUnit',
+    URI: 'Uri'
 };
 
 export const fieldTypes = {
+    Uri: 'uri',
     Text: 'text',
     Number: 'number',
     Duration: 'duration',