Change status page name

backend/backend/services/statusPageService.js

@@ -338,7 +338,7 @@ module.exports = {
                 });
                 statusPage.monitorsData = _.flatten(filteredMonitorData);
             } else {
-                const error = new Error('Status Page Not present');
+                const error = new Error('Page Not Found');
                 error.code = 400;
                 ErrorService.log('statusPageService.getStatus', error);
                 throw error;

helm-chart/README.md

@@ -8,11 +8,6 @@ Please run these commands from `root`
 helm lint ./helm-chart/public/fyipe 
 ```
 
-### Uninstall and Install the chart
-```
-helm uninstall fi
-```
-
 ### Install as an Enterprise Cluster with default values
 ```
 helm install fi ./helm-chart/public/fyipe 
@@ -28,6 +23,11 @@ helm install -f ./kubernetes/values-saas-staging.yaml fi ./helm-chart/public/fyi
 helm install -f ./kubernetes/values-saas-production.yaml fi ./helm-chart/public/fyipe 
 ```
 
+### Uninstall and Install the chart
+```
+helm uninstall fi
+```
+
 ### Docker build and push to docker repo with `:test` tag
 ```
 chmod +x ./kubernetes/ci/docker-build.sh

helm-chart/public/fyipe/templates/admin-dashboard.yaml

@@ -28,7 +28,7 @@ spec:
                       value: {{ .Values.fyipe.licenseUrl }}
                     {{- end }}
                     - name: NODE_ENV
-                        value: 'production'
+                      value: 'production'
                   ports:
                       - containerPort: {{ .Values.host.adminDashboardPort }}
                         hostPort: {{ .Values.host.adminDashboardPort }}

helm-chart/public/fyipe/templates/ingress.yaml

@@ -72,14 +72,14 @@ spec:
 ##########################################################################
 
 ############----STATUS-PAGE-INGRESS--#####################################
-{{- if .Values.fyipe.enableStatusPageIngress }} 
+{{- if .Values.enableStatusPageIngress }} 
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   annotations:
     kubernetes.io/ingress.class: nginx
     ingress.kubernetes.io/ssl-redirect: "true"
-  name: {{ printf "%s-%s" .Release.Name "status-page-ingress"  }}
+  name: {{ printf "%s-%s" .Release.Name "status-page"  }}
 spec:
   {{- if .Values.fyipe.tls.enabled }} 
   tls:
@@ -88,8 +88,12 @@ spec:
       secretName: {{ printf "%s-%s" .Release.Name "secret"  }}
   {{- end }}
   rules:
+    {{- if .Values.fyipe.host }} 
     - host: {{ printf "%s.%s" "status-page" .Values.fyipe.host }} 
       http:
+    {{- else }}
+    - http:
+    {{- end }}
         paths:
           - path: /
             backend:

helm-chart/public/fyipe/values.yaml

@@ -5,6 +5,7 @@
 saas: 
   isSaasService: false
 
+enableStatusPageIngress: false
 ###################################################################################
 fyipe:
   host: 
@@ -16,7 +17,7 @@ fyipe:
   callEnabled: true
   smsEnabled: true
   licenseUrl: https://fyipe.com/license
-  enableStatusPageIngress: false
+  
 
 host: 
   backendPort: 3002

kubernetes/values-saas-staging.yaml

@@ -23,4 +23,4 @@ saas:
     support: 
       slackToken: xoxp-369430749728-370026359715-370129302482-08f43c6a1306d2e8f4be4b0d8abbdb80
 
-fyipe.enableStatusPageIngress: false
+enableStatusPageIngress: true

smoke-test/status-page.test.js

@@ -21,6 +21,6 @@ describe('Check status-page up', () => {
         const response = await page.$eval('#app-loading > div', e => {
             return e.innerHTML;
         });
-        expect(response).toBe('Status Page Not present');
+        expect(response).toBe('Page Not Found');
     });
 });

status-page/src/components/Main.js

@@ -205,7 +205,7 @@ class Main extends Component {
     renderError = () => {
         const { error } = this.props.status;
         if (error === 'Input data schema mismatch.') {
-            return 'Status Page Not present';
+            return 'Page Not Found';
         } else if (error === 'Project Not present') {
             return 'Invalid Project.';
         } else return error;