Merge remote-tracking branch 'origin/develop' into authoring-react-po…

…st-broadcasting
superdesk · Oct 31, 2023 · 087f8c2 · 087f8c2
2 parents b19b89b + 8dd0036
commit 087f8c2
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 4 deletions.
diff --git a/scripts/apps/authoring/authoring/directives/ItemCarouselDirective.ts b/scripts/apps/authoring/authoring/directives/ItemCarouselDirective.ts
@@ -186,6 +186,16 @@ export function ItemCarouselDirective(notify, relationsService) {
                 carousel.trigger('to.owl.carousel', [index]);
             };
 
+            const addDragOverClass = () => {
+                elem.find('figure').addClass('dragover');
+                elem.find('button.item-association').addClass('dragover');
+            };
+
+            const removeDragOverClass = () => {
+                elem.find('figure').removeClass('dragover');
+                elem.find('button.item-association').removeClass('dragover');
+            };
+
             function canUploadItems(uploadsCount: number = 0): boolean {
                 const mediaItemsForCurrentField = getAssociationsByFieldId(scope.item.associations, scope.field._id);
                 const currentUploads = mediaItemsForCurrentField.length;
@@ -208,6 +218,11 @@ export function ItemCarouselDirective(notify, relationsService) {
                 elem.on('dragover', (event) => {
                     event.preventDefault();
                     event.stopPropagation();
+                    addDragOverClass();
+                });
+
+                elem.on('dragleave', () => {
+                    removeDragOverClass();
                 });
 
                 elem.on('drop dragdrop', (event) => {
@@ -219,9 +234,13 @@ export function ItemCarouselDirective(notify, relationsService) {
                     event.stopPropagation();
 
                     const type: string = getSuperdeskType(event, false);
-                    const item: IArticle = angular.fromJson(event.originalEvent.dataTransfer.getData(type));
+
+                    const jsonData = event.originalEvent.dataTransfer.getData(type);
+                    const item: IArticle = angular.fromJson(jsonData !== '' ? jsonData : '{}');
+
                     const isWorkflowAllowed: boolean = relationsService.itemHasAllowedStatus(item, scope.field);
 
+                    removeDragOverClass();
                     if (!isWorkflowAllowed) {
                         notify.error(gettext(
                             'The following status is not allowed in this field: {{status}}',

diff --git a/scripts/apps/authoring/views/item-carousel.html b/scripts/apps/authoring/views/item-carousel.html
@@ -1,4 +1,7 @@
-<button tabindex="{{tabindex}}" class="item-association" ng-if="!carouselItems.length"
+<button
+    tabindex="{{tabindex}}"
+    class="item-association"
+    ng-if="!carouselItems.length"
     ng-class="{'item-association--preview': item[item.fieldId], 'item-association--loading': loading}"
     ng-click="associations.isMediaEditable() && !item[item.fieldId] && upload()"
     ng-disabled="!editable"

diff --git a/scripts/apps/contacts/components/Form/ProfileDetail.tsx b/scripts/apps/contacts/components/Form/ProfileDetail.tsx
@@ -335,6 +335,7 @@ export class ProfileDetail extends React.PureComponent<IProps, IState> {
                             field="organisation"
                             label={gettext('Organisation')}
                             value={this.state.orgValue}
+                            initValue
                             onChange={this.handleOrgChange}
                             querySearch={true}
                             onQuerySearch={((text) => this.getSearchResult('organisation', text))}

diff --git a/scripts/core/editor3/components/Editor3Component.tsx b/scripts/core/editor3/components/Editor3Component.tsx
@@ -40,6 +40,7 @@ import {CharacterLimitUiBehavior} from 'apps/authoring/authoring/components/Char
 import {Editor3Autocomplete} from './Editor3Autocomplete';
 import {querySelectorParent} from 'core/helpers/dom/querySelectorParent';
 import {MEDIA_TYPES_TRIGGER_DROP_ZONE} from 'core/constants';
+import {isMacOS} from 'core/utils';
 
 const EVENT_TYPES_TRIGGER_DROP_ZONE = [
     ...MEDIA_TYPES_TRIGGER_DROP_ZONE,
@@ -274,12 +275,13 @@ export class Editor3Component extends React.Component<IProps, IState> {
     }
 
     keyBindingFn(e) {
-        const {key, shiftKey, ctrlKey} = e;
+        const {key, shiftKey, ctrlKey, metaKey} = e;
         const selectionState = this.props.editorState.getSelection();
+        const modifierKey = isMacOS() ? metaKey : ctrlKey;
 
         if (
             key === 'k'
-            && ctrlKey
+            && modifierKey
             && this.props.editorFormat.includes('link')
             && selectionState.isCollapsed() !== true
         ) {

diff --git a/scripts/core/editor3/components/links/LinkInput.tsx b/scripts/core/editor3/components/links/LinkInput.tsx
@@ -188,6 +188,11 @@ export class LinkInputComponent extends React.Component<IProps, any> {
             >
                 <div style={{padding: '3.2rem 1.6rem'}}>
                     <input
+                        onKeyDown={(e) => {
+                            if (e.key === 'Enter') {
+                                this.onSubmit(linkTypes.href);
+                            }
+                        }}
                         type="url"
                         ref={(el) => {
                             this.inputElement = el;

diff --git a/scripts/core/utils.tsx b/scripts/core/utils.tsx
@@ -19,6 +19,17 @@ function applyTranslations(translations) {
     window.translations = translations;
 }
 
+export function isMacOS() {
+    if (
+        navigator.userAgent.toLowerCase().includes('macintosh')
+        || navigator.userAgent.toLowerCase().includes('mac os')
+    ) {
+        return true;
+    }
+
+    return false;
+}
+
 function requestListener() {
     const translations = JSON.parse(this.responseText);