Application services tab #1237

KlapTrap · 2017-08-29T10:44:22Z

Created two new tabs on the applications page 'Service Instances' and 'Services Catalogue'.
Services Catalogue tab is mostly the same as the previous service tab but with the ability to unbind services removed. You can add and manage service instance from this page. The manage service link takes you to the new service tab with a type filter applied.
Service Instances tab is a new list of service instances. This tab will allow you to unbind, search for and filter service instances.
Removed service instance table from the application summary page.
Added service instance count to application summary page.

…ng the cirrect cards

…manage button

…s menu

…g strings

* master: Ensure we wait for $translate onReady before initialising landing page language options

* master: Pre-sort service instances in cloud foundry space instances table (#1233) Remove package-lock.json - to be added back in another pr Add sass source maps into the dev build of the frontend

nwmac

Unit tests need fixing - most are being excluded by an fdescribe.

nwmac · 2017-08-30T13:32:01Z

...-foundry/frontend/src/view/applications/application/service-catalogue/service-catalogue.html

+  class="message-box message-box-no-bg">
+  <p>
+    <img src="/images/services/App_services_72.png" />
+    <h3 translate>There are no services available for this endpoint. Please contact your Administrator to add services so you can bind them to your applications.</h3>


String needs to be pulled out and replaced with translation key

nwmac · 2017-08-30T13:34:01Z

...d-foundry/frontend/src/view/applications/application/services/service-card/service-card.html

+
+      <div class="service-catalogue-card__meta-split">
+        <div class="service-catalogue-card__meta-left">
+          Description


Can we pull out for translation

nwmac · 2017-08-30T13:34:06Z

...d-foundry/frontend/src/view/applications/application/services/service-card/service-card.html

-          app.app-info.app-tabs.services.card.cannot-bind
+      <div class="service-catalogue-card__meta-split">
+        <div class="service-catalogue-card__meta-left">
+          Date created


Can we pull out for translation

nwmac · 2017-08-30T13:34:47Z

...d-foundry/frontend/src/view/applications/application/services/service-card/service-card.html

-          ng-if="serviceCardCtrl.allowAddOnly && serviceCardCtrl.numAttached > 0">
-          {{ serviceCardCtrl.numAttached }} <span translate>app.app-info.app-tabs.services.card.attached</span>
+        <div class="service-catalogue-card__meta-right">
+          {{ ::serviceCardCtrl.service.metadata.created_at | amDateFormat:'MMM Do YYYY HH:mm:ss' }}


Can you check with Rich - I think we have a pattern for the date formatting that will switch MM/dd vs dd/MM depending on locale.

Pass it through a filter titled 'momentDateFormat'. It'll use the L - LTS format with some magic to ensure it updates on change of locale.

nwmac · 2017-08-30T13:35:05Z

...d-foundry/frontend/src/view/applications/application/services/service-card/service-card.html

      </div>
+      <div class="service-catalogue-card__meta-split">
+        <a ng-click="serviceCardCtrl.viewEnvVariables(serviceCardCtrl.service)">
+          Show environment variables


Can we pull out for translation

nwmac · 2017-08-30T13:35:34Z

components/cloud-foundry/frontend/src/view/applications/application/services/services.html

+    <img src="/images/services/App_services_72.png" />
+    <div ng-if="!applicationServicesCtrl.search.$ && !applicationServicesCtrl.isFiltered()">
+      <h3>
+        This application has no bound service instances.


Can we pull out for translation

nwmac · 2017-08-30T13:35:41Z

components/cloud-foundry/frontend/src/view/applications/application/services/services.html

+        This application has no bound service instances.
+      </h3>
+      <h3>
+        To view the avaliable services for this application, please visit the <a ui-sref="cf.applications.application.service-catalogue">service catalogue</a>.


Can we pull out for translation

I think the colour on these look a bit out as well. See styles applications-empty, applications-msg and applications-cta for more info (create a space and then in app wall filter by it.. or create a space, disable ssh, create an app in space and then go to app tab ssh)
Part of me also thinks we shouldn't show this part when the user does not have permissions to add/bind the services. Leaving both this and the catalogue as very read only

nwmac · 2017-08-30T13:35:45Z

components/cloud-foundry/frontend/src/view/applications/application/services/services.html

+    </div>
+    <div ng-if="applicationServicesCtrl.isFiltered()">
+      <h3 translate>
+        No services instances found matching your search.


Can we pull out for translation

nwmac · 2017-09-05T12:33:33Z

components/cloud-foundry/frontend/test/e2e/cf.organizations.spaces.spec.js

@@ -15,7 +15,7 @@
  var Q = require('q');
  var _ = require('lodash');

-  describe('CF - Manage Organizations and Spaces', function () {
+  fdescribe('CF - Manage Organizations and Spaces', function () {


You've got an fdescribe - so all the tests bar 1 are being skipped - I think there are quite a few failures when you undo this.

richard-cox · 2017-09-05T16:07:58Z

...d-foundry/frontend/src/view/applications/application/services/service-card/service-card.html

+  <div class="service-catalogue-card">
+    <div class="service-catalogue-card__meta">
+      <div class="service-catalogue-card__meta-split">
+        <div class="service-catalogue-card__meta-left">


Think service-catalogue-card__meta-left needs some right padding... or right needs some left padding. Squishing the window leads to label and value right next to each other

richard-cox · 2017-09-05T16:14:08Z

components/cloud-foundry/frontend/src/view/applications/application/services/services.html

+  <bounce-spinner classes="bounce-spinner-sm"></bounce-spinner>
+</div>
+<div class="cluster-gallery-card-container">
+  <service-card class="cluster-gallery-card-parent" ng-repeat="service in boundServices = (applicationServicesCtrl.services | filter:applicationServicesCtrl.showInstance | filter:applicationServicesCtrl.search) track by service.metadata.guid"


The first and last service cards have respectively left and right padding. We don't show these on other card layouts. Squishing and expanding all works fine.

richard-cox · 2017-09-05T16:23:03Z

...d-foundry/frontend/src/view/applications/application/services/service-card/service-card.html

-          ng-if="serviceCardCtrl.allowAddOnly && serviceCardCtrl.numAttached > 0">
-          {{ serviceCardCtrl.numAttached }} <span translate>app.app-info.app-tabs.services.card.attached</span>
+        <div class="service-catalogue-card__meta-right">
+          {{ ::serviceCardCtrl.service.metadata.created_at | amDateFormat:'MMM Do YYYY HH:mm:ss' }}


Pass it through a filter titled 'momentDateFormat'. It'll use the L - LTS format with some magic to ensure it updates on change of locale.

richard-cox · 2017-09-05T16:34:25Z

components/cloud-foundry/frontend/src/view/applications/application/services/services.html

-    <service-card service="service" app="applicationServicesCtrl.appModel.application"
-      cnsi-guid="applicationServicesCtrl.cnsiGuid"></service-card>
-  </div>
+<div class="service-manage-message" ng-if="applicationServicesCtrl.managingType">You are currently viewing <b>{{::applicationServicesCtrl.managingType}}</b> instances. <a ng-click="applicationServicesCtrl.filterType = applicationServicesCtrl.ALL_FILTER">Click here</a> to view all types.</div>


Another one for translating. Will need to pull out the from the translation and pass in the type. So maybe something like..
<div translate translate-values"{{ applicationServicesCtrl }}">key1</div> <a translate>key2</a>

"key1": "You are currently viewing {managingType}. " "key2": "View all types"

richard-cox · 2017-09-05T16:37:31Z

components/cloud-foundry/frontend/src/view/applications/application/services/services.scss

@@ -11,3 +10,8 @@
  display: flex;
  align-items: stretch;
 }
+
+.service-manage-message {
+  margin-bottom: 19px;


can these be console-unit-size?

richard-cox · 2017-09-05T16:37:51Z

components/cloud-foundry/frontend/src/view/applications/application/services/services.scss

+
+.service-manage-message {
+  margin-bottom: 19px;
+  margin-left: 10px;


This should go if we lose the left/right padding from the edge cards

richard-cox · 2017-09-05T16:39:39Z

...ry/frontend/test/unit/view/applications/application/services/service-card.directive.spec1.js

@@ -0,0 +1,112 @@
+(function () {


Is this spec1 file needed?

richard-cox · 2017-09-05T16:40:56Z

components/cloud-foundry/frontend/test/e2e/applications.add-app.spec.js

@@ -264,56 +260,6 @@
          });
        });
      });
-
-      it('should contain the service that was created', function () {


It would be good to have both these e2e tests live in the new services world

nwmac · 2017-09-06T08:52:57Z

...ry/frontend/test/unit/view/applications/application/services/service-card.directive.spec1.js

+(function () {
+  'use strict';
+
+  fdescribe('service-card directive', function () {


* master: (33 commits) Updated post-flight script in response to feedback Add issue_template and cf push log docs Fix incorrect caching and reset behaviour of app wall filters - Ensure that when we reset dodgy cluster/org values we also reset org/space - Previously we were showing filter by 'all' for org/space but still applying filter containing valid org/space guid - Reset fixed by not entering dodgy state Fix create app commit button text Fix the title of the manage users dialog - When managing a single user the user's name was missing from the title - Ensure async task dialog also includes translate-values just like detail view Add readme for deploy/uaa Temporary fix for gulp-sourcemaps Two minor fixes - Ensure we clear any invlaid locale from local storage - Token expired warning now covers the entire endpoint dashboard table again Fix another typo Changes in response to feedback Rename cnap headers to cap (#1235) Add context labels to CI tasks Fix e2e #2 E2E fix Workaround for chome bug - Tripple click on endpoint dashboard endpoint url lead to selection of icon as well "https://api.10.84.93.96.nip.io:8443 Update helm chart to use mariaDB Fix unit tests Fix unit tests Undo helm changes, as these will be done in a different PR Add support for mysql ...

* master: Fix console-unit-tests Fix SQLite version table Ensure we check for missing test dependencies if running in localDevBuild

…s-tab

- Element tag ending - Translation for no service instances - Filter service instances by text - Spacing

richard-cox

LGTM. @nwmac I pushed one final commit, otherwise looks grand

nwmac

LGTM

KlapTrap added 24 commits August 22, 2017 14:22

Duplicate application service tab as a base for service catalogue

c2534d8

Add seperate cards for service catalogue and service tabs

bfdbd23

Fetch and display service instances on application service tab

82b8b41

Ensure both application service tab and service catalogue tab are usi…

71f836f

…ng the cirrect cards

Add relevent fields to services tab cards

a5512d1

Update service card and properly unbind service instance

ef6788d

Add all management command to the service instance tab

4b07049

Manage instance now restricts the instance page by service type

64a1b81

Fix binding filtering and rename service catalogue directives

f4ffbe3

Tidy up i18n and error messages in service and service catalogue pages

cb7e25b

Show friendly message when filtering instances via service catalogue …

bb1899a

…manage button

Changed the application Services tab to Service Instance

8b7e89e

Fixed application services filter clear link click handler

86e2fec

Add service count to app summary page and move detach from the action…

dbc37c4

…s menu

Changed app summary service count string to be inline with surroundin…

f3b934c

…g strings

Added a couple of comment to services module

c7d7d3c

Fixed service card test

f2713ad

Removed unused manage services module

c2385b5

Add/fix tests for service tabs

ca2191a

Comvert callback to promise

3ea4f3b

Merge branch 'master' into application-services-tab

c4953bf

* master: Ensure we wait for $translate onReady before initialising landing page language options

Fixed e2e tests

3c015d8

Merge branch 'master' into application-services-tab

b916f3c

* master: Pre-sort service instances in cloud foundry space instances table (#1233) Remove package-lock.json - to be added back in another pr Add sass source maps into the dev build of the frontend

Linting

6f0b4f6

KlapTrap added the ready for review label Aug 29, 2017

nwmac suggested changes Sep 5, 2017

View reviewed changes

richard-cox reviewed Sep 5, 2017

View reviewed changes

nwmac reviewed Sep 6, 2017

View reviewed changes

KlapTrap added 2 commits September 6, 2017 12:17

Fixed linting and unit tests

a2967dc

KlapTrap and others added 10 commits September 11, 2017 15:53

Translated all the things and fixed minor styling issues after PR review

f9c3fc4

Merge branch 'master' into application-services-tab

7875705

* master: Fix console-unit-tests Fix SQLite version table Ensure we check for missing test dependencies if running in localDevBuild

Fixed linting failures from master

6ca40e8

Merge remote-tracking branch 'origin/master' into application-service…

790df8e

…s-tab

Merge remote-tracking branch 'origin/master' into application-service…

1f6f744

…s-tab

Fix lint issues

1b8ff97

Merge remote-tracking branch 'origin/master' into application-service…

72f616e

…s-tab

Fixes for failing e2e tests

bf94e14

Fix localisation of catalogue

86463a7

Small fixes

666b54b

- Element tag ending - Translation for no service instances - Filter service instances by text - Spacing

richard-cox approved these changes Sep 15, 2017

View reviewed changes

nwmac approved these changes Sep 15, 2017

View reviewed changes

nwmac merged commit dd64569 into master Sep 15, 2017

irfanhabib deleted the application-services-tab branch November 22, 2017 14:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Application services tab #1237

Application services tab #1237

KlapTrap commented Aug 29, 2017

nwmac left a comment

nwmac Aug 30, 2017

nwmac Aug 30, 2017

nwmac Aug 30, 2017

nwmac Aug 30, 2017

richard-cox Sep 5, 2017

nwmac Aug 30, 2017

nwmac Aug 30, 2017

nwmac Aug 30, 2017

richard-cox Sep 5, 2017 •

edited

Loading

nwmac Aug 30, 2017

nwmac Sep 5, 2017

richard-cox Sep 5, 2017

richard-cox Sep 5, 2017

richard-cox Sep 5, 2017

richard-cox Sep 5, 2017

richard-cox Sep 5, 2017

richard-cox Sep 5, 2017

richard-cox Sep 5, 2017

richard-cox Sep 5, 2017

nwmac Sep 6, 2017

richard-cox left a comment

nwmac left a comment

Application services tab #1237

Application services tab #1237

Conversation

KlapTrap commented Aug 29, 2017

nwmac left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

richard-cox Sep 5, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

richard-cox left a comment

Choose a reason for hiding this comment

nwmac left a comment

Choose a reason for hiding this comment

richard-cox Sep 5, 2017 •

edited

Loading