diff --git a/README.md b/README.md index 195eca21f..467123f8b 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ You can add following properties to pom file available in Carbon-UI-Server/tests ``` 4. Unzip the distribution and run the server. You can access the dashboard component from -https://localhost:9292/portal/ or http://localhost:9090/portal/ +https://localhost:9292/analytics-dashboard/ or http://localhost:9090/analytics-dashboard/ ## License Carbon dashboards is available under the Apache 2 License. diff --git a/components/dashboards-web-component/package.json b/components/dashboards-web-component/package.json index 68bc79008..93e12eea9 100644 --- a/components/dashboards-web-component/package.json +++ b/components/dashboards-web-component/package.json @@ -9,7 +9,7 @@ "dev": "NODE_ENV=development webpack --mode development --progress --devtool source-map", "lint": "eslint . --ext .jsx --ext .js", "build": "webpack --mode production", - "deploy": "cp ./dist/bundle.js $DS_HOME/wso2/dashboard/deployment/web-ui-apps/portal/public/js/" + "deploy": "cp ./dist/bundle.js $DS_HOME/wso2/dashboard/deployment/web-ui-apps/analytics-dashboard/public/js/" }, "repository": { "type": "git", diff --git a/components/dashboards-web-component/public/index.hbs b/components/dashboards-web-component/public/index.hbs index 35a8a6d78..591f4f3d2 100644 --- a/components/dashboards-web-component/public/index.hbs +++ b/components/dashboards-web-component/public/index.hbs @@ -3,7 +3,7 @@ - Portal + Analytics Dashboard diff --git a/components/dashboards-web-component/public/locales/en.json b/components/dashboards-web-component/public/locales/en.json index 3a86d7824..aa878b378 100644 --- a/components/dashboards-web-component/public/locales/en.json +++ b/components/dashboards-web-component/public/locales/en.json @@ -1,5 +1,5 @@ { - "portal.title": "Portal", + "portal.title": "Analytics Dashboard", "login.title": "Login", "logout": "Logout", "login.username": "Username", diff --git a/components/dashboards-web-component/public/locales/fr.json b/components/dashboards-web-component/public/locales/fr.json index 8ae3417b3..b6ff0fd59 100644 --- a/components/dashboards-web-component/public/locales/fr.json +++ b/components/dashboards-web-component/public/locales/fr.json @@ -1,5 +1,5 @@ { - "portal.title": "Portail", + "portal.title": "Tableau de bord d'analyse", "login.title": "S'identifier", "logout": "Logout", "login.username": "Nom d'utilisateur", diff --git a/components/dashboards-web-component/src/auth/Login.jsx b/components/dashboards-web-component/src/auth/Login.jsx index 868dace89..aa13122c7 100644 --- a/components/dashboards-web-component/src/auth/Login.jsx +++ b/components/dashboards-web-component/src/auth/Login.jsx @@ -208,7 +208,7 @@ export default class Login extends Component {
} + title={} rightElement={} /> } + label={} icon={} onClick={() => this.props.history.push('/')} /> diff --git a/components/dashboards-web-component/src/listing/DashboardListingPage.jsx b/components/dashboards-web-component/src/listing/DashboardListingPage.jsx index e85e3196a..144720a17 100644 --- a/components/dashboards-web-component/src/listing/DashboardListingPage.jsx +++ b/components/dashboards-web-component/src/listing/DashboardListingPage.jsx @@ -162,7 +162,7 @@ export default class DashboardListingPage extends Component { return (
} + title={} rightElement={} />
diff --git a/components/dashboards-web-component/test/test-setup.js b/components/dashboards-web-component/test/test-setup.js index 96fed90cf..005dddd07 100644 --- a/components/dashboards-web-component/test/test-setup.js +++ b/components/dashboards-web-component/test/test-setup.js @@ -23,4 +23,4 @@ import Adapter from 'enzyme-adapter-react-16'; configure({ adapter: new Adapter() }); // Setting-up the browser environment. -global.window.contextPath = '/portal'; +global.window.contextPath = '/analytics-dashboard'; diff --git a/components/dashboards/org.wso2.carbon.dashboards.api/src/main/java/org/wso2/carbon/dashboards/api/internal/DashboardRestApi.java b/components/dashboards/org.wso2.carbon.dashboards.api/src/main/java/org/wso2/carbon/dashboards/api/internal/DashboardRestApi.java index cad7effca..93f4435cc 100644 --- a/components/dashboards/org.wso2.carbon.dashboards.api/src/main/java/org/wso2/carbon/dashboards/api/internal/DashboardRestApi.java +++ b/components/dashboards/org.wso2.carbon.dashboards.api/src/main/java/org/wso2/carbon/dashboards/api/internal/DashboardRestApi.java @@ -286,10 +286,10 @@ public Response updateDashboardRoles(@PathParam("url") String url, @Context Requ /** * Get dashboard with widget definitions. - * URL: https://localhost:9643/portal/apis/dashboards//export + * URL: https://localhost:9643/analytics-dashboard/apis/dashboards//export * * To download the dashboard as an attachment, - * URL: https://localhost:9643/portal/apis/dashboards//export?download=true + * URL: https://localhost:9643/analytics-dashboard/apis/dashboards//export?download=true * * @since 4.0.29 * diff --git a/components/dashboards/org.wso2.carbon.dashboards.api/src/main/java/org/wso2/carbon/dashboards/api/internal/DashboardRestApiProvider.java b/components/dashboards/org.wso2.carbon.dashboards.api/src/main/java/org/wso2/carbon/dashboards/api/internal/DashboardRestApiProvider.java index 7c6eac46b..4fa2128b7 100644 --- a/components/dashboards/org.wso2.carbon.dashboards.api/src/main/java/org/wso2/carbon/dashboards/api/internal/DashboardRestApiProvider.java +++ b/components/dashboards/org.wso2.carbon.dashboards.api/src/main/java/org/wso2/carbon/dashboards/api/internal/DashboardRestApiProvider.java @@ -44,7 +44,7 @@ immediate = true) public class DashboardRestApiProvider implements RestApiProvider { - public static final String DASHBOARD_PORTAL_APP_NAME = "portal"; + public static final String DASHBOARD_PORTAL_APP_NAME = "analytics-dashboard"; private static final Logger LOGGER = LoggerFactory.getLogger(DashboardRestApiProvider.class); private DashboardMetadataProvider dashboardMetadataProvider; diff --git a/components/dashboards/org.wso2.carbon.dashboards.core/src/main/java/org/wso2/carbon/dashboards/core/internal/DashboardImporter.java b/components/dashboards/org.wso2.carbon.dashboards.core/src/main/java/org/wso2/carbon/dashboards/core/internal/DashboardImporter.java index 7a846c6a7..4a87398b2 100644 --- a/components/dashboards/org.wso2.carbon.dashboards.core/src/main/java/org/wso2/carbon/dashboards/core/internal/DashboardImporter.java +++ b/components/dashboards/org.wso2.carbon.dashboards.core/src/main/java/org/wso2/carbon/dashboards/core/internal/DashboardImporter.java @@ -109,7 +109,7 @@ public void importDashboards() { if (!widgetMetadataProvider.isWidgetPresent(widgetId, WidgetType.ALL)) { LOGGER.warn( "Widget '{}' does not exists. Please copy the widget to " + - "'deployment/web-ui-apps/portal/extensions/widgets/' directory.", + "'deployment/web-ui-apps/analytics-dashboard/extensions/widgets/' directory.", widgetId); } } catch (DashboardException e) { diff --git a/components/dashboards/org.wso2.carbon.dashboards.core/src/test/java/org/wso2/carbon/dashboards/core/internal/WidgetMetadataProviderImplTest.java b/components/dashboards/org.wso2.carbon.dashboards.core/src/test/java/org/wso2/carbon/dashboards/core/internal/WidgetMetadataProviderImplTest.java index 1b0179296..034064d65 100644 --- a/components/dashboards/org.wso2.carbon.dashboards.core/src/test/java/org/wso2/carbon/dashboards/core/internal/WidgetMetadataProviderImplTest.java +++ b/components/dashboards/org.wso2.carbon.dashboards.core/src/test/java/org/wso2/carbon/dashboards/core/internal/WidgetMetadataProviderImplTest.java @@ -58,7 +58,7 @@ void testGetAllWidgetConfigurations() throws DashboardException { private static App createPortalApp() { Extension chartWidget = new Extension("LineChart", "widgets", "src/test/resources/LineChart"); - return new App("portal", "/portal", Collections.emptySortedSet(), Collections.singleton(chartWidget), + return new App("portal", "/analytics-dashboard", Collections.emptySortedSet(), Collections.singleton(chartWidget), Collections.emptySet(), Collections.emptySet(), null, null); } diff --git a/components/dashboards/org.wso2.carbon.dashboards.siddhi.apps.api/src/gen/java/org/wso2/carbon/siddhi/apps/api/rest/SiddhiAppsApiProvider.java b/components/dashboards/org.wso2.carbon.dashboards.siddhi.apps.api/src/gen/java/org/wso2/carbon/siddhi/apps/api/rest/SiddhiAppsApiProvider.java index 81c55c577..9f2df46eb 100644 --- a/components/dashboards/org.wso2.carbon.dashboards.siddhi.apps.api/src/gen/java/org/wso2/carbon/siddhi/apps/api/rest/SiddhiAppsApiProvider.java +++ b/components/dashboards/org.wso2.carbon.dashboards.siddhi.apps.api/src/gen/java/org/wso2/carbon/siddhi/apps/api/rest/SiddhiAppsApiProvider.java @@ -37,7 +37,7 @@ @Component(service = RestApiProvider.class, immediate = true) public class SiddhiAppsApiProvider implements RestApiProvider { - private static final String DASHBOARD_PORTAL_APP_NAME = "portal"; + private static final String DASHBOARD_PORTAL_APP_NAME = "analytics-dashboard"; private static final Logger LOGGER = LoggerFactory.getLogger(SiddhiAppsApiProvider.class); @Activate diff --git a/components/dashboards/org.wso2.carbon.dashboards.siddhi.apps.api/src/main/resources/siddhi-apps-rest-api.yaml b/components/dashboards/org.wso2.carbon.dashboards.siddhi.apps.api/src/main/resources/siddhi-apps-rest-api.yaml index 9a8225aaf..67a796b15 100644 --- a/components/dashboards/org.wso2.carbon.dashboards.siddhi.apps.api/src/main/resources/siddhi-apps-rest-api.yaml +++ b/components/dashboards/org.wso2.carbon.dashboards.siddhi.apps.api/src/main/resources/siddhi-apps-rest-api.yaml @@ -10,12 +10,12 @@ info: schemes: - https host: localhost -basePath: /portal/apis/datasearch +basePath: /analytics-dashboard/apis/datasearch paths: /siddhi-apps: get: - x-wso2-curl: 'curl -k -X GET https://localhost:9643/portal/apis/datasearch/siddhi-apps' - x-wso2-request: 'GET https://localhost:9643/portal/apis/datasearch/siddhi-apps' + x-wso2-curl: 'curl -k -X GET https://localhost:9643/analytics-dashboard/apis/datasearch/siddhi-apps' + x-wso2-request: 'GET https://localhost:9643/analytics-dashboard/apis/datasearch/siddhi-apps' x-wso2-response: |- HTTP/1.1 200 OK Content-Type: application/json ["ShipmentHistoryApp","SweetProductionApp"] @@ -34,8 +34,8 @@ paths: description: Insufficient permission to view siddhi apps. 'siddhi-apps/{appName}': get: - x-wso2-curl: 'curl -k -X GET https://localhost:9643/portal/apis/datasearch/siddhi-apps/{appName}' - x-wso2-request: 'GET https://localhost:9643/portal/apis/datasearch/siddhi-apps/{appName}' + x-wso2-curl: 'curl -k -X GET https://localhost:9643/analytics-dashboard/apis/datasearch/siddhi-apps/{appName}' + x-wso2-request: 'GET https://localhost:9643/analytics-dashboard/apis/datasearch/siddhi-apps/{appName}' x-wso2-response: >- HTTP/1.1 200 OK Content-Type: application/json [ diff --git a/features/org.wso2.carbon.dashboards.portal.feature/pom.xml b/features/org.wso2.carbon.dashboards.portal.feature/pom.xml index ed4cc8689..bd3653505 100644 --- a/features/org.wso2.carbon.dashboards.portal.feature/pom.xml +++ b/features/org.wso2.carbon.dashboards.portal.feature/pom.xml @@ -69,7 +69,7 @@ ${project.version} jar true - ${project.build.directory}/target/portal/public/ + ${project.build.directory}/target/analytics-dashboard/public/ js/** @@ -78,7 +78,7 @@ ${project.version} jar true - ${project.build.directory}/target/portal/public/ + ${project.build.directory}/target/analytics-dashboard/public/ locales/** @@ -87,7 +87,7 @@ ${project.version} jar true - ${project.build.directory}/target/portal/ + ${project.build.directory}/target/analytics-dashboard/ pages/index.hbs @@ -96,7 +96,7 @@ ${project.version} jar true - ${project.build.directory}/target/portal/extensions/widgets/ + ${project.build.directory}/target/analytics-dashboard/extensions/widgets/ UniversalWidget/** diff --git a/features/org.wso2.carbon.dashboards.portal.feature/src/main/resources/portal/public/images/favicon.ico b/features/org.wso2.carbon.dashboards.portal.feature/src/main/resources/analytics-dashboard/public/images/favicon.ico similarity index 100% rename from features/org.wso2.carbon.dashboards.portal.feature/src/main/resources/portal/public/images/favicon.ico rename to features/org.wso2.carbon.dashboards.portal.feature/src/main/resources/analytics-dashboard/public/images/favicon.ico diff --git a/features/org.wso2.carbon.dashboards.portal.feature/src/main/resources/portal/public/images/logo.svg b/features/org.wso2.carbon.dashboards.portal.feature/src/main/resources/analytics-dashboard/public/images/logo.svg similarity index 100% rename from features/org.wso2.carbon.dashboards.portal.feature/src/main/resources/portal/public/images/logo.svg rename to features/org.wso2.carbon.dashboards.portal.feature/src/main/resources/analytics-dashboard/public/images/logo.svg diff --git a/features/org.wso2.carbon.dashboards.portal.feature/src/main/resources/portal/public/js/libs/font-wso2_1.0.0/css/font-wso2.css b/features/org.wso2.carbon.dashboards.portal.feature/src/main/resources/analytics-dashboard/public/js/libs/font-wso2_1.0.0/css/font-wso2.css similarity index 100% rename from features/org.wso2.carbon.dashboards.portal.feature/src/main/resources/portal/public/js/libs/font-wso2_1.0.0/css/font-wso2.css rename to features/org.wso2.carbon.dashboards.portal.feature/src/main/resources/analytics-dashboard/public/js/libs/font-wso2_1.0.0/css/font-wso2.css diff --git a/features/org.wso2.carbon.dashboards.portal.feature/src/main/resources/portal/public/js/libs/font-wso2_1.0.0/css/font-wso2.min.css b/features/org.wso2.carbon.dashboards.portal.feature/src/main/resources/analytics-dashboard/public/js/libs/font-wso2_1.0.0/css/font-wso2.min.css similarity index 100% rename from features/org.wso2.carbon.dashboards.portal.feature/src/main/resources/portal/public/js/libs/font-wso2_1.0.0/css/font-wso2.min.css rename to features/org.wso2.carbon.dashboards.portal.feature/src/main/resources/analytics-dashboard/public/js/libs/font-wso2_1.0.0/css/font-wso2.min.css diff --git a/features/org.wso2.carbon.dashboards.portal.feature/src/main/resources/portal/public/js/libs/font-wso2_1.0.0/fonts/font-wso2.eot b/features/org.wso2.carbon.dashboards.portal.feature/src/main/resources/analytics-dashboard/public/js/libs/font-wso2_1.0.0/fonts/font-wso2.eot similarity index 100% rename from features/org.wso2.carbon.dashboards.portal.feature/src/main/resources/portal/public/js/libs/font-wso2_1.0.0/fonts/font-wso2.eot rename to features/org.wso2.carbon.dashboards.portal.feature/src/main/resources/analytics-dashboard/public/js/libs/font-wso2_1.0.0/fonts/font-wso2.eot diff --git a/features/org.wso2.carbon.dashboards.portal.feature/src/main/resources/portal/public/js/libs/font-wso2_1.0.0/fonts/font-wso2.svg b/features/org.wso2.carbon.dashboards.portal.feature/src/main/resources/analytics-dashboard/public/js/libs/font-wso2_1.0.0/fonts/font-wso2.svg similarity index 100% rename from features/org.wso2.carbon.dashboards.portal.feature/src/main/resources/portal/public/js/libs/font-wso2_1.0.0/fonts/font-wso2.svg rename to features/org.wso2.carbon.dashboards.portal.feature/src/main/resources/analytics-dashboard/public/js/libs/font-wso2_1.0.0/fonts/font-wso2.svg diff --git a/features/org.wso2.carbon.dashboards.portal.feature/src/main/resources/portal/public/js/libs/font-wso2_1.0.0/fonts/font-wso2.ttf b/features/org.wso2.carbon.dashboards.portal.feature/src/main/resources/analytics-dashboard/public/js/libs/font-wso2_1.0.0/fonts/font-wso2.ttf similarity index 100% rename from features/org.wso2.carbon.dashboards.portal.feature/src/main/resources/portal/public/js/libs/font-wso2_1.0.0/fonts/font-wso2.ttf rename to features/org.wso2.carbon.dashboards.portal.feature/src/main/resources/analytics-dashboard/public/js/libs/font-wso2_1.0.0/fonts/font-wso2.ttf diff --git a/features/org.wso2.carbon.dashboards.portal.feature/src/main/resources/portal/public/js/libs/font-wso2_1.0.0/fonts/font-wso2.woff b/features/org.wso2.carbon.dashboards.portal.feature/src/main/resources/analytics-dashboard/public/js/libs/font-wso2_1.0.0/fonts/font-wso2.woff similarity index 100% rename from features/org.wso2.carbon.dashboards.portal.feature/src/main/resources/portal/public/js/libs/font-wso2_1.0.0/fonts/font-wso2.woff rename to features/org.wso2.carbon.dashboards.portal.feature/src/main/resources/analytics-dashboard/public/js/libs/font-wso2_1.0.0/fonts/font-wso2.woff diff --git a/features/org.wso2.carbon.dashboards.portal.feature/src/main/resources/portal/public/js/polyfill.min.js b/features/org.wso2.carbon.dashboards.portal.feature/src/main/resources/analytics-dashboard/public/js/polyfill.min.js similarity index 100% rename from features/org.wso2.carbon.dashboards.portal.feature/src/main/resources/portal/public/js/polyfill.min.js rename to features/org.wso2.carbon.dashboards.portal.feature/src/main/resources/analytics-dashboard/public/js/polyfill.min.js diff --git a/features/org.wso2.carbon.dashboards.portal.feature/src/main/resources/p2.inf b/features/org.wso2.carbon.dashboards.portal.feature/src/main/resources/p2.inf index ab149c1b5..a6a2acdcd 100644 --- a/features/org.wso2.carbon.dashboards.portal.feature/src/main/resources/p2.inf +++ b/features/org.wso2.carbon.dashboards.portal.feature/src/main/resources/p2.inf @@ -23,7 +23,7 @@ metaRequirements.0.optional = true instructions.configure = \ org.wso2.carbon.extensions.touchpoint.mkdir(path:${installFolder}/../{runtime}/deployment/);\ org.wso2.carbon.extensions.touchpoint.mkdir(path:${installFolder}/../{runtime}/deployment/web-ui-apps/);\ -org.wso2.carbon.extensions.touchpoint.mkdir(path:${installFolder}/../{runtime}/deployment/web-ui-apps/portal/);\ -org.wso2.carbon.extensions.touchpoint.mkdir(path:${installFolder}/../{runtime}/deployment/web-ui-apps/portal/extensions);\ -org.wso2.carbon.extensions.touchpoint.mkdir(path:${installFolder}/../{runtime}/deployment/web-ui-apps/portal/extensions/widgets);\ -org.wso2.carbon.extensions.touchpoint.copy(source:${installFolder}/../lib/features/org.wso2.carbon.dashboards.portal_${feature.version}/portal/,target:${installFolder}/../{runtime}/deployment/web-ui-apps/portal/,overwrite:true);\ +org.wso2.carbon.extensions.touchpoint.mkdir(path:${installFolder}/../{runtime}/deployment/web-ui-apps/analytics-dashboard/);\ +org.wso2.carbon.extensions.touchpoint.mkdir(path:${installFolder}/../{runtime}/deployment/web-ui-apps/analytics-dashboard/extensions);\ +org.wso2.carbon.extensions.touchpoint.mkdir(path:${installFolder}/../{runtime}/deployment/web-ui-apps/analytics-dashboard/extensions/widgets);\ +org.wso2.carbon.extensions.touchpoint.copy(source:${installFolder}/../lib/features/org.wso2.carbon.dashboards.portal_${feature.version}/analytics-dashboard/,target:${installFolder}/../{runtime}/deployment/web-ui-apps/analytics-dashboard/,overwrite:true);\ diff --git a/samples/features/org.wso2.carbon.dashboards.samples.feature/src/main/resources/p2.inf b/samples/features/org.wso2.carbon.dashboards.samples.feature/src/main/resources/p2.inf index bac009b82..e4ab5feba 100644 --- a/samples/features/org.wso2.carbon.dashboards.samples.feature/src/main/resources/p2.inf +++ b/samples/features/org.wso2.carbon.dashboards.samples.feature/src/main/resources/p2.inf @@ -23,10 +23,10 @@ metaRequirements.0.optional = true instructions.configure = \ org.wso2.carbon.extensions.touchpoint.mkdir(path:${installFolder}/../{runtime}/deployment/);\ org.wso2.carbon.extensions.touchpoint.mkdir(path:${installFolder}/../{runtime}/deployment/web-ui-apps/);\ -org.wso2.carbon.extensions.touchpoint.mkdir(path:${installFolder}/../{runtime}/deployment/web-ui-apps/portal/);\ -org.wso2.carbon.extensions.touchpoint.mkdir(path:${installFolder}/../{runtime}/deployment/web-ui-apps/portal/extensions/);\ -org.wso2.carbon.extensions.touchpoint.mkdir(path:${installFolder}/../{runtime}/deployment/web-ui-apps/portal/extensions/widgets/);\ -org.wso2.carbon.extensions.touchpoint.copy(source:${installFolder}/../lib/features/org.wso2.carbon.dashboards.samples_${feature.version}/widgets/,target:${installFolder}/../{runtime}/deployment/web-ui-apps/portal/extensions/widgets/,overwrite:true);\ +org.wso2.carbon.extensions.touchpoint.mkdir(path:${installFolder}/../{runtime}/deployment/web-ui-apps/analytics-dashboard/);\ +org.wso2.carbon.extensions.touchpoint.mkdir(path:${installFolder}/../{runtime}/deployment/web-ui-apps/analytics-dashboard/extensions/);\ +org.wso2.carbon.extensions.touchpoint.mkdir(path:${installFolder}/../{runtime}/deployment/web-ui-apps/analytics-dashboard/extensions/widgets/);\ +org.wso2.carbon.extensions.touchpoint.copy(source:${installFolder}/../lib/features/org.wso2.carbon.dashboards.samples_${feature.version}/widgets/,target:${installFolder}/../{runtime}/deployment/web-ui-apps/analytics-dashboard/extensions/widgets/,overwrite:true);\ org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../lib/features/org.wso2.carbon.dashboards.samples_${feature.version}/widgets/);\ org.wso2.carbon.extensions.touchpoint.mkdir(path:${installFolder}/../{runtime}/resources/);\ org.wso2.carbon.extensions.touchpoint.copy(source:${installFolder}/../lib/features/org.wso2.carbon.dashboards.samples_${feature.version}/resources/,target:${installFolder}/../{runtime}/resources/,overwrite:true);\