Greg Sheremeta has uploaded a new change for review. Change subject: userportal, webadmin: remove unnecessary DocsURL config ......................................................................
userportal, webadmin: remove unnecessary DocsURL config Removed the DocsURL config parameter and the logic around refreshing it and calculating whether the documentation is available. Simply hardcoding to "/docs" now. Change-Id: I4e6dec7c400778a27b225a9416cb504235576901 Bug-Url: https://bugzilla.redhat.com/987862 Signed-off-by: Greg Sheremeta <gsher...@redhat.com> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/AbstractModelBoundPopupPresenterWidget.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Configurator.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/UserPortalConfigurator.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/WebAdminConfigurator.java 7 files changed, 12 insertions(+), 68 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/52/18152/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java index 13fb62a..8c03a32 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java @@ -883,14 +883,6 @@ @DefaultValueAttribute("20") QuotaGraceStorage(334), - /** - * The base URL for the documentation web-site - */ - @Reloadable - @TypeConverterAttribute(String.class) - @DefaultValueAttribute("") - DocsURL(335), - // This value indicates devices that although are given to us by VDSM // are still treated as managed devices // This should be a [device=<device> type=<type>[,]]* string diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java index ccf775d..7a33a1a 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java @@ -65,7 +65,6 @@ OvfItemsCountPerUpdate, ProductRPMVersion(ConfigAuthType.User), RhevhLocalFSPath, - DocsURL(ConfigAuthType.User), HotPlugEnabled(ConfigAuthType.User), NetworkLinkingSupported(ConfigAuthType.User), SupportBridgesReportByVDSM(ConfigAuthType.User), diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/AbstractModelBoundPopupPresenterWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/AbstractModelBoundPopupPresenterWidget.java index 4b25d47..be904aa 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/AbstractModelBoundPopupPresenterWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/AbstractModelBoundPopupPresenterWidget.java @@ -238,8 +238,8 @@ UICommand openDocumentationCommand = model.getOpenDocumentationCommand(); if (openDocumentationCommand != null) { - boolean isDocumentationAvailable = model.getConfigurator().isDocumentationAvailable() && - hashName != null && DocumentationPathTranslator.getPath(hashName) != null; + boolean isDocumentationAvailable = hashName != null && + DocumentationPathTranslator.getPath(hashName) != null; openDocumentationCommand.setIsAvailable(isDocumentationAvailable); updateHelpCommand(isDocumentationAvailable ? openDocumentationCommand : null); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Configurator.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Configurator.java index 2f65032..4d54a13 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Configurator.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Configurator.java @@ -24,6 +24,7 @@ public abstract class Configurator { private static final String DOCUMENTATION_LIB_PATH = "html/"; //$NON-NLS-1$ + private static final String DOCUMENTATION_ROOT = "docs"; //$NON-NLS-1$ private static String documentationLangPath; @@ -168,26 +169,6 @@ privatePollingTimerInterval = value; } - private boolean isDocumentationAvailable; - - public boolean isDocumentationAvailable() { - return isDocumentationAvailable; - } - - protected void setDocumentationAvailable(boolean isDocumentationAvailable) { - this.isDocumentationAvailable = isDocumentationAvailable; - } - - private String documentationBasePath; - - public String getDocumentationBasePath() { - return documentationBasePath; - } - - protected void setDocumentationBasePath(String documentationBasePath) { - this.documentationBasePath = documentationBasePath; - } - /** * Returns the base URL for serving documentation resources. * <p> @@ -196,7 +177,7 @@ * @return Documentation base URL, including the trailing slash. */ public String getDocumentationBaseURL() { - return FrontendUrlUtils.getRootURL() + getDocumentationBasePath() + "/"; //$NON-NLS-1$ + return FrontendUrlUtils.getRootURL() + DOCUMENTATION_ROOT + "/"; //$NON-NLS-1$ } /** @@ -225,21 +206,6 @@ return usbFilter; } - public void updateDocumentationBaseURL() { - AsyncDataProvider.getDocumentationBaseURL(new AsyncQuery(this, - new INewAsyncCallback() { - @Override - public void onSuccess(Object target, Object returnValue) { - String documentationBaseURL = (String) returnValue; - boolean isDocumentationAvailable = !documentationBaseURL.equals(""); //$NON-NLS-1$ - - setDocumentationAvailable(isDocumentationAvailable); - setDocumentationBasePath(documentationBaseURL); - onUpdateDocumentationBaseURL(); - } - })); - } - // Fetch file from a specified path public void fetchFile(final String filePath, final Event onFetched) { RequestBuilder requestBuilder = new RequestBuilder(RequestBuilder.GET, filePath); @@ -264,7 +230,7 @@ public boolean isWebSocketProxyDefined() { String wsConfig = (String) AsyncDataProvider.getConfigValuePreConverted(ConfigurationValues.WebSocketProxy); - return wsConfig != null && !"".equals(wsConfig) && !"Off".equalsIgnoreCase(wsConfig); //$NON-NLS-1$ $NON-NLS-2$ + return wsConfig != null && !"".equals(wsConfig) && !"Off".equalsIgnoreCase(wsConfig); //$NON-NLS-1$ //$NON-NLS-2$ } public final class FileFetchEventArgs extends EventArgs { @@ -344,7 +310,7 @@ } public boolean isClientWindowsExplorer() { - return isClientWindows() && clientBrowserType().equalsIgnoreCase("Explorer"); //$NON-NLS-1$ //$NON-NLS-2$ + return isClientWindows() && clientBrowserType().equalsIgnoreCase("Explorer"); //$NON-NLS-1$ } public boolean isClientWindows() { @@ -366,7 +332,7 @@ public abstract Float clientBrowserVersion(); - protected abstract void onUpdateDocumentationBaseURL(); + protected abstract void fetchDocumentationFile(); public boolean isSpiceProxyDefined() { String spiceProxy = (String) AsyncDataProvider.getConfigValuePreConverted(ConfigurationValues.SpiceProxyDefault); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java index d1b2769..e9cfc8c 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java @@ -1216,7 +1216,7 @@ }; // Passing empty values for Volume and Brick to get the services of all the volumes/hosts in the cluster GlusterVolumeAdvancedDetailsParameters parameters = - new GlusterVolumeAdvancedDetailsParameters(clusterId, null, null, false); //$NON-NLS-1$ //$NON-NLS-2$ + new GlusterVolumeAdvancedDetailsParameters(clusterId, null, null, false); Frontend.RunQuery(VdcQueryType.GetGlusterVolumeAdvancedDetails, parameters, aQuery); @@ -2223,19 +2223,6 @@ Frontend.RunQuery(VdcQueryType.GetVmConfigurationBySnapshot, new IdQueryParameters(snapshotSourceId), - aQuery); - } - - public static void getDocumentationBaseURL(AsyncQuery aQuery) { - aQuery.converterCallback = new IAsyncConverter() { - @Override - public Object Convert(Object source, AsyncQuery _asyncQuery) - { - return source != null ? (String) source : ""; //$NON-NLS-1$ - } - }; - getConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.DocsURL, getDefaultConfigurationVersion()), aQuery); } diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/UserPortalConfigurator.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/UserPortalConfigurator.java index 6bb1308..0c57e7a 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/UserPortalConfigurator.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/UserPortalConfigurator.java @@ -127,7 +127,7 @@ @Override public void onUiCommonInit(UiCommonInitEvent event) { - updateDocumentationBaseURL(); + fetchDocumentationFile(); } @Override @@ -151,7 +151,7 @@ } @Override - protected void onUpdateDocumentationBaseURL() { + protected void fetchDocumentationFile() { fetchFile(getDocumentationBaseURL() + "UserPortalDocumentationPath.csv", documentationFileFetchedEvent); //$NON-NLS-1$ } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/WebAdminConfigurator.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/WebAdminConfigurator.java index 5671880..642f11e 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/WebAdminConfigurator.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/WebAdminConfigurator.java @@ -76,7 +76,7 @@ @Override public void onUiCommonInit(UiCommonInitEvent event) { - updateDocumentationBaseURL(); + fetchDocumentationFile(); } @Override @@ -100,7 +100,7 @@ } @Override - protected void onUpdateDocumentationBaseURL() { + protected void fetchDocumentationFile() { fetchFile(getDocumentationBaseURL() + "DocumentationPath.csv", documentationFileFetchedEvent); //$NON-NLS-1$ } -- To view, visit http://gerrit.ovirt.org/18152 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4e6dec7c400778a27b225a9416cb504235576901 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Greg Sheremeta <gsher...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
