diff --git a/CHANGELOG.md b/CHANGELOG.md index 09f63eecea..8eb719aa91 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ### Fixed +- [HAL-1963](https://issues.redhat.com/browse/HAL-1963): Make --no-resolve-local-cache the default +- [HAL-1961](https://issues.redhat.com/browse/HAL-1961): fix progress bar width setting - [HAL-1960](https://issues.redhat.com/browse/HAL-1960): Mark variable parts in attributes in the DB wizards - [HAL-1953](https://issues.redhat.com/browse/HAL-1953): Unable to add unamanaged deployment for server group - [HAL-1952](https://issues.redhat.com/browse/HAL-1952): Adding string constants have been used directly in the Encrypt diff --git a/app/src/main/java/org/jboss/hal/client/installer/RevertWizard.java b/app/src/main/java/org/jboss/hal/client/installer/RevertWizard.java index ffb0b209b2..2eaac034da 100644 --- a/app/src/main/java/org/jboss/hal/client/installer/RevertWizard.java +++ b/app/src/main/java/org/jboss/hal/client/installer/RevertWizard.java @@ -23,7 +23,6 @@ import org.jboss.hal.dmr.dispatch.Dispatcher; import org.jboss.hal.meta.StatementContext; import org.jboss.hal.resources.Resources; - import com.google.web.bindery.event.shared.EventBus; import static org.jboss.hal.client.installer.AddressTemplates.INSTALLER_TEMPLATE; @@ -33,6 +32,7 @@ import static org.jboss.hal.core.finder.FinderColumn.RefreshMode.RESTORE_SELECTION; import static org.jboss.hal.dmr.ModelDescriptionConstants.PREPARE_REVERT; import static org.jboss.hal.dmr.ModelDescriptionConstants.REVISION; +import static org.jboss.hal.dmr.ModelDescriptionConstants.USE_DEFAULT_LOCAL_CACHE; class RevertWizard { @@ -66,6 +66,7 @@ void show(UpdateColumn column) { .addStep(PREPARE_SERVER, new PrepareStep( context -> new Operation.Builder(INSTALLER_TEMPLATE.resolve(statementContext), PREPARE_REVERT) .param(REVISION, context.updateItem.getName()) + .param(USE_DEFAULT_LOCAL_CACHE, true) .build(), eventBus, dispatcher, statementContext, resources)) .addStep(APPLY_REVERT, new ApplyStep( diff --git a/app/src/main/java/org/jboss/hal/client/installer/UpdateColumn.java b/app/src/main/java/org/jboss/hal/client/installer/UpdateColumn.java index f850f739d8..c9dd8030ad 100644 --- a/app/src/main/java/org/jboss/hal/client/installer/UpdateColumn.java +++ b/app/src/main/java/org/jboss/hal/client/installer/UpdateColumn.java @@ -20,7 +20,6 @@ import java.util.List; import javax.inject.Inject; - import org.jboss.hal.ballroom.Format; import org.jboss.hal.ballroom.dialog.Dialog; import org.jboss.hal.core.finder.ColumnAction; @@ -47,7 +46,6 @@ import org.jboss.hal.spi.Message; import org.jboss.hal.spi.MessageEvent; import org.jboss.hal.spi.Requires; - import com.google.web.bindery.event.shared.EventBus; import elemental2.dom.HTMLElement; @@ -55,7 +53,6 @@ import static java.util.Comparator.comparing; import static java.util.stream.Collectors.toList; - import static org.jboss.elemento.Elements.p; import static org.jboss.hal.client.installer.AddressTemplates.INSTALLER_ADDRESS; import static org.jboss.hal.client.installer.AddressTemplates.INSTALLER_TEMPLATE; @@ -70,6 +67,7 @@ import static org.jboss.hal.dmr.ModelDescriptionConstants.TIMESTAMP; import static org.jboss.hal.dmr.ModelDescriptionConstants.TYPE; import static org.jboss.hal.dmr.ModelDescriptionConstants.UPDATES; +import static org.jboss.hal.dmr.ModelDescriptionConstants.USE_DEFAULT_LOCAL_CACHE; import static org.jboss.hal.resources.CSS.fontAwesome; import static org.jboss.hal.resources.CSS.pfIcon; @@ -203,7 +201,9 @@ public List> actions() { private void updateOnline() { progress.reset(); - Operation operation = new Operation.Builder(INSTALLER_TEMPLATE.resolve(statementContext), LIST_UPDATES).build(); + Operation operation = new Operation.Builder(INSTALLER_TEMPLATE.resolve(statementContext), LIST_UPDATES) + .param(USE_DEFAULT_LOCAL_CACHE, true) + .build(); dispatcher.execute(operation, result -> { List updates = result.get(UPDATES).asList(); diff --git a/app/src/main/java/org/jboss/hal/client/installer/UpdateOfflineWizard.java b/app/src/main/java/org/jboss/hal/client/installer/UpdateOfflineWizard.java index 7ee8b8ad9c..39e7a20536 100644 --- a/app/src/main/java/org/jboss/hal/client/installer/UpdateOfflineWizard.java +++ b/app/src/main/java/org/jboss/hal/client/installer/UpdateOfflineWizard.java @@ -20,7 +20,6 @@ import org.jboss.hal.dmr.dispatch.Dispatcher; import org.jboss.hal.meta.StatementContext; import org.jboss.hal.resources.Resources; - import com.google.web.bindery.event.shared.EventBus; import static org.jboss.hal.client.installer.AddressTemplates.INSTALLER_TEMPLATE; @@ -29,8 +28,8 @@ import static org.jboss.hal.client.installer.UpdateOfflineState.PREPARE_SERVER; import static org.jboss.hal.client.installer.UpdateOfflineState.UPLOAD_ARCHIVES; import static org.jboss.hal.core.finder.FinderColumn.RefreshMode.CLEAR_SELECTION; -import static org.jboss.hal.dmr.ModelDescriptionConstants.NO_RESOLVE_LOCAL_CACHE; import static org.jboss.hal.dmr.ModelDescriptionConstants.PREPARE_UPDATES; +import static org.jboss.hal.dmr.ModelDescriptionConstants.USE_DEFAULT_LOCAL_CACHE; import static org.jboss.hal.dmr.ModelDescriptionConstants.WORK_DIR; class UpdateOfflineWizard { @@ -72,7 +71,7 @@ void show(UpdateColumn column) { updateManagerContext -> new Operation.Builder(INSTALLER_TEMPLATE.resolve(statementContext), PREPARE_UPDATES) .param(WORK_DIR, updateManagerContext.workDir) - .param(NO_RESOLVE_LOCAL_CACHE, true) + .param(USE_DEFAULT_LOCAL_CACHE, false) .build(), eventBus, dispatcher, statementContext, resources)) .addStep(APPLY_UPDATE, new ApplyStep( diff --git a/app/src/main/java/org/jboss/hal/client/installer/UpdateOnlineWizard.java b/app/src/main/java/org/jboss/hal/client/installer/UpdateOnlineWizard.java index 8ff324acae..9b71a8ec7a 100644 --- a/app/src/main/java/org/jboss/hal/client/installer/UpdateOnlineWizard.java +++ b/app/src/main/java/org/jboss/hal/client/installer/UpdateOnlineWizard.java @@ -23,7 +23,6 @@ import org.jboss.hal.dmr.dispatch.Dispatcher; import org.jboss.hal.meta.StatementContext; import org.jboss.hal.resources.Resources; - import com.google.web.bindery.event.shared.EventBus; import static org.jboss.hal.client.installer.AddressTemplates.INSTALLER_TEMPLATE; @@ -32,6 +31,7 @@ import static org.jboss.hal.client.installer.UpdateOnlineState.PREPARE_SERVER; import static org.jboss.hal.core.finder.FinderColumn.RefreshMode.CLEAR_SELECTION; import static org.jboss.hal.dmr.ModelDescriptionConstants.PREPARE_UPDATES; +import static org.jboss.hal.dmr.ModelDescriptionConstants.USE_DEFAULT_LOCAL_CACHE; class UpdateOnlineWizard { @@ -63,7 +63,9 @@ void show(UpdateColumn column) { resources.constants().prepareServerCandidate(), resources.constants().applyUpdates()))) .addStep(PREPARE_SERVER, new PrepareStep( - (__) -> new Operation.Builder(INSTALLER_TEMPLATE.resolve(statementContext), PREPARE_UPDATES).build(), + (__) -> new Operation.Builder(INSTALLER_TEMPLATE.resolve(statementContext), PREPARE_UPDATES) + .param(USE_DEFAULT_LOCAL_CACHE, true) + .build(), eventBus, dispatcher, statementContext, resources)) .addStep(APPLY_UPDATE, new ApplyStep( resources.constants().applyUpdates(), diff --git a/app/src/main/java/org/jboss/hal/client/installer/UploadArchivesStep.java b/app/src/main/java/org/jboss/hal/client/installer/UploadArchivesStep.java index 3d0f35edfb..db84281575 100644 --- a/app/src/main/java/org/jboss/hal/client/installer/UploadArchivesStep.java +++ b/app/src/main/java/org/jboss/hal/client/installer/UploadArchivesStep.java @@ -34,13 +34,12 @@ import elemental2.promise.Promise; import static java.util.Collections.singletonList; - import static org.jboss.elemento.Elements.div; import static org.jboss.hal.client.installer.AddressTemplates.INSTALLER_TEMPLATE; import static org.jboss.hal.dmr.ModelDescriptionConstants.LIST_UPDATES; import static org.jboss.hal.dmr.ModelDescriptionConstants.MAVEN_REPO_FILES; -import static org.jboss.hal.dmr.ModelDescriptionConstants.NO_RESOLVE_LOCAL_CACHE; import static org.jboss.hal.dmr.ModelDescriptionConstants.UPDATES; +import static org.jboss.hal.dmr.ModelDescriptionConstants.USE_DEFAULT_LOCAL_CACHE; import static org.jboss.hal.dmr.ModelDescriptionConstants.WORK_DIR; import static org.jboss.hal.flow.Flow.sequential; @@ -85,7 +84,7 @@ public void onNext(final UpdateManagerContext context, final WorkflowCallback ca } Operation operation = new Operation.Builder(INSTALLER_TEMPLATE.resolve(statementContext), LIST_UPDATES) .param(MAVEN_REPO_FILES, mavenRepoFiles) - .param(NO_RESOLVE_LOCAL_CACHE, true) + .param(USE_DEFAULT_LOCAL_CACHE, false) .build(); List> tasks = singletonList( flowContext -> dispatcher.upload(uploadElement.getFiles(), operation).then(result -> { diff --git a/dmr/src/main/java/org/jboss/hal/dmr/ModelDescriptionConstants.java b/dmr/src/main/java/org/jboss/hal/dmr/ModelDescriptionConstants.java index 2ac6a8cc0b..281b11794d 100644 --- a/dmr/src/main/java/org/jboss/hal/dmr/ModelDescriptionConstants.java +++ b/dmr/src/main/java/org/jboss/hal/dmr/ModelDescriptionConstants.java @@ -629,7 +629,6 @@ public interface ModelDescriptionConstants { String NEW_VERSION = "new-version"; String NEXT_TIMEOUT = "next-timeout"; String NILLABLE = "nillable"; - String NO_RESOLVE_LOCAL_CACHE = "no-resolve-local-cache"; String NO_TX_SEPARATE_POOL = "no-tx-separate-pool"; String NODE = "node"; String NON_DURABLE_MESSAGE_COUNT = "non-durable-message-count"; @@ -1038,6 +1037,7 @@ public interface ModelDescriptionConstants { String UNDERTOW = "undertow"; String UNIT = "unit"; String UNREGISTERED = "unregistered"; + String USE_DEFAULT_LOCAL_CACHE = "use-default-local-cache"; String UP = "UP"; String UPLOAD_CUSTOM_PATCH = "upload-custom-patch"; String UPDATE = "update";