diff --git a/src/app/components/dashboard-company-deletion/dashboard-company-deletion.coffee b/src/app/components/dashboard-company-deletion/dashboard-company-deletion.coffee new file mode 100644 index 00000000..64a72299 --- /dev/null +++ b/src/app/components/dashboard-company-deletion/dashboard-company-deletion.coffee @@ -0,0 +1,21 @@ +angular.module 'mnoEnterpriseAngular' + .component('dashboardCompanyDeletion', { + restrict: 'EA' + templateUrl: 'app/components/dashboard-company-deletion/dashboard-company-deletion.html', + controllerAs: "DashboardCompanyDeletionCtrl" + controller: ($uibModal, MnoeCurrentUser, MnoeOrganizations, MnoeAppInstances, MnoConfirm) -> + vm = this + vm.isDeletionOpen = false + + vm.proceed = (reason, password) -> + MnoeOrganizations.freeze(reason, password) + + vm.requestDeletion = () -> + modalInstance = $uibModal.open( + component: "dashboardDeletionConfirm", + size: "lg", + resolve: + actionCb: () -> vm.proceed + ) + return + }) diff --git a/src/app/components/dashboard-company-deletion/dashboard-company-deletion.html b/src/app/components/dashboard-company-deletion/dashboard-company-deletion.html new file mode 100644 index 00000000..5f7cf69d --- /dev/null +++ b/src/app/components/dashboard-company-deletion/dashboard-company-deletion.html @@ -0,0 +1,11 @@ +
+
+
+ {{ 'mno_enterprise.templates.dashboard.organization.settings.deletion.company_deletion' | translate }} +
+
+ +
+
diff --git a/src/app/components/dashboard-company-selectbox/dashboard-company-selectbox.coffee b/src/app/components/dashboard-company-selectbox/dashboard-company-selectbox.coffee index e8f127ef..626dad59 100644 --- a/src/app/components/dashboard-company-selectbox/dashboard-company-selectbox.coffee +++ b/src/app/components/dashboard-company-selectbox/dashboard-company-selectbox.coffee @@ -23,7 +23,9 @@ DashboardCompanySelectboxCtrl = ($scope, $state, $stateParams, $uibModal, MnoeCu # Switch to selected company MnoeAppInstances.emptyAppInstances() MnoeAppInstances.clearCache() - MnoeOrganizations.get(organization.id) + MnoeOrganizations.get(organization.id).then((org) -> + $state.go('home.company') unless org.organization.active + ) selectBox.close() selectOrganization = -> diff --git a/src/app/components/dashboard-deletion-confirm/dashboard-deletion-confirm.coffee b/src/app/components/dashboard-deletion-confirm/dashboard-deletion-confirm.coffee new file mode 100644 index 00000000..8e03adcb --- /dev/null +++ b/src/app/components/dashboard-deletion-confirm/dashboard-deletion-confirm.coffee @@ -0,0 +1,33 @@ +angular.module 'mnoEnterpriseAngular' + .component('dashboardDeletionConfirm', { + templateUrl: 'app/components/dashboard-deletion-confirm/dashboard-deletion-confirm.html', + bindings: { + resolve: '<' + close: '&' + dismiss: '&' + } + controller: ($log, $state, toastr) -> + ctrl = this + ctrl.password = "" + ctrl.delReasons = "" + ctrl.isLoading = false + + ctrl.cancel = () -> + ctrl.dismiss({$value: "cancel"}) + + ctrl.ok = () -> + ctrl.isLoading = true + + # Launch Cb + ctrl.resolve.actionCb(ctrl.delReasons, ctrl.password).then( + (response) -> + toastr.success('mno_enterprise.templates.dashboard.organization.settings.deletion.toastr_success') + # Reload the state to block access to Impac!, marketplace, ... + $state.reload() + ctrl.close(response) + (errors) -> + $log.error(errors) + toastr.error(errors.statusText, "mno_enterprise.templates.dashboard.organization.settings.deletion.toastr_error") + ).finally(-> ctrl.isLoading = false) + return + }) diff --git a/src/app/components/dashboard-deletion-confirm/dashboard-deletion-confirm.html b/src/app/components/dashboard-deletion-confirm/dashboard-deletion-confirm.html new file mode 100644 index 00000000..bc76e029 --- /dev/null +++ b/src/app/components/dashboard-deletion-confirm/dashboard-deletion-confirm.html @@ -0,0 +1,22 @@ +
+
+
+ + +
+
+ + +
+
+
+ + +
diff --git a/src/app/components/dashboard-menu/dashboard-menu.controller.coffee b/src/app/components/dashboard-menu/dashboard-menu.controller.coffee index 0f378150..0f85a31d 100644 --- a/src/app/components/dashboard-menu/dashboard-menu.controller.coffee +++ b/src/app/components/dashboard-menu/dashboard-menu.controller.coffee @@ -20,6 +20,7 @@ angular.module 'mnoEnterpriseAngular' MnoeCurrentUser.get().then( (response) -> selectedOrg = _.find(response.organizations, {id: newValue}) + $scope.isCompanyActive = selectedOrg.active $scope.isAdmin = MnoeOrganizations.role.atLeastAdmin(selectedOrg.current_user_role) ) if newValue? ) diff --git a/src/app/components/dashboard-menu/dashboard-menu.html b/src/app/components/dashboard-menu/dashboard-menu.html index 9e91e5b0..882e3afe 100644 --- a/src/app/components/dashboard-menu/dashboard-menu.html +++ b/src/app/components/dashboard-menu/dashboard-menu.html @@ -17,18 +17,19 @@ -
  • - {{ 'mno_enterprise.templates.dashboard.menu.dashboard' | translate }} + +
  • + {{ 'mno_enterprise.templates.dashboard.menu.dashboard' | translate }}
    • -
  • +
  • {{ 'mno_enterprise.templates.dashboard.menu.dashboard' | translate }}
    • -
  • +
  • {{ 'mno_enterprise.templates.dashboard.menu.impac' | translate }}
    • -
  • +
  • {{ 'mno_enterprise.templates.dashboard.menu.dashboard' | translate }}
    • @@ -40,11 +41,11 @@ {{ 'mno_enterprise.templates.dashboard.menu.company' | translate }} -
  • +
  • {{ 'mno_enterprise.templates.dashboard.menu.subscriptions' | translate }}
    • -
  • +
  • {{ 'mno_enterprise.templates.dashboard.menu.marketplace' | translate }}
    • @@ -66,17 +67,17 @@
    - +
    {{ 'mno_enterprise.templates.dashboard.menu.dashboard' | translate }}
     - +
    {{ 'mno_enterprise.templates.dashboard.menu.dashboard' | translate }}
     - +
    {{ 'mno_enterprise.templates.dashboard.menu.impac' | translate }}
     @@ -91,12 +92,12 @@ - +
    {{ 'mno_enterprise.templates.dashboard.menu.subscriptions' | translate }}
     - +
    {{ 'mno_enterprise.templates.dashboard.menu.marketplace' | translate }}
     diff --git a/src/app/components/mnoe-api/organizations.svc.coffee b/src/app/components/mnoe-api/organizations.svc.coffee index b672d117..65b72df9 100644 --- a/src/app/components/mnoe-api/organizations.svc.coffee +++ b/src/app/components/mnoe-api/organizations.svc.coffee @@ -178,6 +178,23 @@ angular.module 'mnoEnterpriseAngular' return defer.promise + @freeze = (reason, password) -> + MnoeApiSvc.one('organizations', _self.selectedId).doPOST({reason: reason, password: password}, 'freeze').then((response) -> + # Reload the current user with the updated organization + MnoeCurrentUser.refresh().then( -> + # If everything wennt well, update the active flag + _self.selected.organization.active = false + response + ) + ) + + @companyActiveRequired = () -> + if _self.selected + $state.go('home.company') unless _self.selected.organization.active + else + _self.getCurrentOrganisation().then((org) -> + $state.go('home.company') unless org.organization.active + ) #====================================== # User Role #====================================== diff --git a/src/app/index.route.coffee b/src/app/index.route.coffee index 93aecce1..0ab249bb 100644 --- a/src/app/index.route.coffee +++ b/src/app/index.route.coffee @@ -45,6 +45,9 @@ angular.module 'mnoEnterpriseAngular' url: '/apps' templateUrl: 'app/views/apps/dashboard-apps-list.html' controller: 'DashboardAppsListCtrl' + resolve: + companyActiveRequired: (MnoeOrganizations) -> + MnoeOrganizations.companyActiveRequired() .state 'home.impac', data: pageTitle:'Impac' @@ -52,6 +55,9 @@ angular.module 'mnoEnterpriseAngular' templateUrl: 'app/views/impac/impac.html' controller: 'ImpacController' controllerAs: 'vm' + resolve: + companyActiveRequired: (MnoeOrganizations) -> + MnoeOrganizations.companyActiveRequired() .state 'home.account', data: pageTitle:'Account' @@ -97,6 +103,8 @@ angular.module 'mnoEnterpriseAngular' resolve: loginRequired: (MnoeCurrentUser) -> MnoeCurrentUser.loginRequired() + companyActiveRequired: (MnoeOrganizations) -> + MnoeOrganizations.companyActiveRequired() .state 'onboarding.step1', data: pageTitle:'Welcome' @@ -128,6 +136,9 @@ angular.module 'mnoEnterpriseAngular' templateUrl: 'app/views/marketplace/marketplace.html' controller: 'DashboardMarketplaceCtrl' controllerAs: 'vm' + resolve: + companyActiveRequired: (MnoeOrganizations) -> + MnoeOrganizations.companyActiveRequired() .state 'home.marketplace.app', data: pageTitle:'Marketplace' diff --git a/src/app/views/company/company.controller.coffee b/src/app/views/company/company.controller.coffee index a9635b60..c02a9d8a 100644 --- a/src/app/views/company/company.controller.coffee +++ b/src/app/views/company/company.controller.coffee @@ -14,6 +14,7 @@ angular.module 'mnoEnterpriseAngular' #==================================== vm.initialize = -> vm.isLoading = false + vm.isCompanyActive = MnoeOrganizations.getSelected().organization.active if vm.isBillingShown() vm.activeTab = 'billing' else diff --git a/src/app/views/company/company.html b/src/app/views/company/company.html index eb767a11..d0effa4e 100644 --- a/src/app/views/company/company.html +++ b/src/app/views/company/company.html @@ -90,7 +90,7 @@

    {{ 'mno_enterprise.templates.dashboard.organization.in -
    +
    {{ 'mno_enterprise.templates.dashboard.organization.index.members.title' | translate }}
    @@ -106,7 +106,7 @@

    {{ 'mno_enterprise.templates.dashboard.organization.in -
    +
    {{ 'mno_enterprise.templates.dashboard.organization.index.teams.title' | translate }}
    @@ -127,7 +127,7 @@

    -
    +
    {{ 'mno_enterprise.templates.dashboard.organization.index.audit_log.title' | translate }}
    @@ -143,7 +143,7 @@

    -
    +
    {{ 'mno_enterprise.templates.dashboard.organization.index.settings.title' | translate }}
    @@ -152,9 +152,10 @@

    - - + +

    +
    diff --git a/src/locales/en.json b/src/locales/en.json index f4bb6b2e..6be0fc86 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -656,6 +656,15 @@ "mno_enterprise.templates.dashboard.organization.settings.disable": "Off", "mno_enterprise.templates.dashboard.organization.settings.cancel": "Cancel", "mno_enterprise.templates.dashboard.organization.settings.save": "Save", + "mno_enterprise.templates.dashboard.organization.settings.deletion.company_deletion": "Company deletion", + "mno_enterprise.templates.dashboard.organization.settings.deletion.info_html": "

    Before confirming the deletion of your organization, please ensure you understand the following:

    • You will no longer have access to any 3rd party applications that you have subscribed to via Maestrano. Your data may be deleted immediately by those application providers.
    • All data stored on Maestrano, your dashboard will be immediately deleted and cannot be recovered
    • Data sharing between your applications will cease to function.

    If you need further clarification about this, please get in touch with our support team.

    ", + "mno_enterprise.templates.dashboard.organization.settings.deletion.request_deletion": "Request deletion", + "mno_enterprise.templates.dashboard.organization.settings.deletion.modal.body_html": "

    After confirming the deletion of this organisation:

    • All users will lose access to any 3rd party applications that have been subscribed to via the platform.
    • All users, excluding yourself, will no longer have access to this organisation.
    • You will only have access to the “Billing” section of this organisation.
    • A final invoice for your organisation, including 3rd party application charges, will be generated on the 25th of the following month.
    • Upon receiving the final payment, the deletion of the organisation will be finalised.

    Please note, individual user accounts will not be deleted. Users will retain the access that they have to any other organisations.

    ", + "mno_enterprise.templates.dashboard.organization.settings.deletion.modal.password": "Your password:", + "mno_enterprise.templates.dashboard.organization.settings.deletion.modal.reason": "Please tell us why you are requesting the deletion of your company", + "mno_enterprise.templates.dashboard.organization.settings.deletion.modal.confirm": "Confirm deletion", + "mno_enterprise.templates.dashboard.organization.settings.deletion.toastr_success": "Organization successfully frozen", + "mno_enterprise.templates.dashboard.organization.settings.deletion.toastr_error": "Error", "mno_enterprise.templates.dashboard.provisioning.breadcrumb.order": "Order", "mno_enterprise.templates.dashboard.provisioning.breadcrumb.additional_details": "Additional details", "mno_enterprise.templates.dashboard.provisioning.breadcrumb.confirm": "Confirm",