qms-angular 1.0.20 → 1.0.24

package/src/assets/qms-ckeditor-plugin/src/plugins/common/qmsCKEditorConstant.js

@@ -8,3 +8,4 @@ export const QMSCK_LOAD_TEMPLATE_PLUGIN_RESP = 'QMSCK_LOAD_TEMPLATE_PLUGIN_RESP'
 export const QMSCK_LINKED = 'LINKED'
 export const QMSCK_LINK_PLUGIN_MSG = 'QMSCK_LINK_PLUGIN_MSG';
 export const QMSCK_LINK_PLUGIN_RESP = 'QMSCK_LINK_PLUGIN_RESP';
+export const QMSCK_LINK_OPTION = 'LINK_OPTION'

package/src/assets/qms-ckeditor-plugin/src/plugins/link/linkcommand.js

@@ -180,7 +180,7 @@ export default class LinkCommand extends Command {
             const response = evt.detail;
             const target = QMSCKEditorEnum.protocolEnum[response.protocolId];
             const url = response.url;
-            const href = url;
+            const href = url.substring(2, url.length);
             const title = response.title ? response.title : url;
 
             for(let i= 0; i < linkDecorators.length-2; i++){
@@ -199,6 +199,8 @@ export default class LinkCommand extends Command {
             }
 
             model.change( writer => {
+                // set link option value
+                window[QMSCKEditorConstant.QMSCK_LINK_OPTION] = url.substring(0, 2);
                 // If selection is collapsed then update selected link or insert new one at the place of caret.
                 if ( selection.isCollapsed ) {
                     const position = selection.getFirstPosition();

package/src/assets/qms-ckeditor-plugin/src/plugins/link/linkediting.js

@@ -17,8 +17,9 @@ import LinkCommand from './linkcommand';
 import UnlinkCommand from './unlinkcommand';
 import ManualDecorator from './utils/manualdecorator';
 import { createLinkElement, ensureSafeUrl, getLocalizedDecorators, normalizeDecorators } from './utils';
-
+import * as QMSCKEditorConstant from '../common/qmsCKEditorConstant';
 import '../../themes/tyles/link.css';
+import { isLinkElement } from './utils';
 
 const HIGHLIGHT_CLASS = 'ck-link_selected';
 const DECORATOR_AUTOMATIC = 'automatic';
@@ -189,12 +190,22 @@ export default class LinkEditing extends Plugin {
 			editor.conversion.for( 'downcast' ).attributeToElement( {
 				model: decorator.id,
 				view: ( manualDecoratorName, { writer } ) => {
-					if ( manualDecoratorName ) {
+					if ( manualDecoratorName) {
 						const attributes = manualDecorators.get( decorator.id ).attributes;
-						const element = writer.createAttributeElement( 'a', attributes, { priority: 5 } );
-						writer.setCustomProperty( 'link', true, element );
-
-						return element;
+            let linkOption = window[QMSCKEditorConstant.QMSCK_LINK_OPTION]? window[QMSCKEditorConstant.QMSCK_LINK_OPTION] : '00';
+            let parentLink = this._getSelectedLinkElement();
+            if (parentLink && window[QMSCKEditorConstant.QMSCK_LINKED]) {
+              try {
+                linkOption = parentLink.parent.getChild(0).getAttribute('url');
+              } catch{
+                linkOption = parentLink.parent.getChild(1).getAttribute('url');
+              }
+            }
+            attributes.url = linkOption;
+            const element = writer.createAttributeElement( 'a', attributes, { priority: 5 } );
+            writer.setCustomProperty( 'link', true, element );
+
+            return element;
 					}
 				} } );
 
@@ -210,6 +221,32 @@ export default class LinkEditing extends Plugin {
 		} );
 	}
 
+  _getSelectedLinkElement() {
+		const view = this.editor.editing.view;
+		const selection = view.document.selection;
+
+		if ( selection.isCollapsed ) {
+			return findLinkElementAncestor( selection.getFirstPosition() );
+		} else {
+			// The range for fully selected link is usually anchored in adjacent text nodes.
+			// Trim it to get closer to the actual link element.
+			const range = selection.getFirstRange().getTrimmed();
+			const startLink = findLinkElementAncestor( range.start );
+			const endLink = findLinkElementAncestor( range.end );
+
+			if ( !startLink || startLink != endLink ) {
+				return null;
+			}
+
+			// Check if the link element is fully selected.
+			if ( view.createRangeIn( startLink ).getTrimmed().isEqual( range ) ) {
+				return startLink;
+			} else {
+				return null;
+			}
+		}
+	}
+
 	/**
 	 * Starts listening to {@link module:engine/model/model~Model#event:insertContent} and corrects the model
 	 * selection attributes if the selection is at the end of a link after inserting the content.
@@ -573,3 +610,7 @@ function isTyping( editor ) {
 
 	return input.isInput( editor.model.change( writer => writer.batch ) );
 }
+
+function findLinkElementAncestor( position ) {
+	return position.getAncestors().find( ancestor => isLinkElement( ancestor ) );
+}

package/src/assets/qms-ckeditor-plugin/src/plugins/link/linkui.js

@@ -140,11 +140,17 @@ export default class LinkUI extends Plugin {
         else {
           parentLink = this._getSelectedLinkElement();
         }
-        link.typeId = QMSCKEditorUtil.getLinkType(href);
+        const linkOption = parentLink.getAttribute('url');
+        link.typeId = QMSCKEditorUtil.getLinkType(linkOption);
         link.targetId = parentLink.getAttribute('target') ? QMSCKEditorEnum.targetEnum[parentLink.getAttribute('target')] : 0;
-        link.title = parentLink._children[0]._textData ? parentLink._children[0]._textData : '';
-        link.protocolId = QMSCKEditorUtil.getProtocolId(href);
-        link.url = QMSCKEditorUtil.getUrl(href);
+        if (parentLink._children.length > 0) {
+          link.title = parentLink._children[0]._textData ? parentLink._children[0]._textData.trim() : '';
+        }
+        else {
+          link.title = '';
+        }
+        link.protocolId = QMSCKEditorUtil.getProtocolId(linkOption);
+        link.url = href;
         link.edit = true;
         window[QMSCKEditorConstant.QMSCK_LINKED] = false;
         QMSCKEditorService.linkNotify(link);

package/src/assets/qms-ckeditor-plugin/src/themes/tyles/linkactions.css

@@ -17,7 +17,6 @@
 			overflow: hidden;
             width: 100px;
             text-overflow: ellipsis;
-            direction: rtl;
 		}
 	}
 

package/src/lib/components/related/popup/related-popup.component.scss

@@ -73,33 +73,41 @@
 
   .panel__item {
     height: 100px;
-    overflow: auto;
     margin-top: 12px;
+    overflow-x: hidden;
+    overflow-y: auto;
+    padding-right: 5px;
+    width: 100%;
+    max-width: 100%;
+    display: flex;
+    flex-wrap: wrap;
+    align-content: flex-start;
 
     .related__item__inline {
-      display: inline;
-      width: auto;
+      max-width: 100%;
     }
 
     .related__item__content {
-      background-color: rgba(0, 0, 0, 0.04);
-      border: 1px solid #e0e0e0;
-      border-radius: 4px;
-      display: inline-block;
-      padding: 2px 4px;
-      margin-left: 5px;
+      height: 32px;
+      line-height: 32px;
+      background-color: $related-item-background;
+      max-width: 100%;
       margin-bottom: 5px;
+      margin-left: 2.5px;
+      margin-right: 2.5px;
 
       .mat-icon {
         color: $related-mat-icon-color;
-        font-size: 22px;
-        vertical-align: middle;
-        margin-left: 7px;
-        cursor: pointer;
+        font-size: 24px;
       }
 
       span.related__item__content_name {
         display: inline-block;
+        width: auto;
+        width: calc(100% - 13px);
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
       }
     }
   }

package/src/lib/components/related/risk/list/list.component.scss

@@ -44,6 +44,21 @@
           height: 40px;
           line-height: 40px;
         }
+
+        .label-archived {
+          font-weight: 600;
+          font-size: 0.875rem;
+          line-height: 1rem;
+          color: #525252;
+          padding: 5px;
+          background: linear-gradient(
+              0deg,
+              rgba(0, 0, 0, 0.1),
+              rgba(0, 0, 0, 0.1)
+            ),
+            #ffffff;
+          border-radius: 2px;
+        }
       }
     }
 
@@ -82,7 +97,7 @@
 
       border-bottom: 1px solid #ddd;
       color: $primary;
-      min-height: 48px;      
+      min-height: 48px;
       border-bottom: 1px solid #ddd;
 
       .title {
@@ -104,7 +119,7 @@
   width: 24px;
   height: 24px;
 
-  font-size: 0.75rem;  
+  font-size: 0.75rem;
   border-radius: 1px;
 }
 
@@ -123,7 +138,6 @@
   color: white;
 }
 
-
 .cursor {
   cursor: pointer;
-}
+}