Merge branch 'main' of github.com:infor-design/enterprise into 4.94.1

app/views/components/module-nav/example-index.html

@@ -62,7 +62,7 @@
   <aside id="nav" class="module-nav" data-options="{ 'filterable': true }">
     <div class="module-nav-bar">
       <!-- Module Nav's top-level navigation items are inside the accordion -->
-      <div class="module-nav-accordion accordion panel" data-options="{'allowOnePane': false}">
+      <div class="module-nav-accordion accordion panel" data-options="{'allowOnePane': false }">
         <!-- Module switcher -->
         <div class="module-nav-header accordion-section">
           <div class="module-nav-switcher">
@@ -355,6 +355,10 @@ <h1>Module Nav</h1>
           <input type="checkbox" class="checkbox" name="hide-completely" id="hide-completely" />
           <label for="hide-completely" class="checkbox-label">Hide completely</label>
         </div>
+        <div class="field">
+          <input type="checkbox" class="checkbox" name="disable-switcher" id="disable-switcher" />
+          <label for="disable-switcher" class="checkbox-label">Disable switcher</label>
+        </div>
       </div>
     </div>
     <div class="row test-spacer">&nbsp;</div>
@@ -379,6 +383,7 @@ <h1>Module Nav</h1>
     const hideCompletelyEl = $('#hide-completely');
     const hamburgerBtnEl = $('#header-hamburger');
     const pinSectionsCheckEl = $('#pin-sections');
+    const disableSwitcher = $('#disable-switcher');
 
     displayCheckEl.on('change.test', (e) => {
       navAPI.updated({ showDetailView: displayCheckEl[0].checked });
@@ -388,6 +393,10 @@ <h1>Module Nav</h1>
       navAPI.updated({ pinSections: pinSectionsCheckEl[0].checked });
     });
 
