Rename portal context

wso2 · Oct 8, 2019 · 3a7a222 · 3a7a222
1 parent af117cb
commit 3a7a222
Show file tree

Hide file tree

Showing 27 changed files with 32 additions and 32 deletions.
diff --git 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
@@ -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
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <meta name='viewport' content='width=device-width'>
-    <title>Portal</title>
+    <title>Analytics Dashboard</title>
     <link rel="stylesheet" type="text/css"
           href="{{@contextPath}}/public/app/js/libs/font-wso2_1.0.0/css/font-wso2.min.css" />
     <link rel="shortcut icon" href="{{@contextPath}}/public/app/images/favicon.ico" type="image/x-icon" />

diff --git 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
@@ -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
@@ -208,7 +208,7 @@ export default class Login extends Component {
             <MuiThemeProvider muiTheme={defaultTheme}>
                 <div>
                     <Header
-                        title={<FormattedMessage id='portal.title' defaultMessage='Portal' />}
+                        title={<FormattedMessage id='portal.title' defaultMessage='Analytics Dashboard' />}
                         rightElement={<span />}
                     />
                     <FormPanel

diff --git a/components/dashboards-web-component/src/common/PortalButton.jsx b/components/dashboards-web-component/src/common/PortalButton.jsx
@@ -29,7 +29,7 @@ class PortalButton extends Component {
         return (
             <FlatButton
                 style={{ minWidth: '48px' }}
-                label={<FormattedMessage id='portal.title' defaultMessage='Portal' />}
+                label={<FormattedMessage id='portal.title' defaultMessage='Analytics Dashboard' />}
                 icon={<ActionViewModule />}
                 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
@@ -162,7 +162,7 @@ export default class DashboardListingPage extends Component {
         return (
             <MuiThemeProvider muiTheme={defaultTheme}>
                 <Header
-                    title={<FormattedMessage id="portal.title" defaultMessage="Portal" />}
+                    title={<FormattedMessage id="portal.title" defaultMessage="Analytics Dashboard" />}
                     rightElement={<span><WidgetButton /><UserMenu /></span>}
                 />
                 <div style={styles.thumbnailsWrapper}>

diff --git 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/...ashboards.api/src/main/java/org/wso2/carbon/dashboards/api/internal/DashboardRestApi.java b/...ashboards.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/<DASHBOARD_URL>/export
+     * URL: https://localhost:9643/analytics-dashboard/apis/dashboards/<DASHBOARD_URL>/export
      *
      * To download the dashboard as an attachment,
-     * URL: https://localhost:9643/portal/apis/dashboards/<DASHBOARD_URL>/export?download=true
+     * URL: https://localhost:9643/analytics-dashboard/apis/dashboards/<DASHBOARD_URL>/export?download=true
      *
      * @since 4.0.29
      *

diff --git a/...s.api/src/main/java/org/wso2/carbon/dashboards/api/internal/DashboardRestApiProvider.java b/...s.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/...boards.core/src/main/java/org/wso2/carbon/dashboards/core/internal/DashboardImporter.java b/...boards.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/...rc/test/java/org/wso2/carbon/dashboards/core/internal/WidgetMetadataProviderImplTest.java b/...rc/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/...dhi.apps.api/src/gen/java/org/wso2/carbon/siddhi/apps/api/rest/SiddhiAppsApiProvider.java b/...dhi.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/...s/org.wso2.carbon.dashboards.siddhi.apps.api/src/main/resources/siddhi-apps-rest-api.yaml b/...s/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
@@ -69,7 +69,7 @@
                                     <version>${project.version}</version>
                                     <type>jar</type>
                                     <overWrite>true</overWrite>
-                                    <outputDirectory>${project.build.directory}/target/portal/public/</outputDirectory>
+                                    <outputDirectory>${project.build.directory}/target/analytics-dashboard/public/</outputDirectory>
                                     <includes>js/**</includes>
                                 </artifactItem>
                                 <artifactItem>
@@ -78,7 +78,7 @@
                                     <version>${project.version}</version>
                                     <type>jar</type>
                                     <overWrite>true</overWrite>
-                                    <outputDirectory>${project.build.directory}/target/portal/public/</outputDirectory>
+                                    <outputDirectory>${project.build.directory}/target/analytics-dashboard/public/</outputDirectory>
                                     <includes>locales/**</includes>
                                 </artifactItem>
                                 <artifactItem>
@@ -87,7 +87,7 @@
                                     <version>${project.version}</version>
                                     <type>jar</type>
                                     <overWrite>true</overWrite>
-                                    <outputDirectory>${project.build.directory}/target/portal/</outputDirectory>
+                                    <outputDirectory>${project.build.directory}/target/analytics-dashboard/</outputDirectory>
                                     <includes>pages/index.hbs</includes>
                                 </artifactItem>
                                 <artifactItem>
@@ -96,7 +96,7 @@
                                     <version>${project.version}</version>
                                     <type>jar</type>
                                     <overWrite>true</overWrite>
-                                    <outputDirectory>${project.build.directory}/target/portal/extensions/widgets/</outputDirectory>
+                                    <outputDirectory>${project.build.directory}/target/analytics-dashboard/extensions/widgets/</outputDirectory>
                                     <includes>UniversalWidget/**</includes>
                                 </artifactItem>
                             </artifactItems>

diff --git a/...esources/portal/public/images/favicon.ico → ...ytics-dashboard/public/images/favicon.ico b/...esources/portal/public/images/favicon.ico → ...ytics-dashboard/public/images/favicon.ico
diff --git a/...n/resources/portal/public/images/logo.svg → ...nalytics-dashboard/public/images/logo.svg b/...n/resources/portal/public/images/logo.svg → ...nalytics-dashboard/public/images/logo.svg
diff --git a/...js/libs/font-wso2_1.0.0/css/font-wso2.css → ...js/libs/font-wso2_1.0.0/css/font-wso2.css b/...js/libs/font-wso2_1.0.0/css/font-wso2.css → ...js/libs/font-wso2_1.0.0/css/font-wso2.css
diff --git a/...ibs/font-wso2_1.0.0/css/font-wso2.min.css → ...ibs/font-wso2_1.0.0/css/font-wso2.min.css b/...ibs/font-wso2_1.0.0/css/font-wso2.min.css → ...ibs/font-wso2_1.0.0/css/font-wso2.min.css
diff --git a/.../libs/font-wso2_1.0.0/fonts/font-wso2.eot → .../libs/font-wso2_1.0.0/fonts/font-wso2.eot b/.../libs/font-wso2_1.0.0/fonts/font-wso2.eot → .../libs/font-wso2_1.0.0/fonts/font-wso2.eot
diff --git a/.../libs/font-wso2_1.0.0/fonts/font-wso2.svg → .../libs/font-wso2_1.0.0/fonts/font-wso2.svg b/.../libs/font-wso2_1.0.0/fonts/font-wso2.svg → .../libs/font-wso2_1.0.0/fonts/font-wso2.svg
diff --git a/.../libs/font-wso2_1.0.0/fonts/font-wso2.ttf → .../libs/font-wso2_1.0.0/fonts/font-wso2.ttf b/.../libs/font-wso2_1.0.0/fonts/font-wso2.ttf → .../libs/font-wso2_1.0.0/fonts/font-wso2.ttf
diff --git a/...libs/font-wso2_1.0.0/fonts/font-wso2.woff → ...libs/font-wso2_1.0.0/fonts/font-wso2.woff b/...libs/font-wso2_1.0.0/fonts/font-wso2.woff → ...libs/font-wso2_1.0.0/fonts/font-wso2.woff
diff --git a/...esources/portal/public/js/polyfill.min.js → ...ytics-dashboard/public/js/polyfill.min.js b/...esources/portal/public/js/polyfill.min.js → ...ytics-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
@@ -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
@@ -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);\