From 5cfe8490e3a20d25b76f03dbe9b8c8980e65159b Mon Sep 17 00:00:00 2001 From: Emmanuel Darnis Date: Tue, 19 Sep 2017 12:02:48 +0100 Subject: [PATCH 01/25] Add button to redirect to external app to create account --- .../dashboard-apps-dock/dashboard-apps-dock.coffee | 8 ++++++++ .../dashboard-apps-dock/dashboard-apps-dock.html | 3 +++ .../dashboard-apps-dock/dashboard-apps-dock.less | 2 ++ 3 files changed, 13 insertions(+) diff --git a/src/app/components/dashboard-apps-dock/dashboard-apps-dock.coffee b/src/app/components/dashboard-apps-dock/dashboard-apps-dock.coffee index 7cd2ff2d..2d9bacc8 100644 --- a/src/app/components/dashboard-apps-dock/dashboard-apps-dock.coffee +++ b/src/app/components/dashboard-apps-dock/dashboard-apps-dock.coffee @@ -37,6 +37,9 @@ DashboardAppsDockCtrl = ($scope, $cookies, $uibModal, $window, MnoeOrganizations instance.stack == 'connector' && !instance.oauth_keys_valid + $scope.helper.isCreateAccountShown = (instance) -> + instance.stack == 'cloud' && !instance.is_linked + $scope.helper.isNewOfficeApp = (instance) -> instance.stack == 'connector' && instance.appNid == 'office-365' && (moment(instance.createdAt) > moment().subtract({minutes:5})) @@ -55,6 +58,11 @@ DashboardAppsDockCtrl = ($scope, $cookies, $uibModal, $window, MnoeOrganizations $window.open("/mnoe/launch/#{app.uid}", '_blank') return true + $scope.redirectToExternal = (app, event) -> + $scope.setActiveApp(event, app.id) + $window.open(app.account_creation_link, '_blank') + return true + $scope.setActiveApp = (event, app) -> if $scope.isActiveApp(app) $scope.activeApp = null diff --git a/src/app/components/dashboard-apps-dock/dashboard-apps-dock.html b/src/app/components/dashboard-apps-dock/dashboard-apps-dock.html index 16b3ae84..de50c850 100644 --- a/src/app/components/dashboard-apps-dock/dashboard-apps-dock.html +++ b/src/app/components/dashboard-apps-dock/dashboard-apps-dock.html @@ -9,6 +9,9 @@
+
+ {{ 'mno_enterprise.templates.components.app_install_btn.create_account' | translate }} +
{{ 'mno_enterprise.templates.impac.dock.launch' | translate }}
diff --git a/src/app/components/dashboard-apps-dock/dashboard-apps-dock.less b/src/app/components/dashboard-apps-dock/dashboard-apps-dock.less index acc11cd3..ff5fd05a 100755 --- a/src/app/components/dashboard-apps-dock/dashboard-apps-dock.less +++ b/src/app/components/dashboard-apps-dock/dashboard-apps-dock.less @@ -129,6 +129,8 @@ ul.dock { .menu-item { cursor: pointer; + white-space: nowrap; + &:hover { background-color: @mno-dock-sub-menu-hover; From 069ea8399d4f271c03ddbd3d355b24562cd53075 Mon Sep 17 00:00:00 2001 From: Emmanuel Darnis Date: Wed, 20 Sep 2017 14:56:48 +0100 Subject: [PATCH 02/25] Fetch setup form from mno enterprise --- .../dashboard-apps-dock.coffee | 30 ++++++++++++------- .../dashboard-apps-dock.html | 4 +-- .../mnoe-api/app-instances.svc.coffee | 3 ++ .../app-connect-modal-cloud.controller.coffee | 18 +++++++++++ .../apps/modals/app-connect-modal-cloud.html | 26 ++++++++++++++++ .../views/apps/modals/app-connect-modal.less | 4 +++ src/locales/en.json | 4 +++ 7 files changed, 76 insertions(+), 13 deletions(-) create mode 100644 src/app/views/apps/modals/app-connect-modal-cloud.controller.coffee create mode 100644 src/app/views/apps/modals/app-connect-modal-cloud.html diff --git a/src/app/components/dashboard-apps-dock/dashboard-apps-dock.coffee b/src/app/components/dashboard-apps-dock/dashboard-apps-dock.coffee index 2d9bacc8..7af38d89 100644 --- a/src/app/components/dashboard-apps-dock/dashboard-apps-dock.coffee +++ b/src/app/components/dashboard-apps-dock/dashboard-apps-dock.coffee @@ -33,9 +33,10 @@ DashboardAppsDockCtrl = ($scope, $cookies, $uibModal, $window, MnoeOrganizations $scope.helper.isNewOfficeApp(app) $scope.helper.isOauthConnectBtnShown = (instance) -> - instance.app_nid != 'office-365' && + (instance.app_nid != 'office-365' && instance.stack == 'connector' && - !instance.oauth_keys_valid + !instance.oauth_keys_valid) || + instance.stack == 'cloud' $scope.helper.isCreateAccountShown = (instance) -> instance.stack == 'cloud' && !instance.is_linked @@ -61,6 +62,7 @@ DashboardAppsDockCtrl = ($scope, $cookies, $uibModal, $window, MnoeOrganizations $scope.redirectToExternal = (app, event) -> $scope.setActiveApp(event, app.id) $window.open(app.account_creation_link, '_blank') + $scope.showConnectModal(app) return true $scope.setActiveApp = (event, app) -> @@ -95,16 +97,22 @@ DashboardAppsDockCtrl = ($scope, $cookies, $uibModal, $window, MnoeOrganizations # App Connect modal #==================================== $scope.showConnectModal = (app) -> - switch app.app_nid - when "xero" then modalInfo = { - template: "app/views/apps/modals/app-connect-modal-xero.html", - controller: 'DashboardAppConnectXeroModalCtrl' + if app.stack == 'cloud' + modalInfo = { + template: "app/views/apps/modals/app-connect-modal-cloud.html", + controller: 'DashboardAppConnectCloudModalCtrl' } - when "myob" then modalInfo = { - template: "app/views/apps/modals/app-connect-modal-myob.html", - controller: 'DashboardAppConnectMyobModalCtrl' - } - else $scope.helper.oAuthConnectPath(app) + else + switch app.app_nid + when "xero" then modalInfo = { + template: "app/views/apps/modals/app-connect-modal-xero.html", + controller: 'DashboardAppConnectXeroModalCtrl' + } + when "myob" then modalInfo = { + template: "app/views/apps/modals/app-connect-modal-myob.html", + controller: 'DashboardAppConnectMyobModalCtrl' + } + else $scope.helper.oAuthConnectPath(app) modalInstance = $uibModal.open( templateUrl: modalInfo.template diff --git a/src/app/components/dashboard-apps-dock/dashboard-apps-dock.html b/src/app/components/dashboard-apps-dock/dashboard-apps-dock.html index de50c850..a0dbfbc2 100644 --- a/src/app/components/dashboard-apps-dock/dashboard-apps-dock.html +++ b/src/app/components/dashboard-apps-dock/dashboard-apps-dock.html @@ -9,13 +9,13 @@
-
+
{{ 'mno_enterprise.templates.components.app_install_btn.create_account' | translate }}
{{ 'mno_enterprise.templates.impac.dock.launch' | translate }}
-
+
{{ 'mno_enterprise.templates.impac.dock.connect' | translate }}
diff --git a/src/app/components/mnoe-api/app-instances.svc.coffee b/src/app/components/mnoe-api/app-instances.svc.coffee index 88b142c1..c2067680 100644 --- a/src/app/components/mnoe-api/app-instances.svc.coffee +++ b/src/app/components/mnoe-api/app-instances.svc.coffee @@ -62,6 +62,9 @@ angular.module 'mnoEnterpriseAngular' Array.prototype.push.apply(_self.appInstances, arr) return _self.appInstances + @getForm = (instance) -> + MnoeApiSvc.one('organizations', MnoeOrganizations.selectedId).one('/app_instances', instance.app.id).one('/setup_form').get() + # Path to connect this app instance and redirect to the current page @oAuthConnectPath = (instance, extra_params = '') -> _self.clearCache() diff --git a/src/app/views/apps/modals/app-connect-modal-cloud.controller.coffee b/src/app/views/apps/modals/app-connect-modal-cloud.controller.coffee new file mode 100644 index 00000000..a6d261e4 --- /dev/null +++ b/src/app/views/apps/modals/app-connect-modal-cloud.controller.coffee @@ -0,0 +1,18 @@ +angular.module 'mnoEnterpriseAngular' + .controller('DashboardAppConnectCloudModalCtrl', ($scope, $uibModalInstance, app, MnoeAppInstances) -> + + $scope.app = app + + MnoeAppInstances.getForm(app: app) + .then((response) -> + $scope.schema = response.schema + $scope.form = response.form + ) + + $scope.model = {} + + $scope.close = -> + $uibModalInstance.close() + + return +) diff --git a/src/app/views/apps/modals/app-connect-modal-cloud.html b/src/app/views/apps/modals/app-connect-modal-cloud.html new file mode 100644 index 00000000..b150daea --- /dev/null +++ b/src/app/views/apps/modals/app-connect-modal-cloud.html @@ -0,0 +1,26 @@ +
+
+
×
+

+
+ + + +
+

{{"mno_enterprise.templates.dashboard.link_account.link" | translate:{ appname: app.app_name} }}

+
+ +
+ +
+ +
+ +
+
diff --git a/src/app/views/apps/modals/app-connect-modal.less b/src/app/views/apps/modals/app-connect-modal.less index f51b617f..024b940e 100644 --- a/src/app/views/apps/modals/app-connect-modal.less +++ b/src/app/views/apps/modals/app-connect-modal.less @@ -9,4 +9,8 @@ display: block; margin: auto; } + + ul.breadcrumb { + margin-bottom: 0px; + } } diff --git a/src/locales/en.json b/src/locales/en.json index 30f9de5f..35d899c5 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -1001,6 +1001,10 @@ "mno_enterprise.templates.dashboard.create_company.enter_address": "Enter an address for your new company", "mno_enterprise.templates.dashboard.create_company.cancel": "Cancel", "mno_enterprise.templates.dashboard.create_company.create": "Create", + "mno_enterprise.templates.dashboard.link_account.title": "Link your account", + "mno_enterprise.templates.dashboard.link_account.entities": "Select your entities", + "mno_enterprise.templates.dashboard.link_account.synchronize": "Start synchronizing", + "mno_enterprise.templates.dashboard.link_account.link": "Link your {appname} account to Maestrano to get your business in sync.", "mno_enterprise.templates.components.loading_lounge.redirecting_to_app": "Redirecting to %{appname}", "mno_enterprise.templates.components.loading_lounge.you_will_be_redirected_in": "You will be automatically redirected in %{counter}s (or click the link below)", "mno_enterprise.templates.components.loading_lounge.go_to_my_app": "Go to my app now!", From 5c788aee3c2851eb3e1e7dc3bcbf99a945e6d964 Mon Sep 17 00:00:00 2001 From: Emmanuel Darnis Date: Wed, 4 Oct 2017 15:40:03 +0100 Subject: [PATCH 03/25] Rules to show buttons for app instance --- .../dashboard-apps-dock/dashboard-apps-dock.coffee | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/components/dashboard-apps-dock/dashboard-apps-dock.coffee b/src/app/components/dashboard-apps-dock/dashboard-apps-dock.coffee index 7af38d89..e0c7e7ae 100644 --- a/src/app/components/dashboard-apps-dock/dashboard-apps-dock.coffee +++ b/src/app/components/dashboard-apps-dock/dashboard-apps-dock.coffee @@ -33,13 +33,13 @@ DashboardAppsDockCtrl = ($scope, $cookies, $uibModal, $window, MnoeOrganizations $scope.helper.isNewOfficeApp(app) $scope.helper.isOauthConnectBtnShown = (instance) -> - (instance.app_nid != 'office-365' && - instance.stack == 'connector' && - !instance.oauth_keys_valid) || - instance.stack == 'cloud' + (instance.app_nid != 'office-365' && instance.stack == 'connector' && !instance.oauth_keys_valid) || + (instance.add_on && instance.organization && !instance.organization.has_account_linked) $scope.helper.isCreateAccountShown = (instance) -> - instance.stack == 'cloud' && !instance.is_linked + instance.add_on && + instance.organization && + !instance.organization.has_account_linked $scope.helper.isNewOfficeApp = (instance) -> instance.stack == 'connector' && instance.appNid == 'office-365' && (moment(instance.createdAt) > moment().subtract({minutes:5})) @@ -61,7 +61,7 @@ DashboardAppsDockCtrl = ($scope, $cookies, $uibModal, $window, MnoeOrganizations $scope.redirectToExternal = (app, event) -> $scope.setActiveApp(event, app.id) - $window.open(app.account_creation_link, '_blank') + $window.open(app.organization.account_creation_link, '_blank') $scope.showConnectModal(app) return true From 41adc85eea3c6c749b70b49a82598b4a636b31f5 Mon Sep 17 00:00:00 2001 From: Emmanuel Darnis Date: Wed, 4 Oct 2017 15:45:31 +0100 Subject: [PATCH 04/25] Add modal to connect application --- .../mnoe-api/app-instances.svc.coffee | 19 ++- .../app-connect-modal-cloud.controller.coffee | 47 +++++++- .../apps/modals/app-connect-modal-cloud.html | 109 ++++++++++++++++-- .../views/apps/modals/app-connect-modal.less | 20 ++++ 4 files changed, 178 insertions(+), 17 deletions(-) diff --git a/src/app/components/mnoe-api/app-instances.svc.coffee b/src/app/components/mnoe-api/app-instances.svc.coffee index c2067680..1274df35 100644 --- a/src/app/components/mnoe-api/app-instances.svc.coffee +++ b/src/app/components/mnoe-api/app-instances.svc.coffee @@ -63,7 +63,24 @@ angular.module 'mnoEnterpriseAngular' return _self.appInstances @getForm = (instance) -> - MnoeApiSvc.one('organizations', MnoeOrganizations.selectedId).one('/app_instances', instance.app.id).one('/setup_form').get() + MnoeApiSvc.one('organizations', MnoeOrganizations.selectedId).one('/app_instances', instance.id).one('/setup_form').get() + + @submitForm = (instance, model) -> + body = {} + for key of model + if model.hasOwnProperty(key) + body[key] = model[key] + MnoeApiSvc.one('organizations', MnoeOrganizations.selectedId).one('/app_instances', instance.id).post('/create_omniauth', body) + + @getSyncs = (instance) -> + MnoeApiSvc.one('organizations', MnoeOrganizations.selectedId).one('/app_instances', instance.id).one('/sync_history').get() + + @disconnect = (instance) -> + MnoeApiSvc.one('organizations', MnoeOrganizations.selectedId).one('/app_instances', instance.id).one('/disconnect').post() + + @sync = (instance, fullSync) -> + body = {full_sync: fullSync} + MnoeApiSvc.one('organizations', MnoeOrganizations.selectedId).one('/app_instances', instance.id).post('/sync', body) # Path to connect this app instance and redirect to the current page @oAuthConnectPath = (instance, extra_params = '') -> diff --git a/src/app/views/apps/modals/app-connect-modal-cloud.controller.coffee b/src/app/views/apps/modals/app-connect-modal-cloud.controller.coffee index a6d261e4..89277288 100644 --- a/src/app/views/apps/modals/app-connect-modal-cloud.controller.coffee +++ b/src/app/views/apps/modals/app-connect-modal-cloud.controller.coffee @@ -1,18 +1,57 @@ angular.module 'mnoEnterpriseAngular' - .controller('DashboardAppConnectCloudModalCtrl', ($scope, $uibModalInstance, app, MnoeAppInstances) -> + .controller('DashboardAppConnectCloudModalCtrl', ($scope, $uibModalInstance, app, MnoeAppInstances, toastr) -> $scope.app = app + $scope.model = {} + $scope.hasLinked = false + $scope.hasChosenEntities = false + $scope.historicalData = false + $scope.isFormLoading = true + $scope.isSubmitting = false - MnoeAppInstances.getForm(app: app) + MnoeAppInstances.getForm(app) .then((response) -> $scope.schema = response.schema - $scope.form = response.form + $scope.form = [ "*" ] + $scope.isFormLoading = false ) - $scope.model = {} + $scope.getDate = -> + moment.locale('en') + moment().format("dddd, MMMM Do YYYY, h:mm:ss a") + + $scope.historicalDataDisplay = -> + if document.getElementById('historical-data').checked + document.getElementById('historical-data-display-checked').style.display = 'block' + document.getElementById('historical-data-display-unchecked').style.display = 'none' + else + document.getElementById('historical-data-display-unchecked').style.display = 'block' + document.getElementById('historical-data-display-checked').style.display = 'none' $scope.close = -> $uibModalInstance.close() + + $scope.submit = (form) -> + $scope.isSubmitting = true + MnoeAppInstances.submitForm($scope.app, $scope.model) + .then((response) -> + if response.error + toastr.error(response.error) + else + $scope.app.organization.has_account_linked = true + $scope.hasLinked = true + $scope.isSubmitting = false + ) + + $scope.update = (entities) -> + $scope.hasChosenEntities = true + + $scope.synchronize = (historicalData) -> + MnoeAppInstances.sync($scope.app, historicalData) + .then((response) -> + $uibModalInstance.close() + toastr.success("Congratulations, your data is now being synced!") + ) return ) diff --git a/src/app/views/apps/modals/app-connect-modal-cloud.html b/src/app/views/apps/modals/app-connect-modal-cloud.html index b150daea..d8d99429 100644 --- a/src/app/views/apps/modals/app-connect-modal-cloud.html +++ b/src/app/views/apps/modals/app-connect-modal-cloud.html @@ -6,18 +6,103 @@ translate-values="{appname: app.name}">
- - -
-

{{"mno_enterprise.templates.dashboard.link_account.link" | translate:{ appname: app.app_name} }}

-
- -
- + +
+ + +
+

{{"mno_enterprise.templates.dashboard.link_account.link" | translate:{ appname: app.app_name} }}

+
+ +
+ + + +
+
+
+ + +
+ + +
+

Chose which entities you want to synchronize

+ + + + + + + + + + + + +
Entity From Connec™ to Neto From Neto to Connec™ 
{{entity.connec_name}} 
+ + + +
+ +
+
+ + +
+ + +
+

Chose wether to synchronize historical data

+ +
+

+ All data created prior to the date you linked Neto will be synchronized both ways +

+

+ It means that: +
+ - all data from applications you already have linked to the platform will be sent to your Neto account +
+ - all exisiting data from Neto will be sent to your other applications +
+

+

+ If you have been manually copying records in multiple applications, you risk seeing duplicates arising! +

+

+ This action cannot be undone at any time! +

+ Synchronize my historical data:  + + Only data created after {{getDate()}} will be synchronized + + +
+ + + +
+ +
diff --git a/src/app/views/apps/modals/app-connect-modal.less b/src/app/views/apps/modals/app-connect-modal.less index 024b940e..4feb2573 100644 --- a/src/app/views/apps/modals/app-connect-modal.less +++ b/src/app/views/apps/modals/app-connect-modal.less @@ -13,4 +13,24 @@ ul.breadcrumb { margin-bottom: 0px; } + + table { + border:none; + border-collapse: collapse; + margin-top: 30px; + margin-bottom: 30px; + } + + td, th { + padding-top: 3px; + padding-left: 5px; + } + + th { + padding-bottom: 5px; + } + + tr:nth-child(even){ + background-color: #ececec; + } } From 1d791df585c04d52ab58caf122661ed79a18b8e0 Mon Sep 17 00:00:00 2001 From: Emmanuel Darnis Date: Wed, 4 Oct 2017 16:33:19 +0100 Subject: [PATCH 05/25] Update modal to display addon-information --- .../apps/modals/app-settings-modal.coffee | 51 +++++++++++- .../views/apps/modals/app-settings-modal.html | 50 +++++++++++- .../views/apps/modals/app-settings-modal.less | 81 +++++++++++++++++++ 3 files changed, 178 insertions(+), 4 deletions(-) diff --git a/src/app/views/apps/modals/app-settings-modal.coffee b/src/app/views/apps/modals/app-settings-modal.coffee index c6b32029..74725fdf 100755 --- a/src/app/views/apps/modals/app-settings-modal.coffee +++ b/src/app/views/apps/modals/app-settings-modal.coffee @@ -1,11 +1,21 @@ angular.module 'mnoEnterpriseAngular' - .controller('DashboardAppSettingsModalCtrl', ($scope, MnoConfirm, MnoeOrganizations, $uibModalInstance, MnoeAppInstances, Utilities, app, $window, ImpacMainSvc, $translate, AppSettingsHelper)-> + .controller('DashboardAppSettingsModalCtrl', ($scope, MnoConfirm, MnoeOrganizations, $uibModalInstance, MnoeAppInstances, Utilities, app, $window, ImpacMainSvc, toastr, $translate, AppSettingsHelper)-> $scope.modal ||= {} $scope.app = app $scope.sentence = "Please proceed to the deletion of my app and all data it contains" $scope.organization_uid = ImpacMainSvc.config.currentOrganization.uid + $scope.isLoadingSyncs = true + $scope.isDisconnecting = false + $scope.syncs = [] + + MnoeAppInstances.getSyncs($scope.app) + .then((response) -> + for i in [0...response.length] + $scope.syncs.push response[i].attributes + $scope.isLoadingSyncs = false + ) # ---------------------------------------------------------- # Initialize deletion sentence @@ -54,13 +64,14 @@ angular.module 'mnoEnterpriseAngular' false $scope.helper.isAddOnSettingShown = (app) -> - AppSettingsHelper.isAddOnSettingShown(app) + AppSettingsHelper.isAddOnSettingShown(app) && + app.organization && + app.organization.has_account_linked $scope.helper.addOnSettingLauch = (app) -> AppSettingsHelper.addOnSettingLauch(app) $scope.helper.dataDisconnectClick = (app) -> - modalOptions = closeButtonText: 'Cancel' actionButtonText: 'Disconnect app' @@ -72,4 +83,38 @@ angular.module 'mnoEnterpriseAngular' MnoeAppInstances.clearCache() $window.location.href = "/mnoe/webhook/oauth/#{app.uid}/disconnect" ) + + $scope.loadSyncs = -> + $scope.isLoadingSyncs = true + $scope.syncs = [] + MnoeAppInstances.getSyncs($scope.app) + .then((response) -> + for i in [0...response.length] + $scope.syncs.push response[i].attributes + $scope.isLoadingSyncs = false + ) + + $scope.disconnect = -> + $scope.isDisconnecting = true + MnoeAppInstances.disconnect(app) + .then((response) -> + app.organization.has_account_linked = false + $uibModalInstance.close() + toastr.success("Your application has been disconnected") + $scope.isDisconnecting = false + ) + + $scope.switchTab = (indexActive) -> + activeTab = "tab" + indexActive + document.getElementById("tab" + indexActive).classList.add("active") + document.getElementById("head" + indexActive).classList.add("active") + for i in [0..1] + document.getElementById("tab" + ((indexActive + i) % 3 + 1)).classList.remove("active") + document.getElementById("head" + ((indexActive + i) % 3 + 1)).classList.remove("active") + switch indexActive + when 1 then $scope.loadSyncs() + when 2 then $scope.loadSyncs() + + return + ) diff --git a/src/app/views/apps/modals/app-settings-modal.html b/src/app/views/apps/modals/app-settings-modal.html index ecc2b915..d53b8621 100755 --- a/src/app/views/apps/modals/app-settings-modal.html +++ b/src/app/views/apps/modals/app-settings-modal.html @@ -16,7 +16,52 @@

{{ 'mno_enterprise.templates.impac.dock.settings.settings' | translate }}
- +
+ + +
+
+

List of previous synchronizations:

+ + + + + + + + + + + + +
DateStatusMessage
{{sync.updated_at}} {{sync.status}} {{sync.message | truncate:40}} 
+
+ +
+
+ +
+ + + + + + + + + + + +
Entity From Connec™ to Neto From Neto to Connec™ 
{{entity.connec_name}} 
+ + +
+
+
@@ -50,6 +95,9 @@

{{ 'mno_enterprise.templates.impac.dock.settings.settings' | translate }}
+

{{ 'mno_enterprise.templates.impac.dock.settings.confirm_app_deletion' | translate }}

diff --git a/src/app/views/apps/modals/app-settings-modal.less b/src/app/views/apps/modals/app-settings-modal.less index 20888566..6ae5e297 100644 --- a/src/app/views/apps/modals/app-settings-modal.less +++ b/src/app/views/apps/modals/app-settings-modal.less @@ -60,5 +60,86 @@ color: @deletion-sentence-color; } } + + /*----- Tabs -----*/ + .tabs { + width:100%; + display:inline-block; + } + + /*----- Tab Links -----*/ + /* Clearfix */ + .tab-links:after { + display:block; + clear:both; + content:''; + } + + .tab-links li { + margin:0px 5px; + float:left; + list-style:none; + } + + .tab-links a { + padding:9px 15px; + display:inline-block; + border-radius:3px 3px 0px 0px; + background:#e8e8e8;; + font-size:16px; + font-weight:600; + color:#4c4c4c; + transition:all linear 0.15s; + } + + .tab-links a:hover { + background:#a7cce5; + text-decoration:none; + } + + li.active a, li.active a:hover { + background:#adadad; + color:#4c4c4c; + } + + /*----- Content of Tabs -----*/ + .tab-content { + padding:15px; + border-radius:3px; + background:#fff; + } + + .tab { + display:none; + } + + .tab.active { + display:block; + } + + table { + border:none; + border-collapse: collapse; + margin-bottom: 30px; + } + + td, th { + padding-top: 3px; + padding-left: 5px; + } + + td.td-sync { + padding-top: 10px; + padding-left: 5px; + padding-bottom: 10px; + } + + th { + padding-bottom: 5px; + } + + tr:nth-child(even){ + background-color: #ececec; + } } } From 077def17fdcb28923ee85f91f91603cb2c7652fa Mon Sep 17 00:00:00 2001 From: Emmanuel Darnis Date: Mon, 16 Oct 2017 17:09:06 +0100 Subject: [PATCH 06/25] Code review --- .../dashboard-apps-dock.coffee | 14 +++--- .../dashboard-apps-dock.html | 8 +-- .../dashboard-apps-dock.less | 3 +- .../mnoe-api/app-instances.svc.coffee | 24 +++++---- .../app-connect-modal-cloud.controller.coffee | 49 ++++++++++++------- .../apps/modals/app-connect-modal-cloud.html | 33 +++++-------- .../views/apps/modals/app-connect-modal.less | 20 -------- .../apps/modals/app-settings-modal.coffee | 5 +- 8 files changed, 71 insertions(+), 85 deletions(-) diff --git a/src/app/components/dashboard-apps-dock/dashboard-apps-dock.coffee b/src/app/components/dashboard-apps-dock/dashboard-apps-dock.coffee index e0c7e7ae..8c681213 100644 --- a/src/app/components/dashboard-apps-dock/dashboard-apps-dock.coffee +++ b/src/app/components/dashboard-apps-dock/dashboard-apps-dock.coffee @@ -33,13 +33,15 @@ DashboardAppsDockCtrl = ($scope, $cookies, $uibModal, $window, MnoeOrganizations $scope.helper.isNewOfficeApp(app) $scope.helper.isOauthConnectBtnShown = (instance) -> - (instance.app_nid != 'office-365' && instance.stack == 'connector' && !instance.oauth_keys_valid) || - (instance.add_on && instance.organization && !instance.organization.has_account_linked) + (instance.app_nid != 'office-365' && + instance.stack == 'connector' && + !instance.oauth_keys_valid) || + ($scope.helper.isCreateAccountShown && + !instance.addon_organization.sync_enabled) $scope.helper.isCreateAccountShown = (instance) -> - instance.add_on && - instance.organization && - !instance.organization.has_account_linked + MnoeAppInstances.isAddOnWithOrg(instance) && + !instance.addon_organization.has_account_linked $scope.helper.isNewOfficeApp = (instance) -> instance.stack == 'connector' && instance.appNid == 'office-365' && (moment(instance.createdAt) > moment().subtract({minutes:5})) @@ -61,7 +63,7 @@ DashboardAppsDockCtrl = ($scope, $cookies, $uibModal, $window, MnoeOrganizations $scope.redirectToExternal = (app, event) -> $scope.setActiveApp(event, app.id) - $window.open(app.organization.account_creation_link, '_blank') + $window.open(app.addon_organization.account_creation_link, '_blank') $scope.showConnectModal(app) return true diff --git a/src/app/components/dashboard-apps-dock/dashboard-apps-dock.html b/src/app/components/dashboard-apps-dock/dashboard-apps-dock.html index a0dbfbc2..d8493b9d 100644 --- a/src/app/components/dashboard-apps-dock/dashboard-apps-dock.html +++ b/src/app/components/dashboard-apps-dock/dashboard-apps-dock.html @@ -9,17 +9,17 @@
-
+
{{ 'mno_enterprise.templates.components.app_install_btn.create_account' | translate }}
-
+
{{ 'mno_enterprise.templates.impac.dock.launch' | translate }}
-
+
{{ 'mno_enterprise.templates.impac.dock.connect' | translate }}
-
+
{{ 'mno_enterprise.templates.impac.dock.settings.settings' | translate }}
diff --git a/src/app/components/dashboard-apps-dock/dashboard-apps-dock.less b/src/app/components/dashboard-apps-dock/dashboard-apps-dock.less index ff5fd05a..1c844878 100755 --- a/src/app/components/dashboard-apps-dock/dashboard-apps-dock.less +++ b/src/app/components/dashboard-apps-dock/dashboard-apps-dock.less @@ -4,7 +4,7 @@ top: 0; right: 0; text-align: center; - + .top-right-corner { line-height: 0; margin-right: -10px; @@ -128,7 +128,6 @@ ul.dock { .box-shadow(@mno-dock-sub-menu-box-shadow); .menu-item { cursor: pointer; - white-space: nowrap; &:hover { diff --git a/src/app/components/mnoe-api/app-instances.svc.coffee b/src/app/components/mnoe-api/app-instances.svc.coffee index 1274df35..442e7ea1 100644 --- a/src/app/components/mnoe-api/app-instances.svc.coffee +++ b/src/app/components/mnoe-api/app-instances.svc.coffee @@ -1,5 +1,5 @@ angular.module 'mnoEnterpriseAngular' - .service 'MnoeAppInstances', ($q, MnoeApiSvc, MnoeOrganizations, MnoLocalStorage, MnoeCurrentUser, LOCALSTORAGE) -> + .service 'MnoeAppInstances', ($q, MnoeApiSvc, MnoeFullApiSvc, MnoeOrganizations, MnoLocalStorage, MnoeCurrentUser, LOCALSTORAGE) -> _self = @ # Store selected organization app instances @@ -32,6 +32,12 @@ angular.module 'mnoEnterpriseAngular' _self.emptyAppInstances() fetchAppInstances() + # Return true if the app from the app_instance parameter is an add_on, + # and we managed to retrieve the organization from the connector + @isAddOnWithOrg = (instance) -> + instance.add_on && + instance.addon_organization + # Retrieve app instances from the backend fetchAppInstances = -> # Workaround as the API is not standard (return a hash map not an array) @@ -63,22 +69,22 @@ angular.module 'mnoEnterpriseAngular' return _self.appInstances @getForm = (instance) -> - MnoeApiSvc.one('organizations', MnoeOrganizations.selectedId).one('/app_instances', instance.id).one('/setup_form').get() + MnoeApiSvc.one('organizations', MnoeOrganizations.selectedId).one('/app_instances', instance.id).doGET('/setup_form') @submitForm = (instance, model) -> - body = {} + data = {} for key of model if model.hasOwnProperty(key) - body[key] = model[key] - MnoeApiSvc.one('organizations', MnoeOrganizations.selectedId).one('/app_instances', instance.id).post('/create_omniauth', body) + data[key] = model[key] + MnoeApiSvc.one('organizations', MnoeOrganizations.selectedId).one('/app_instances', instance.id).post('/create_omniauth', data) - @getSyncs = (instance) -> - MnoeApiSvc.one('organizations', MnoeOrganizations.selectedId).one('/app_instances', instance.id).one('/sync_history').get() + @getSyncs = (instance, params) -> + MnoeFullApiSvc.one('organizations', MnoeOrganizations.selectedId).one('/app_instances', instance.id).doGET('/sync_history', params) @disconnect = (instance) -> - MnoeApiSvc.one('organizations', MnoeOrganizations.selectedId).one('/app_instances', instance.id).one('/disconnect').post() + MnoeApiSvc.one('organizations', MnoeOrganizations.selectedId).one('/app_instances', instance.id).post('/disconnect') - @sync = (instance, fullSync) -> + @sync = (instance, fullSync = false) -> body = {full_sync: fullSync} MnoeApiSvc.one('organizations', MnoeOrganizations.selectedId).one('/app_instances', instance.id).post('/sync', body) diff --git a/src/app/views/apps/modals/app-connect-modal-cloud.controller.coffee b/src/app/views/apps/modals/app-connect-modal-cloud.controller.coffee index 89277288..bee998af 100644 --- a/src/app/views/apps/modals/app-connect-modal-cloud.controller.coffee +++ b/src/app/views/apps/modals/app-connect-modal-cloud.controller.coffee @@ -3,11 +3,13 @@ angular.module 'mnoEnterpriseAngular' $scope.app = app $scope.model = {} - $scope.hasLinked = false + $scope.hasLinked = app.addon_organization.has_account_linked $scope.hasChosenEntities = false $scope.historicalData = false $scope.isFormLoading = true $scope.isSubmitting = false + $scope.historicalData = false + $scope.date = new Date() MnoeAppInstances.getForm(app) .then((response) -> @@ -16,18 +18,6 @@ angular.module 'mnoEnterpriseAngular' $scope.isFormLoading = false ) - $scope.getDate = -> - moment.locale('en') - moment().format("dddd, MMMM Do YYYY, h:mm:ss a") - - $scope.historicalDataDisplay = -> - if document.getElementById('historical-data').checked - document.getElementById('historical-data-display-checked').style.display = 'block' - document.getElementById('historical-data-display-unchecked').style.display = 'none' - else - document.getElementById('historical-data-display-unchecked').style.display = 'block' - document.getElementById('historical-data-display-checked').style.display = 'none' - $scope.close = -> $uibModalInstance.close() @@ -38,20 +28,41 @@ angular.module 'mnoEnterpriseAngular' if response.error toastr.error(response.error) else - $scope.app.organization.has_account_linked = true + $scope.app.addon_organization.has_account_linked = true $scope.hasLinked = true $scope.isSubmitting = false ) + $scope.unselectEntities = -> + $scope.hasChosenEntities = false + + $scope.forceSelectEntities = -> + $scope.hasChosenEntities = true + $scope.update = (entities) -> $scope.hasChosenEntities = true $scope.synchronize = (historicalData) -> MnoeAppInstances.sync($scope.app, historicalData) - .then((response) -> - $uibModalInstance.close() - toastr.success("Congratulations, your data is now being synced!") - ) - + $scope.app.addon_organization.sync_enabled = true + $uibModalInstance.close() + toastr.success("Congratulations, your data is now being synced!") + + $scope.titleForButton = -> + if !$scope.hasLinked + "Submit" + else if !$scope.hasChosenEntities + "Update" + else + "Start synchronizing" + + $scope.callToAction = (connectForm, historicalData)-> + if !$scope.hasLinked + $scope.submit(connectForm) + else if !$scope.hasChosenEntities + $scope.update(app.addon_organization.synchronized_entities) + else + $scope.synchronize(historicalData) + return ) diff --git a/src/app/views/apps/modals/app-connect-modal-cloud.html b/src/app/views/apps/modals/app-connect-modal-cloud.html index d8d99429..4663ee9d 100644 --- a/src/app/views/apps/modals/app-connect-modal-cloud.html +++ b/src/app/views/apps/modals/app-connect-modal-cloud.html @@ -19,13 +19,8 @@

{{"mno_enterprise.templates.dashboard.link_account.link"
- -

@@ -34,29 +29,24 @@

{{"mno_enterprise.templates.dashboard.link_account.link"

Chose which entities you want to synchronize

- +
- +
Entity  From Connec™ to Neto  From Neto to Connec™ 
{{entity.connec_name}} 
- - - -
-

@@ -64,7 +54,7 @@

Chose which entities you want to synchronize

@@ -90,22 +80,21 @@

Chose wether to synchronize historical data

This action cannot be undone at any time!

Synchronize my historical data:  - - Only data created after {{getDate()}} will be synchronized + + Only data created after {{date | amDateFormat:'dddd, MMMM Do YYYY, h:mm:ss a'}} will be synchronized -