+    disableSwitcher.on('change.test', (e, mode) => {
+      navAPI.updated({ disableSwitcher: disableSwitcher[0].checked });
+    })
+
     if (hamburgerBtnEl.length) {
       hamburgerBtnEl.on('click.test', (e) => {
         navAPI.handleHamburgerClick();

docs/CHANGELOG.md

@@ -6,6 +6,23 @@
 
 - `[Homepage]` Fixed bug that caused errors on resize when no widgets. ([#8611](https://github.com/infor-design/enterprise/issues/8611))
 - `[Timeline]` Added fix to timeline layout. ([#8586](https://github.com/infor-design/enterprise/issues/8586))
+## v4.95.0
+
+## v4.95.0 Features
+
+- `[About]` Added copy to clipboard button. ([#8438](https://github.com/infor-design/enterprise/issues/8438))
+- `[Module Nav]` Added setting `disableSwitcher` to disable nav switcher. ([#8381](https://github.com/infor-design/enterprise/issues/8381))
+
+## v4.95.0 Fixes
+
+- `[Cards]` Fixed title and button regression and position. ([#8602](https://github.com/infor-design/enterprise/issues/8602))
+- `[Contextual Action Panel]` Fixed added padding on contextual action panel. ([#8553](https://github.com/infor-design/enterprise/issues/8553))
+- `[Forms]` Fixed fileupload layout in compact form. ([#8537](https://github.com/infor-design/enterprise/issues/8537))
+- `[Datagrid]` Fixed search icon misalignment in dropwdown cells. ([#8515](https://github.com/infor-design/enterprise/issues/8515))
+- `[Datagrid]` Fixed an error editing on non first page in server side paging datagrid. ([#8537](https://github.com/infor-design/enterprise-ng/issues/1672))
+- `[Cards]` Fixed title and button regression and position. ([#8602](https://github.com/infor-design/enterprise/issues/8602))
+- `[Forms]` Fixed fileupload layout in compact form. ([#8537](https://github.com/infor-design/enterprise/issues/8537))
+- `[Tabs]` Fixed error in tab popup. ([#8596](https://github.com/infor-design/enterprise/issues/8596))
 
 ## v4.94.0
 
@@ -21,6 +38,7 @@
 ## v4.94.0 Fixes
 
 - `[Avatar]` Is no longer round by default. To use it in module nav add the new `square` class. ([#8539](https://github.com/infor-design/enterprise/issues/8539))
+- `[Hierarchy]` Fixed broken size on avatars on hierarchy. ([#8584](https://github.com/infor-design/enterprise/issues/8584))
 - `[Bar]` Fixed axis label visibility by adding font-size in `axis-labels` container. ([#8431](https://github.com/infor-design/enterprise/issues/8431))
 - `[Button]` Added start and stop methods for generative timeout. ([#8541](https://github.com/infor-design/enterprise/issues/8541))
 - `[Calendar]` Fixed event icon not properly rendered across week view mode. ([#8456](https://github.com/infor-design/enterprise/issues/8456))

scripts/publish-docs/Makefile

@@ -1,7 +1,7 @@
 CURRENT_DIR=$(shell pwd)
 ORGANIZATION = hookandloop
 IMAGE = enterprise-publish-docs
-IMAGE_TAG = 0.0.2
+IMAGE_TAG = 1.0.0
 
 
 ifneq (,$(wildcard ./.env))

scripts/publish-docs/job.yaml

@@ -31,11 +31,11 @@ spec:
                   name: docs-api-key
                   key: token
             - name: DOCS_API_URL
-              value: "https://old.design.infor.com"
+              value: "https://legacy.design.infor.com"
             - name: SITE
               value: "prod"
             - name: BUILD_FROM
-              value: "4.91.0"
+              value: "4.93.0"
             - name: APP_REPO
               value: "infor-design/enterprise"
           command: ["/bin/bash"]

scripts/release/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:14-buster
+FROM node:18
 
 WORKDIR /usr/src
 

scripts/release/Makefile

@@ -1,19 +1,37 @@
+CURRENT_DIR=$(shell pwd)
+
 ORGANIZATION = hookandloop
-WORKER_CONTAINER_NAME = enterprise-release
-WORKER_CONTAINER_VERSION = 1.0.0
+IMAGE = enterprise-release
+IMAGE_TAG = 1.0.1
+
 
 ifneq (,$(wildcard ./.env))
 	include .env
 	export
 endif
 
-.PHONY: build-worker-image
-build-worker-image :
-	docker build -t $(ORGANIZATION)/$(WORKER_CONTAINER_NAME):$(WORKER_CONTAINER_VERSION) .
 
-.PHONY: run-worker
-run-worker :
-	docker run --rm --name $(WORKER_CONTAINER_NAME) \
+.PHONY: all
+all: build tag push
+
+.PHONY: build
+build:
+	DOCKER_BUILDKIT=1 docker build \
+		--platform=linux/amd64 \
+		-t $(IMAGE):$(IMAGE_TAG) \
+		-f $(CURRENT_DIR)/Dockerfile .
+
+.PHONY: tag
+tag:
+	docker tag $(IMAGE):$(IMAGE_TAG) $(ORGANIZATION)/$(IMAGE):$(IMAGE_TAG)
+
+.PHONY: push
+push:
+	docker push $(ORGANIZATION)/$(IMAGE):$(IMAGE_TAG)
+
+.PHONY: run
+run :
+	docker run --rm --name $(IMAGE) \
 		--env GITHUB_ACCESS_TOKEN=${GITHUB_ACCESS_TOKEN} \
 		--env DOCS_API_KEY=${DOCS_API_KEY} \
 		--env DOCS_API_URL=${DOCS_API_URL} \
@@ -27,11 +45,12 @@ run-worker :
 		-v ${PWD}/build:/root/enterprise \
 		-v ${PWD}/.gitconfig:/root/.gitconfig \
 		-v ${PWD}/run.sh:/usr/src/run.sh \
-		$(ORGANIZATION)/$(WORKER_CONTAINER_NAME):$(WORKER_CONTAINER_VERSION)
+		$(ORGANIZATION)/$(IMAGE):$(IMAGE_TAG)
 
-.PHONY: shell-worker
-shell-worker :
-	docker run -it --rm --name $(WORKER_CONTAINER_NAME) \
+.PHONY: shell
+shell :
+	docker run -it --rm --name $(IMAGE) \
+		--platform=linux/amd64 \
 		--entrypoint /bin/bash \
 		--env GITHUB_ACCESS_TOKEN=${GITHUB_ACCESS_TOKEN} \
 		--env DOCS_API_KEY=${DOCS_API_KEY} \
@@ -46,4 +65,4 @@ shell-worker :
 		-v ${PWD}/build:/root/enterprise \
 		-v ${PWD}/.gitconfig:/root/.gitconfig \
 		-v ${PWD}/run.sh:/usr/src/run.sh \
-		$(ORGANIZATION)/$(WORKER_CONTAINER_NAME):$(WORKER_CONTAINER_VERSION)
+		$(ORGANIZATION)/$(IMAGE):$(IMAGE_TAG)

scripts/release/job.yaml

@@ -39,7 +39,7 @@ spec:
                   name: docs-api-key
                   key: token
             - name: DOCS_API_URL
-              value: "https://old.design.infor.com"
+              value: "https://legacy.design.infor.com"
             - name: NPM_TOKEN
               valueFrom:
                 secretKeyRef:

src/components/about/about.js

@@ -20,6 +20,7 @@ const COMPONENT_NAME = 'about';
  * @param {string} [settings.version] Semantic Version Number for example (4.0.0).
  * @param {array|object} [settings.showCopyButton=true] Show copy to clipboard button
  * @param {array|object} [settings.attributes=null] Add extra attributes like id's to the toast element. For example `attributes: { name: 'id', value: 'my-unique-id' }`
+ * @param {array|object} [settings.showCopyButton=true] Show copy to clipboard button
 */
 const ABOUT_DEFAULTS = {
   appName: 'Infor Application Name',
@@ -145,6 +146,7 @@ About.prototype = {
     $('.modal-body', this.modal)[0].tabIndex = 0;
 
     this.modal.appendTo('body');
+
     this.modal.modal({
       trigger: this.isBody ? 'immediate' : 'click',
       attributes: this.settings.attributes

src/components/arrange/arrange.js

@@ -44,11 +44,14 @@ Arrange.prototype = {
 
   // example from: https://github.com/farhadi/html5arrangeable
   init() {
-    this.isTouch = env.features.touch;
     this.isIe = env.browser.name === 'ie';
     this.handleEvents();
   },
 
+  get isTouch() {
+    return env.features.touch || env.devicespecs.isMobile;
+  },
+
   /**
    * Get Element By Touch In List
    * @private
@@ -328,7 +331,7 @@ Arrange.prototype = {
           }
           let overItem = this;
           let overIndex;
-          e.preventDefault();
+          e.stopPropagation();
 
           if (self.isTouch && !self.placeholderTouch) {
             self.placeholderTouch = self.dragging

src/components/contextualactionpanel/contextualactionpanel.js

@@ -255,7 +255,7 @@ ContextualActionPanel.prototype = {
       }
 
       if (!isIframe) {
-        children.wrapAll('<div class="modal-content"></div>').wrapAll(`<div class="modal-body ${this.settings.detailRefId !== null ? 'padding-x-16 has-back-button' : ''}"></div>`);
+        children.wrapAll('<div class="modal-content"></div>').wrapAll(`<div class="modal-body ${this.settings.detailRefId !== undefined ? 'padding-x-16 has-back-button' : ''}"></div>`);
         this.panel.addClass('modal');
       }
     }

src/components/datagrid/_datagrid-new.scss

@@ -803,7 +803,11 @@
 
 .datagrid-dropdown-list.extra-small-rowheight .trigger .icon {
   left: 4px !important;
-  top: 6px;
+  top: 8px;
+
+  &.search {
+    top: 3px;
+  }
 }
 
 .datagrid-dropdown-list.small-rowheight .trigger .icon {

src/components/datagrid/_datagrid.scss

@@ -4970,7 +4970,7 @@ td .btn-actions {
       &.search {
         height: 13px;
         left: 4px !important;
-        top: 0;
+        top: 1px;
       }
     }
   }
@@ -4989,17 +4989,18 @@ td .btn-actions {
     }
 
     &.dropdown-list .trigger .icon {
-      margin-top: 3.5px;
+      margin-top: 2px;
     }
   }
 
+  > .trigger .icon,
   .icon {
     color: $ids-color-font-base;
     left: 0 !important;
-    margin-top: 7px;
+    margin-top: 6px;
 
     &.search {
-      margin-top: 7px !important;
+      margin-top: 7px;
     }
   }
 }

src/components/drag/_drag.scss

@@ -10,6 +10,7 @@
   -ms-touch-action: none;
   -webkit-touch-callout: none;
   -webkit-user-select: none;
+  touch-action: none;
   z-index: 7000;
 
   &.animated {

src/components/dropdown/_dropdown-new.scss

@@ -63,8 +63,11 @@ div.multiselect {
 .dropdown-list {
   &.small-rowheight {
     &.datagrid-dropdown-list .trigger .icon {
-    top: 7px;
-    margin-left: 2px;
+      margin-left: 2px;
+
+      &.search {
+        top: 1px;
+      }
     }
   }
 
@@ -420,13 +423,21 @@ html.is-firefox:not([dir='rtl']) {
       &.datagrid-dropdown-list .trigger .icon {
         top: 7.5px;
         margin-left: 0.5px;
+
+        &.search {
+          top: 1px;
+        }
       }
     }
 
     &.extra-small-rowheight {
       &.datagrid-dropdown-list .trigger .icon {
         top: 7px;
         margin-left: 0;
+
+        &.search {
+          top: 2px;
+        }
       }
     }
 

src/components/module-nav/module-nav.dropdown.scss

@@ -5,7 +5,7 @@ $module-nav-container-size: $module-nav-switcher-button-size + $module-nav-switc
 
 @mixin module-nav-div-dropdown-adjustment() {
   background-color: $module-nav-switcher-dropdown-background-color;
-  padding-block-start: 9px;
+  padding-block-start: 7px;
   padding-block-end: 7px;
   padding-inline-start: 8px;
   padding-inline-end: 40px;
@@ -37,6 +37,20 @@ $module-nav-container-size: $module-nav-switcher-button-size + $module-nav-switc
       top: 4px;
     }
 
+    &.is-disabled {
+      background-color: transparent;
+      border: none;
+      margin-inline-start: -6px;
+
+      span {
+        font-size: 2rem;
+      }
+
+      + .icon {
+        display: none;
+      }
+    }
+
     // Overrides a dropdown default
     &:focus {
       box-shadow: none;

src/components/module-nav/module-nav.js

@@ -40,7 +40,8 @@ const MODULE_NAV_DEFAULTS = {
   showGuestSection: false,
   showSearchBar: true,
   enableOutsideClick: false,
-  autoCollapseOnMobile: true
+  autoCollapseOnMobile: true,
+  disableSwitcher: false
 };
 
 const toggleScrollbar = (el, doToggle) => {
@@ -189,7 +190,12 @@ ModuleNav.prototype = {
 
     // Auto-init child components, if applicable
     if (this.settings.initChildren) {
-      if (!this.switcherAPI) $(this.switcherEl).modulenavswitcher({ displayMode: this.settings.displayMode });
+      if (!this.switcherAPI) {
+        $(this.switcherEl).modulenavswitcher({
+          displayMode: this.settings.displayMode,
+          disabled: this.settings.disableSwitcher
+        });
+      }
       if (!this.settingsAPI) $(this.settingsEl).modulenavsettings({ displayMode: this.settings.displayMode });
       if (!this.accordionAPI) {
         $(this.accordionEl).accordion(this.settings.accordionSettings);

src/components/module-nav/module-nav.switcher.js

@@ -180,13 +180,22 @@ ModuleNavSwitcher.prototype = {
   },
 
   renderRoleDropdown() {
+    const roleDropdown = $(this.roleDropdownEl);
+
     if (this.settings.generate && (!this.roleDropdownContainerEl || !this.roleDropdownEl)) {
       this.element[0].insertAdjacentHTML('beforeend', dropdownTemplate(this.settings.roleDropdownLabel));
     }
-    if (!$(this.roleDropdownEl).find('option').length) {
+    if (!roleDropdown.find('option').length) {
       this.renderDropdownOptions();
     }
-    $(this.roleDropdownEl).dropdown({
+
+    if (this.settings.disabled) {
+      roleDropdown.attr('disabled', true);
+    } else {
+      roleDropdown.removeAttr('disabled');
+    }
+
+    roleDropdown.dropdown({
       cssClass: 'role-dropdown',
       dropdownIcon: 'expand-all',
       extraListWrapper: true,