qms-angular 1.0.80 → 1.0.84

package/src/assets/qms-ckeditor-plugin/src/plugins/anchor/anchorediting.js

@@ -80,6 +80,24 @@ export default class AnchorEditing extends Plugin {
 			} } );
 
 		editor.conversion.for( 'upcast' )
+			.elementToElement( {
+				view: {
+					name: 'a'
+				},
+				model: ( viewElement, {writer}) => {
+					const attributes = {};
+					const id = viewElement.getAttribute('id') ? viewElement.getAttribute('id') : viewElement.getAttribute('name');
+					
+					if(viewElement.parent.childCount > 1 && viewElement.isEmpty && typeof viewElement.parent.getChild(1).data !== 'undefined'){
+						const text = viewElement.parent.getChild(1).data;
+						attributes['id'] = id;
+						attributes['name'] = id;
+						attributes['anchorId'] = text;							
+						const { start: positionBefore } = editor.model.insertContent( writer.createText(text, attributes), 0 );
+						return writer.setSelection( positionBefore );
+					}		
+				}
+			})
 			.elementToAttribute( {
 				view: {
 					name: 'a',
@@ -89,7 +107,7 @@ export default class AnchorEditing extends Plugin {
 				},
 				model: {
 					key: 'anchorId',
-					value: viewElement => viewElement.getAttribute( 'id' )
+					value: viewElement => viewElement.getAttribute( 'id' ) ? viewElement.getAttribute( 'id' ) : viewElement.getAttribute( 'name' )
 				}
 			} );
 

package/src/assets/qms-ckeditor-plugin/src/plugins/imagemap/converters.js

@@ -206,6 +206,15 @@ export function upcastMapElement() {
             const areas = [];
             if(viewMap.childCount > 0){
                 for (const child of Array.from(viewMap.getChildren())) {
+                    try {
+                        if (child.getAttribute() < 5) throw -1;
+                        const check = child.getAttribute(HTML_ATTRIBUTES.COORDS);
+                        if (!check) throw -1;
+                    }
+                    catch(err){
+                        continue;
+                    }
+                    
                     let area = {};
                     area[HTML_ATTRIBUTES.COORDS] = child.getAttribute(HTML_ATTRIBUTES.COORDS);
                     area[HTML_ATTRIBUTES.HREF] = child.getAttribute(HTML_ATTRIBUTES.HREF);
@@ -377,3 +386,38 @@ export function upcastImageHeightAttribute() {
         });
 	};
 }
+
+export function downcastImagePluginAttribute() {
+	return dispatcher => {
+		dispatcher.on(`attribute:${IMAGEMAP_ATTRIBUTES.IMAGE_SRC}:${IMAGEMAP_ELEMENTS.IMAGE}`, (evt, data, conversionApi)=> {
+       
+            const viewWriter = conversionApi.writer;
+            const figure = conversionApi.mapper.toViewElement(data.item);
+            const img = getViewImgFromWidget(figure);
+            const altAttribute = data.item.getAttribute('alt') || '';
+            
+            const classes = altAttribute.split('#');
+            const className = classes.length > 0 ? classes[0] : '';
+            const attributes = {};
+
+            switch (className) {
+                case 'bpmn':
+                    attributes['class'] = 'bpmn-chart-entity';
+                    attributes['data-charttype'] = className;
+                    break;
+                case 'flowchart':
+                    attributes['class'] = 'flow-chart-entity';
+                    attributes['data-charttype'] = 'flow';
+                    break;
+            
+                default:
+                    attributes['class'] = '';
+                    attributes['data-charttype'] = '';
+                    break;
+            }
+
+            viewWriter.setAttribute('class', attributes['class'], img);
+            viewWriter.setAttribute('data-charttype', attributes['data-charttype'], img);
+        });
+	};
+}

package/src/assets/qms-ckeditor-plugin/src/plugins/imagemap/imagemapediting.js

@@ -6,7 +6,8 @@ import { IMAGEMAP_ATTRIBUTES, IMAGEMAP_ELEMENTS, drawMap, IMAGEMAP_COMMANDS, HTM
 import ImageLoadObserver from '@ckeditor/ckeditor5-image/src/image/imageloadobserver';
 import { downcastImageWidthAttribute, downcastImageHeightAttribute, downcastImageSavedSrcAttribute, downcastImageMapAttribute,
     upcastImageSavedSrcAttribute, upcastMapElement, dowcastMapNameAttribute, dowcastMapWidthAttribute, dowcastMapHeightAttribute,
-    dowcastMapAreaAttribute, upcastImageMapAttribute, upcastImageHeightAttribute, upcastImageWidthAttribute, downcastMapElement
+    dowcastMapAreaAttribute, upcastImageMapAttribute, upcastImageHeightAttribute, upcastImageWidthAttribute, downcastMapElement,
+    downcastImagePluginAttribute
 } from './converters';
 import { isWidget } from  '@ckeditor/ckeditor5-widget/src/utils';
 import { trimStart, debounced } from '../common/qmsCKEditorUtil';
@@ -54,6 +55,7 @@ import { trimStart, debounced } from '../common/qmsCKEditorUtil';
         conversion.for('dataDowncast').add(downcastImageSavedSrcAttribute(true));
         conversion.for('editingDowncast').add(downcastImageSavedSrcAttribute(false));
 
+        conversion.for('downcast').add(downcastImagePluginAttribute());
         conversion.for('downcast').add(downcastImageMapAttribute());
         conversion.for('downcast').add(downcastMapElement());
 

package/src/assets/qms-ckeditor-plugin/src/plugins/media/mediaembedediting.js

@@ -244,6 +244,36 @@ export default class MediaEmbedEditing extends Plugin {
 				model: ( viewMedia, { writer } ) => {
 					const url = viewMedia.getAttribute( 'data-oembed-url' );
 
+					if ( registry.hasMedia( url ) ) {
+						return writer.createElement( 'media', { url } );
+					}
+				}
+			} )
+			// Upcast for iframe from ck4-editor.
+			.elementToElement( {
+				view: {
+					name: 'iframe',
+					attributes: {
+						'data-src': true
+					}
+				},
+				model: ( viewMedia, { writer } ) => {
+					const url = viewMedia.getAttribute( 'data-src' );
+					if ( registry.hasMedia( url ) ) {
+						return writer.createElement( 'media', { url } );
+					}
+				}
+			} )
+			// for video upload from ck4
+			.elementToElement( {
+				view: {
+					name: 'video',
+					attributes: {
+						'poster': true
+					}
+				},
+				model: ( viewMedia, { writer } ) => {
+					const url = viewMedia.getAttribute( 'poster' );
 					if ( registry.hasMedia( url ) ) {
 						return writer.createElement( 'media', { url } );
 					}

package/src/assets/qms-ckeditor-plugin/src/plugins/tooltip/tooltipediting.js

@@ -7,7 +7,7 @@ import { ClipboardPipeline } from '@ckeditor/ckeditor5-clipboard';
 import TooltipCommand from './tooltipcommand';
 import RemoveTooltipCommand from './removetooltipcommand';
 import TooltipDialogCommand from './tooltipdialogcommand';
-import { TOOLTIP_COMMANDS, HTML_ATTRIBUTE, HTML_CLASS, HTML_ELEMENT, TOOLTIP_ATTRIBUTE, TOOLTIP_CUSTOM_PROPERTY } from './utils';
+import { TOOLTIP_COMMANDS, HTML_ATTRIBUTE, HTML_CLASS, HTML_ELEMENT, TOOLTIP_ATTRIBUTE, TOOLTIP_CUSTOM_PROPERTY, CK4_HTML_ATTRIBUTE, CK4_HTML_CLASS } from './utils';
 import '../../themes/styles/tooltip.css';
  
 export default class TooltipEditing extends Plugin {
@@ -31,25 +31,36 @@ export default class TooltipEditing extends Plugin {
 			.attributeToElement({ 
 				model: TOOLTIP_ATTRIBUTE,
 				view: (modelAttributeValue, { writer }) =>{
-					const attributes = { class: HTML_CLASS };
+					const attributes = { class: `${HTML_CLASS} ${CK4_HTML_CLASS}` };
 					attributes[HTML_ATTRIBUTE] = modelAttributeValue;
-					const tooltipElement = writer.createAttributeElement(HTML_ELEMENT, attributes, { priority: 5 });
+					attributes[CK4_HTML_ATTRIBUTE] = modelAttributeValue;
+					const tooltipElement = writer.createAttributeElement('span', attributes, { priority: 5 });
 					writer.setCustomProperty(TOOLTIP_CUSTOM_PROPERTY, true, tooltipElement);
 					return tooltipElement;			
 				}
 			});
  
-		editor.conversion.for('upcast')
+		editor.conversion.for( 'upcast' )
+			.elementToElement( {
+				view: {
+					classes: CK4_HTML_CLASS
+				},
+				model: ( viewElement, { writer } ) => {
+					const attributes = { class: `${HTML_CLASS} ${CK4_HTML_CLASS}` };
+					attributes[HTML_ATTRIBUTE] = viewElement.getAttribute(CK4_HTML_ATTRIBUTE);
+					attributes[CK4_HTML_ATTRIBUTE] = viewElement.getAttribute(CK4_HTML_ATTRIBUTE);
+					return writer.createElement( HTML_ELEMENT, attributes);
+				}
+			})
 			.elementToAttribute({
 				view: {
-					name: HTML_ELEMENT,
-					attributes: {
-						[HTML_ATTRIBUTE]: true
-					}
+					classes: CK4_HTML_CLASS
 				},
 				model: {
 					key: TOOLTIP_ATTRIBUTE,
-					value: viewElement => viewElement.getAttribute(HTML_ATTRIBUTE)
+					value: (viewElement) =>  {
+						return viewElement.getAttribute(HTML_ATTRIBUTE) ? viewElement.getAttribute(HTML_ATTRIBUTE) : viewElement.getAttribute(CK4_HTML_ATTRIBUTE);
+					}
 				}
 			});
 

package/src/assets/qms-ckeditor-plugin/src/plugins/tooltip/utils.js

@@ -4,7 +4,10 @@ export const TOOLTIP_ATTRIBUTE = 'qmstooltip';
 export const HTML_ATTRIBUTE = 'data-qmstooltip';
 export const HTML_CLASS = 'qms-tooltip';
 export const HTML_ELEMENT = 'abbr';
- 
+
+export const CK4_HTML_ATTRIBUTE = 'title';
+export const CK4_HTML_CLASS = 'source-info';
+
 export const TOOLTIP_COMMANDS = {
 	TOOLTIP_DIALOG: 'tooltipdialog',
 	TOOLTIP: 'tooltip',

package/src/lib/components/qms-navigation-drawer/qms-navigation-drawer.component.scss

@@ -1,5 +1,6 @@
 ::ng-deep mat-tree.qms-navigation-drawer-container {
 
+  padding: 0.25rem!important;
   .mat-tree-node {
     min-width: 272px !important;
     height   : 48px !important;
@@ -7,7 +8,6 @@
 
   .mat-tree-node {
     min-height: 34px;
-    margin    : 16px 0px;
 
     &.active {
       background-color: #F2F7FD;
@@ -25,7 +25,6 @@
     .tree-content {
       width      : 100%;
       position   : relative;
-      cursor     : pointer;
       align-items: center;
     }
 
@@ -159,6 +158,7 @@
         display           : -webkit-box;
         -webkit-line-clamp: 2;
         -webkit-box-orient: vertical;
+        cursor     : pointer;
       }
 
       .span-text:after {
@@ -187,9 +187,9 @@
   }
 
   .mat-tree-node:hover {
-    .span-text {
-      max-width: calc(100% - 96px);
-    }
+      .span-text {
+        max-width: calc(100% - 96px);
+      }
   }
 
   .pr-34 {

package/src/themes/core/_dialog.scss

@@ -0,0 +1,35 @@
+
+::ng-deep .qms-dialog-container {
+    display: flex;
+    flex-flow: column;
+    min-height: 150px;
+    max-height: 80vh;
+
+    .qms-dialog-header {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-bottom: 10px;
+        flex: 0 1 auto;
+        height: 50px;
+    }
+
+    .qms-dialog-content {
+        flex: 1 1 auto;
+        overflow-y: auto;
+        overflow-x: hidden;
+        margin: 0;
+    }
+
+    .qms-dialog-footer {
+        display: flex;
+        flex-wrap: wrap;
+        min-height: 50px;
+        align-items: center;
+        box-sizing: content-box;
+        justify-content: end;
+        margin-top: 10px;
+        flex: 0 1 auto;
+        height: 50px;
+    }
+}

package/src/themes/core/_form.scss

@@ -222,6 +222,10 @@ $padding-field-flex-datepicker: 0.9rem 1rem 1rem 1rem;
       button {
         pointer-events: none;
       }
+
+      .mat-select-min-line {
+        color: black(0.38);
+      }
     }
 
     .mat-form-field-flex {