fix: Minimalist view with button. (adempiere#698)

EdwinBetanc0urt · Jan 9, 2023 · fea8174 · fea8174
1 parent f033b59
commit fea8174
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 7 deletions.
diff --git a/src/utils/ADempiere/dictionary/browser.js b/src/utils/ADempiere/dictionary/browser.js
@@ -41,8 +41,15 @@ export function isDisplayedField({ displayType, isActive, isQueryCriteria, displ
 /**
  * Default showed field from user
  */
-export function evaluateDefaultFieldShowed({ defaultValue, parsedDefaultValue, isMandatory, isShowedFromUser }) {
-  if (isMandatory) {
+export function evaluateDefaultFieldShowed({
+  displayType, isQueryCriteria, isShowedFromUser,
+  defaultValue, parsedDefaultValue,
+  isMandatory, isMandatoryFromLogic, mandatoryLogic
+}) {
+  const isMandatoryGenerated = isMandatoryField({
+    displayType, isQueryCriteria, isMandatory, isMandatoryFromLogic, mandatoryLogic
+  })
+  if (isMandatoryGenerated) {
     return true
   }
   if (!isEmptyValue(defaultValue) || !isEmptyValue(parsedDefaultValue)) {

diff --git a/src/utils/ADempiere/dictionary/process.js b/src/utils/ADempiere/dictionary/process.js
@@ -47,8 +47,11 @@ export function isDisplayedField({ displayType, isActive, isDisplayed, displayLo
 /**
  * Default showed field from user
  */
-export function evaluateDefaultFieldShowed({ defaultValue, parsedDefaultValue, isMandatory, isShowedFromUser }) {
-  if (isMandatory) {
+export function evaluateDefaultFieldShowed({ defaultValue, displayType, parsedDefaultValue, isMandatory, isShowedFromUser }) {
+  const isMandatoryGenerated = isMandatoryField({
+    displayType, isMandatory
+  })
+  if (isMandatoryGenerated) {
     return true
   }
   if (!isEmptyValue(defaultValue) || !isEmptyValue(parsedDefaultValue)) {

diff --git a/src/utils/ADempiere/dictionary/window.js b/src/utils/ADempiere/dictionary/window.js
@@ -99,12 +99,19 @@ export function isDisplayedField({ isDisplayed, displayLogic, isDisplayedFromLog
  * @param {boolean} isShowedFromUser
  * @param {boolean} isParent
  */
-export function evaluateDefaultFieldShowed({ columnName, defaultValue, displayType, isMandatory, isShowedFromUser, isParent }) {
+export function evaluateDefaultFieldShowed({
+  isKey, isParent, columnName,
+  defaultValue, displayType, isShowedFromUser,
+  isMandatory, mandatoryLogic, isMandatoryFromLogic
+}) {
   if (String(defaultValue).startsWith('@SQL=')) {
     return true
   }
 
-  if (isEmptyValue(defaultValue) && isMandatory && !isParent) {
+  const isMandatoryGenerated = isMandatoryField({
+    isKey, columnName, displayType, isMandatory, mandatoryLogic, isMandatoryFromLogic
+  })
+  if (isEmptyValue(defaultValue) && isMandatoryGenerated && !isParent) {
     // Yes/No field always boolean value (as default value)
     if (displayType === YES_NO.id) {
       return false
@@ -117,7 +124,12 @@ export function evaluateDefaultFieldShowed({ columnName, defaultValue, displayTy
   }
 
   // TODO: Evaluated window type
-  if (['DateInvoiced', 'DateOrdered', 'DatePromised', 'DateTrx', 'M_Product_ID', 'QtyEntered'].includes(columnName)) {
+  const permissedDisplayedDefault = [
+    VALUE, DOCUMENT_NO,
+    'DateInvoiced', 'DateOrdered', 'DatePromised',
+    'DateTrx', 'M_Product_ID', 'QtyEntered'
+  ]
+  if (permissedDisplayedDefault.includes(columnName)) {
     return true
   }