Skip to content

O
origin-web-common
Commit 90a6f55c by Jeffrey Phillips
Options

Change deleteLink directive to deleteProject, only handle projects

parent 71322689
Showing with 162 additions and 619 deletions
bower.json
{
"name": "origin-web-common",
"version": "0.0.11",
"version": "0.0.12",
"main": [
"dist/origin-web-common.js",
"dist/origin-web-common.css"
......
dist/origin-web-common-ui.js
......@@ -97,7 +97,7 @@ hawtioPluginLoader.addModule('openshiftCommonUI');
);
$templateCache.put('src/components/delete-link/delete-button.html',
$templateCache.put('src/components/delete-project/delete-project-button.html',
"<div class=\"actions\">\n" +
" <!-- Avoid whitespace inside the link -->\n" +
" <a href=\"\"\n" +
......@@ -107,45 +107,27 @@ hawtioPluginLoader.addModule('openshiftCommonUI');
" ng-attr-aria-disabled=\"{{disableDelete ? 'true' : undefined}}\"\n" +
" ng-class=\"{ 'disabled-link': disableDelete }\"\n" +
" ><i class=\"fa fa-trash-o\" aria-hidden=\"true\"\n" +
" ></i><span class=\"sr-only\">Delete {{kind | humanizeKind}} {{resourceName}}</span></a>\n" +
" ></i><span class=\"sr-only\">Delete Project {{projectName}}</span></a>\n" +
"</div>\n"
);
$templateCache.put('src/components/delete-link/delete-link.html',
"<a href=\"javascript:void(0)\"\n" +
" ng-click=\"openDeleteModal()\"\n" +
" role=\"button\"\n" +
" ng-attr-aria-disabled=\"{{disableDelete ? 'true' : undefined}}\"\n" +
" ng-class=\"{ 'disabled-link': disableDelete }\"\n" +
">{{label || 'Delete'}}</a>\n"
);
$templateCache.put('src/components/delete-link/delete-resource.html',
$templateCache.put('src/components/delete-project/delete-project-modal.html',
"<div class=\"delete-resource-modal\">\n" +
" <!-- Use a form so that the enter key submits when typing a project name to confirm. -->\n" +
" <form>\n" +
" <div class=\"modal-body\">\n" +
" <h1>Are you sure you want to delete the {{typeDisplayName || (kind | humanizeKind)}}\n" +
" '<strong>{{displayName ? displayName : resourceName}}</strong>'?</h1>\n" +
" <div ng-if=\"replicas\" class=\"alert alert-warning\">\n" +
" <span class=\"pficon pficon-warning-triangle-o\" aria-hidden=\"true\"></span>\n" +
" <span class=\"sr-only\">Warning:</span>\n" +
" <strong>{{resourceName}}</strong> has running pods. Deleting the\n" +
" {{typeDisplayName || (kind | humanizeKind)}} will <strong>not</strong> delete the pods\n" +
" it controls. Consider scaling the {{typeDisplayName || (kind | humanizeKind)}} down to\n" +
" 0 before continuing.\n" +
" </div>\n" +
"\n" +
" <p>This<span ng-if=\"isProject\"> will <strong>delete all resources</strong> associated with\n" +
" the project {{displayName ? displayName : resourceName}} and</span> <strong>cannot be\n" +
" undone</strong>. Make sure this is something you really want to do!</p>\n" +
"\n" +
" <h1>Are you sure you want to delete the project\n" +
" '<strong>{{displayName ? displayName : projectName}}</strong>'?</h1>\n" +
" <p>\n" +
" This will <strong>delete all resources</strong> associated with\n" +
" the project {{displayName ? displayName : projectName}} and <strong>cannot be\n" +
" undone</strong>. Make sure this is something you really want to do!\n" +
" </p>\n" +
" <div ng-show=\"typeNameToConfirm\">\n" +
" <p>Type the name of the {{typeDisplayName || (kind | humanizeKind)}} to confirm.</p>\n" +
" <p>Type the name of the project to confirm.</p>\n" +
" <p>\n" +
" <label class=\"sr-only\" for=\"resource-to-delete\">{{typeDisplayName || (kind | humanizeKind)}} to delete</label>\n" +
" <label class=\"sr-only\" for=\"resource-to-delete\">project to delete</label>\n" +
" <input\n" +
" ng-model=\"confirmName\"\n" +
" id=\"resource-to-delete\"\n" +
......@@ -157,62 +139,9 @@ hawtioPluginLoader.addModule('openshiftCommonUI');
" autofocus>\n" +
" </p>\n" +
" </div>\n" +
"\n" +
" <div ng-switch=\"kind\">\n" +
" <div ng-switch-when=\"Deployment\">\n" +
" <strong>Note:</strong> None of the replica sets created by this deployment will be deleted.\n" +
"\n" +
" To delete the deployment and all of its replica sets, you can run the command\n" +
" <pre class=\"code prettyprint mar-top-md\">oc delete deployment {{resourceName}} -n {{projectName}}</pre>\n" +
" Learn more about the <a href=\"command-line\">command line tools</a>.\n" +
" </div>\n" +
"\n" +
" <div ng-switch-when=\"DeploymentConfig\">\n" +
" <strong>Note:</strong> None of the deployments created by this deployment config will be deleted.\n" +
"\n" +
" To delete the deployment config and all of its deployments, you can run the command\n" +
" <pre class=\"code prettyprint mar-top-md\">oc delete dc {{resourceName}} -n {{projectName}}</pre>\n" +
" Learn more about the <a href=\"command-line\">command line tools</a>.\n" +
" </div>\n" +
"\n" +
" <div ng-switch-when=\"BuildConfig\">\n" +
" <strong>Note:</strong> None of the builds created by this build config will be deleted.\n" +
"\n" +
" To delete the build config and all of its builds, you can run the command\n" +
" <pre class=\"code prettyprint mar-top-md\">oc delete bc {{resourceName}} -n {{projectName}}</pre>\n" +
" Learn more about the <a href=\"command-line\">command line tools</a>.\n" +
" </div>\n" +
" </div>\n" +
"\n" +
" <!--\n" +
" If this is a deployment config or replication controller with associated HPAs, prompt to\n" +
" delete the HPAs as well.\n" +
" -->\n" +
" <div ng-if=\"hpaList.length > 0\">\n" +
" <p>\n" +
" <span ng-if=\"hpaList.length === 1\">\n" +
" This resource has an autoscaler associated with it.\n" +
" It is recommended you delete the autoscaler with the resource it scales.\n" +
" </span>\n" +
" <span ng-if=\"hpaList.length > 1\">\n" +
" This resource has autoscalers associated with it.\n" +
" It is recommended you delete the autoscalers with the resource they scale.\n" +
" </span>\n" +
" </p>\n" +
" <label>\n" +
" <input type=\"checkbox\" ng-model=\"options.deleteHPAs\">\n" +
" Delete\n" +
" <span ng-if=\"hpaList.length === 1\">\n" +
" Horizontal Pod Autoscaler '<strong>{{hpaList[0].metadata.name}}</strong>'\n" +
" </span>\n" +
" <span ng-if=\"hpaList.length > 1\">\n" +
" {{hpaList.length}} associated Horizontal Pod Autoscalers\n" +
" </span>\n" +
" </label>\n" +
" </div>\n" +
" </div>\n" +
" <div class=\"modal-footer\">\n" +
" <button ng-disabled=\"typeNameToConfirm && confirmName !== resourceName && confirmName !== displayName\" class=\"btn btn-lg btn-danger\" type=\"submit\" ng-click=\"delete();\">Delete</button>\n" +
" <button ng-disabled=\"typeNameToConfirm && confirmName !== projectName && confirmName !== displayName\" class=\"btn btn-lg btn-danger\" type=\"submit\" ng-click=\"delete();\">Delete</button>\n" +
" <button class=\"btn btn-lg btn-default\" type=\"button\" ng-click=\"cancel();\">Cancel</button>\n" +
" </div>\n" +
" </form>\n" +
......@@ -220,6 +149,16 @@ hawtioPluginLoader.addModule('openshiftCommonUI');
);
$templateCache.put('src/components/delete-project/delete-project.html',
"<a href=\"javascript:void(0)\"\n" +
" ng-click=\"openDeleteModal()\"\n" +
" role=\"button\"\n" +
" ng-attr-aria-disabled=\"{{disableDelete ? 'true' : undefined}}\"\n" +
" ng-class=\"{ 'disabled-link': disableDelete }\"\n" +
">{{label || 'Delete'}}</a>\n"
);
$templateCache.put('src/components/edit-project/editProject.html',
"<form name=\"editProjectForm\">\n" +
" <fieldset ng-disabled=\"disableInputs\">\n" +
......@@ -360,38 +299,26 @@ angular.module("openshiftCommonUI")
;'use strict';
angular.module("openshiftCommonUI")
.directive("deleteLink", function ($uibModal, $location, $filter, $q, hashSizeFilter, APIService, DataService, AlertMessageService, Logger) {
.directive("deleteProject", function ($uibModal, $location, $filter, $q, hashSizeFilter, APIService, DataService, AlertMessageService, Logger) {
return {
restrict: "E",
scope: {
// Resource Kind to delete (e.g., "Pod" or "ReplicationController").
kind: "@",
// Optional resource group.
group: "@?",
// Optional display name for kind.
typeDisplayName: "@?",
// Name of the resource to delete.
resourceName: "@",
// The name of the resource's project. Optional if kind === "Project".
// The name of project to delete
projectName: "@",
// Alerts object for success and error alerts.
alerts: "=",
// Optional display name of the resource to delete.
// Optional display name of the project to delete.
displayName: "@",
// Set to true to disable the delete button.
disableDelete: "=?",
// Force the user to enter the name before we'll delete the resource (e.g. for projects).
// Force the user to enter the name before we'll delete the project.
typeNameToConfirm: "=?",
// Optional link label. Defaults to "Delete".
label: "@?",
// Only show a delete icon with no text.
buttonOnly: "@",
// Stay on the current page without redirecting to the resource list.
// Stay on the current page without redirecting to the projects list.
stayOnCurrentPage: "=?",
// Optional replica count for a resource like a ReplicationController or ReplicaSet to display a warning.
replicas: '=?',
// Array of associated HPAs for this resource. If set, prompts the user to delete the HPA resources as well.
hpaList: "=?",
// Optional callback when the delete succeeds
success: "=?",
// Optional redirect URL when the delete succeeds
......@@ -399,23 +326,14 @@ angular.module("openshiftCommonUI")
},
templateUrl: function(elem, attr) {
if (angular.isDefined(attr.buttonOnly)) {
return "src/components/delete-link/delete-button.html";
return "src/components/delete-project/delete-project-button.html";
}
return "src/components/delete-link/delete-link.html";
return "src/components/delete-project/delete-project.html";
},
// Replace so ".dropdown-menu > li > a" styles are applied.
replace: true,
link: function(scope, element, attrs) {
if (attrs.kind === 'Project') {
scope.isProject = true;
}
// Checkbox value
scope.options = {
deleteHPAs: true
};
var showAlert = function(alert) {
if (scope.stayOnCurrentPage) {
scope.alerts[alert.name] = alert.data;
......@@ -424,32 +342,6 @@ angular.module("openshiftCommonUI")
}
};
var deleteHPA = function(hpa) {
return DataService.delete({
resource: 'horizontalpodautoscalers',
group: 'extensions'
}, hpa.metadata.name, { namespace: scope.projectName })
.then(function() {
showAlert({
name: hpa.metadata.name,
data: {
type: "success",
message: "Horizontal Pod Autoscaler " + hpa.metadata.name + " was marked for deletion."
}
});
})
.catch(function(err) {
showAlert({
name: hpa.metadata.name,
data: {
type: "error",
message: "Horizontal Pod Autoscaler " + hpa.metadata.name + " could not be deleted."
}
});
Logger.error("HPA " + hpa.metadata.name + " could not be deleted.", err);
});
};
var navigateToList = function() {
if (scope.stayOnCurrentPage) {
return;
......@@ -460,11 +352,6 @@ angular.module("openshiftCommonUI")
return;
}
if (scope.kind !== 'Project') {
$location.url(this.resourceListURL(APIService.kindToResource(scope.kind), scope.projectName));
return;
}
if ($location.path() === '/') {
scope.$emit('deleteProject');
return;
......@@ -482,27 +369,23 @@ angular.module("openshiftCommonUI")
// opening the modal with settings scope as parent
var modalInstance = $uibModal.open({
animation: true,
templateUrl: 'src/components/delete-link/delete-resource.html',
controller: 'DeleteModalController',
templateUrl: 'src/components/delete-project/delete-project-modal.html',
controller: 'DeleteProjectModalController',
scope: scope
});
modalInstance.result.then(function() {
// upon clicking delete button, delete resource and send alert
var kind = scope.kind;
var resourceName = scope.resourceName;
var typeDisplayName = scope.typeDisplayName || $filter('humanizeKind')(kind);
var formattedResource = typeDisplayName + ' ' + "\'" + (scope.displayName ? scope.displayName : resourceName) + "\'";
var context = (scope.kind === 'Project') ? {} : {namespace: scope.projectName};
var projectName = scope.projectName;
var formattedResource = "Project \'" + scope.displayName + "\'";
var context = {};
DataService.delete({
resource: APIService.kindToResource(kind),
// group or undefined
group: scope.group
}, resourceName, context)
resource: APIService.kindToResource("Project")
}, projectName, context)
.then(function() {
showAlert({
name: resourceName,
name: projectName,
data: {
type: "success",
message: _.capitalize(formattedResource) + " was marked for deletion."
......@@ -513,26 +396,11 @@ angular.module("openshiftCommonUI")
scope.success();
}
// Delete any associated HPAs if requested.
var promises = [];
if (scope.options.deleteHPAs) {
_.forEach(scope.hpaList, function(hpa) {
promises.push(deleteHPA(hpa));
});
}
if (!promises.length) {
navigateToList();
} else {
// Wait until all promises resolve so that we can add alerts to
// AlertMessageService before navigating, otherwise they aren't
// displayed.
$q.all(promises).then(navigateToList);
}
navigateToList();
})
.catch(function(err) {
// called if failure to delete
scope.alerts[resourceName] = {
scope.alerts[projectName] = {
type: "error",
message: _.capitalize(formattedResource) + "\'" + " could not be deleted.",
details: $filter('getErrorDetails')(err)
......@@ -550,10 +418,10 @@ angular.module("openshiftCommonUI")
/**
* @ngdoc function
* @name openshifgCommonUI.controller:DeleteModalController
* @name openshiftCommonUI.controller:DeleteProjectModalController
*/
angular.module('openshiftCommonUI')
.controller('DeleteModalController', function ($scope, $uibModalInstance) {
.controller('DeleteProjectModalController', function ($scope, $uibModalInstance) {
$scope.delete = function() {
$uibModalInstance.close('delete');
};
......
dist/origin-web-common.js
......@@ -267,7 +267,7 @@ hawtioPluginLoader.addModule('openshiftCommonUI');
);
$templateCache.put('src/components/delete-link/delete-button.html',
$templateCache.put('src/components/delete-project/delete-project-button.html',
"<div class=\"actions\">\n" +
" <!-- Avoid whitespace inside the link -->\n" +
" <a href=\"\"\n" +
......@@ -277,45 +277,27 @@ hawtioPluginLoader.addModule('openshiftCommonUI');
" ng-attr-aria-disabled=\"{{disableDelete ? 'true' : undefined}}\"\n" +
" ng-class=\"{ 'disabled-link': disableDelete }\"\n" +
" ><i class=\"fa fa-trash-o\" aria-hidden=\"true\"\n" +
" ></i><span class=\"sr-only\">Delete {{kind | humanizeKind}} {{resourceName}}</span></a>\n" +
" ></i><span class=\"sr-only\">Delete Project {{projectName}}</span></a>\n" +
"</div>\n"
);
$templateCache.put('src/components/delete-link/delete-link.html',
"<a href=\"javascript:void(0)\"\n" +
" ng-click=\"openDeleteModal()\"\n" +
" role=\"button\"\n" +
" ng-attr-aria-disabled=\"{{disableDelete ? 'true' : undefined}}\"\n" +
" ng-class=\"{ 'disabled-link': disableDelete }\"\n" +
">{{label || 'Delete'}}</a>\n"
);
$templateCache.put('src/components/delete-link/delete-resource.html',
$templateCache.put('src/components/delete-project/delete-project-modal.html',
"<div class=\"delete-resource-modal\">\n" +
" <!-- Use a form so that the enter key submits when typing a project name to confirm. -->\n" +
" <form>\n" +
" <div class=\"modal-body\">\n" +
" <h1>Are you sure you want to delete the {{typeDisplayName || (kind | humanizeKind)}}\n" +
" '<strong>{{displayName ? displayName : resourceName}}</strong>'?</h1>\n" +
" <div ng-if=\"replicas\" class=\"alert alert-warning\">\n" +
" <span class=\"pficon pficon-warning-triangle-o\" aria-hidden=\"true\"></span>\n" +
" <span class=\"sr-only\">Warning:</span>\n" +
" <strong>{{resourceName}}</strong> has running pods. Deleting the\n" +
" {{typeDisplayName || (kind | humanizeKind)}} will <strong>not</strong> delete the pods\n" +
" it controls. Consider scaling the {{typeDisplayName || (kind | humanizeKind)}} down to\n" +
" 0 before continuing.\n" +
" </div>\n" +
"\n" +
" <p>This<span ng-if=\"isProject\"> will <strong>delete all resources</strong> associated with\n" +
" the project {{displayName ? displayName : resourceName}} and</span> <strong>cannot be\n" +
" undone</strong>. Make sure this is something you really want to do!</p>\n" +
"\n" +
" <h1>Are you sure you want to delete the project\n" +
" '<strong>{{displayName ? displayName : projectName}}</strong>'?</h1>\n" +
" <p>\n" +
" This will <strong>delete all resources</strong> associated with\n" +
" the project {{displayName ? displayName : projectName}} and <strong>cannot be\n" +
" undone</strong>. Make sure this is something you really want to do!\n" +
" </p>\n" +
" <div ng-show=\"typeNameToConfirm\">\n" +
" <p>Type the name of the {{typeDisplayName || (kind | humanizeKind)}} to confirm.</p>\n" +
" <p>Type the name of the project to confirm.</p>\n" +
" <p>\n" +
" <label class=\"sr-only\" for=\"resource-to-delete\">{{typeDisplayName || (kind | humanizeKind)}} to delete</label>\n" +
" <label class=\"sr-only\" for=\"resource-to-delete\">project to delete</label>\n" +
" <input\n" +
" ng-model=\"confirmName\"\n" +
" id=\"resource-to-delete\"\n" +
......@@ -327,62 +309,9 @@ hawtioPluginLoader.addModule('openshiftCommonUI');
" autofocus>\n" +
" </p>\n" +
" </div>\n" +
"\n" +
" <div ng-switch=\"kind\">\n" +
" <div ng-switch-when=\"Deployment\">\n" +
" <strong>Note:</strong> None of the replica sets created by this deployment will be deleted.\n" +
"\n" +
" To delete the deployment and all of its replica sets, you can run the command\n" +
" <pre class=\"code prettyprint mar-top-md\">oc delete deployment {{resourceName}} -n {{projectName}}</pre>\n" +
" Learn more about the <a href=\"command-line\">command line tools</a>.\n" +
" </div>\n" +
"\n" +
" <div ng-switch-when=\"DeploymentConfig\">\n" +
" <strong>Note:</strong> None of the deployments created by this deployment config will be deleted.\n" +
"\n" +
" To delete the deployment config and all of its deployments, you can run the command\n" +
" <pre class=\"code prettyprint mar-top-md\">oc delete dc {{resourceName}} -n {{projectName}}</pre>\n" +
" Learn more about the <a href=\"command-line\">command line tools</a>.\n" +
" </div>\n" +
"\n" +
" <div ng-switch-when=\"BuildConfig\">\n" +
" <strong>Note:</strong> None of the builds created by this build config will be deleted.\n" +
"\n" +
" To delete the build config and all of its builds, you can run the command\n" +
" <pre class=\"code prettyprint mar-top-md\">oc delete bc {{resourceName}} -n {{projectName}}</pre>\n" +
" Learn more about the <a href=\"command-line\">command line tools</a>.\n" +
" </div>\n" +
" </div>\n" +
"\n" +
" <!--\n" +
" If this is a deployment config or replication controller with associated HPAs, prompt to\n" +
" delete the HPAs as well.\n" +
" -->\n" +
" <div ng-if=\"hpaList.length > 0\">\n" +
" <p>\n" +
" <span ng-if=\"hpaList.length === 1\">\n" +
" This resource has an autoscaler associated with it.\n" +
" It is recommended you delete the autoscaler with the resource it scales.\n" +
" </span>\n" +
" <span ng-if=\"hpaList.length > 1\">\n" +
" This resource has autoscalers associated with it.\n" +
" It is recommended you delete the autoscalers with the resource they scale.\n" +
" </span>\n" +
" </p>\n" +
" <label>\n" +
" <input type=\"checkbox\" ng-model=\"options.deleteHPAs\">\n" +
" Delete\n" +
" <span ng-if=\"hpaList.length === 1\">\n" +
" Horizontal Pod Autoscaler '<strong>{{hpaList[0].metadata.name}}</strong>'\n" +
" </span>\n" +
" <span ng-if=\"hpaList.length > 1\">\n" +
" {{hpaList.length}} associated Horizontal Pod Autoscalers\n" +
" </span>\n" +
" </label>\n" +
" </div>\n" +
" </div>\n" +
" <div class=\"modal-footer\">\n" +
" <button ng-disabled=\"typeNameToConfirm && confirmName !== resourceName && confirmName !== displayName\" class=\"btn btn-lg btn-danger\" type=\"submit\" ng-click=\"delete();\">Delete</button>\n" +
" <button ng-disabled=\"typeNameToConfirm && confirmName !== projectName && confirmName !== displayName\" class=\"btn btn-lg btn-danger\" type=\"submit\" ng-click=\"delete();\">Delete</button>\n" +
" <button class=\"btn btn-lg btn-default\" type=\"button\" ng-click=\"cancel();\">Cancel</button>\n" +
" </div>\n" +
" </form>\n" +
......@@ -390,6 +319,16 @@ hawtioPluginLoader.addModule('openshiftCommonUI');
);
$templateCache.put('src/components/delete-project/delete-project.html',
"<a href=\"javascript:void(0)\"\n" +
" ng-click=\"openDeleteModal()\"\n" +
" role=\"button\"\n" +
" ng-attr-aria-disabled=\"{{disableDelete ? 'true' : undefined}}\"\n" +
" ng-class=\"{ 'disabled-link': disableDelete }\"\n" +
">{{label || 'Delete'}}</a>\n"
);
$templateCache.put('src/components/edit-project/editProject.html',
"<form name=\"editProjectForm\">\n" +
" <fieldset ng-disabled=\"disableInputs\">\n" +
......@@ -530,38 +469,26 @@ angular.module("openshiftCommonUI")
;'use strict';
angular.module("openshiftCommonUI")
.directive("deleteLink", ["$uibModal", "$location", "$filter", "$q", "hashSizeFilter", "APIService", "DataService", "AlertMessageService", "Logger", function ($uibModal, $location, $filter, $q, hashSizeFilter, APIService, DataService, AlertMessageService, Logger) {
.directive("deleteProject", ["$uibModal", "$location", "$filter", "$q", "hashSizeFilter", "APIService", "DataService", "AlertMessageService", "Logger", function ($uibModal, $location, $filter, $q, hashSizeFilter, APIService, DataService, AlertMessageService, Logger) {
return {
restrict: "E",
scope: {
// Resource Kind to delete (e.g., "Pod" or "ReplicationController").
kind: "@",
// Optional resource group.
group: "@?",
// Optional display name for kind.
typeDisplayName: "@?",
// Name of the resource to delete.
resourceName: "@",
// The name of the resource's project. Optional if kind === "Project".
// The name of project to delete
projectName: "@",
// Alerts object for success and error alerts.
alerts: "=",
// Optional display name of the resource to delete.
// Optional display name of the project to delete.
displayName: "@",
// Set to true to disable the delete button.
disableDelete: "=?",
// Force the user to enter the name before we'll delete the resource (e.g. for projects).
// Force the user to enter the name before we'll delete the project.
typeNameToConfirm: "=?",
// Optional link label. Defaults to "Delete".
label: "@?",
// Only show a delete icon with no text.
buttonOnly: "@",
// Stay on the current page without redirecting to the resource list.
// Stay on the current page without redirecting to the projects list.
stayOnCurrentPage: "=?",
// Optional replica count for a resource like a ReplicationController or ReplicaSet to display a warning.
replicas: '=?',
// Array of associated HPAs for this resource. If set, prompts the user to delete the HPA resources as well.
hpaList: "=?",
// Optional callback when the delete succeeds
success: "=?",
// Optional redirect URL when the delete succeeds
......@@ -569,23 +496,14 @@ angular.module("openshiftCommonUI")
},
templateUrl: function(elem, attr) {
if (angular.isDefined(attr.buttonOnly)) {
return "src/components/delete-link/delete-button.html";
return "src/components/delete-project/delete-project-button.html";
}
return "src/components/delete-link/delete-link.html";
return "src/components/delete-project/delete-project.html";
},
// Replace so ".dropdown-menu > li > a" styles are applied.
replace: true,
link: function(scope, element, attrs) {
if (attrs.kind === 'Project') {
scope.isProject = true;
}
// Checkbox value
scope.options = {
deleteHPAs: true
};
var showAlert = function(alert) {
if (scope.stayOnCurrentPage) {
scope.alerts[alert.name] = alert.data;
......@@ -594,32 +512,6 @@ angular.module("openshiftCommonUI")
}
};
var deleteHPA = function(hpa) {
return DataService.delete({
resource: 'horizontalpodautoscalers',
group: 'extensions'
}, hpa.metadata.name, { namespace: scope.projectName })
.then(function() {
showAlert({
name: hpa.metadata.name,
data: {
type: "success",
message: "Horizontal Pod Autoscaler " + hpa.metadata.name + " was marked for deletion."
}
});
})
.catch(function(err) {
showAlert({
name: hpa.metadata.name,
data: {
type: "error",
message: "Horizontal Pod Autoscaler " + hpa.metadata.name + " could not be deleted."
}
});
Logger.error("HPA " + hpa.metadata.name + " could not be deleted.", err);
});
};
var navigateToList = function() {
if (scope.stayOnCurrentPage) {
return;
......@@ -630,11 +522,6 @@ angular.module("openshiftCommonUI")
return;
}
if (scope.kind !== 'Project') {
$location.url(this.resourceListURL(APIService.kindToResource(scope.kind), scope.projectName));
return;
}
if ($location.path() === '/') {
scope.$emit('deleteProject');
return;
......@@ -652,27 +539,23 @@ angular.module("openshiftCommonUI")
// opening the modal with settings scope as parent
var modalInstance = $uibModal.open({
animation: true,
templateUrl: 'src/components/delete-link/delete-resource.html',
controller: 'DeleteModalController',
templateUrl: 'src/components/delete-project/delete-project-modal.html',
controller: 'DeleteProjectModalController',
scope: scope
});
modalInstance.result.then(function() {
// upon clicking delete button, delete resource and send alert
var kind = scope.kind;
var resourceName = scope.resourceName;
var typeDisplayName = scope.typeDisplayName || $filter('humanizeKind')(kind);
var formattedResource = typeDisplayName + ' ' + "\'" + (scope.displayName ? scope.displayName : resourceName) + "\'";
var context = (scope.kind === 'Project') ? {} : {namespace: scope.projectName};
var projectName = scope.projectName;
var formattedResource = "Project \'" + scope.displayName + "\'";
var context = {};
DataService.delete({
resource: APIService.kindToResource(kind),
// group or undefined
group: scope.group
}, resourceName, context)
resource: APIService.kindToResource("Project")
}, projectName, context)
.then(function() {
showAlert({
name: resourceName,
name: projectName,
data: {
type: "success",
message: _.capitalize(formattedResource) + " was marked for deletion."
......@@ -683,26 +566,11 @@ angular.module("openshiftCommonUI")
scope.success();
}
// Delete any associated HPAs if requested.
var promises = [];
if (scope.options.deleteHPAs) {
_.forEach(scope.hpaList, function(hpa) {
promises.push(deleteHPA(hpa));
});
}
if (!promises.length) {
navigateToList();
} else {
// Wait until all promises resolve so that we can add alerts to
// AlertMessageService before navigating, otherwise they aren't
// displayed.
$q.all(promises).then(navigateToList);
}
navigateToList();
})
.catch(function(err) {
// called if failure to delete
scope.alerts[resourceName] = {
scope.alerts[projectName] = {
type: "error",
message: _.capitalize(formattedResource) + "\'" + " could not be deleted.",
details: $filter('getErrorDetails')(err)
......@@ -720,10 +588,10 @@ angular.module("openshiftCommonUI")
/**
* @ngdoc function
* @name openshifgCommonUI.controller:DeleteModalController
* @name openshiftCommonUI.controller:DeleteProjectModalController
*/
angular.module('openshiftCommonUI')
.controller('DeleteModalController', ["$scope", "$uibModalInstance", function ($scope, $uibModalInstance) {
.controller('DeleteProjectModalController', ["$scope", "$uibModalInstance", function ($scope, $uibModalInstance) {
$scope.delete = function() {
$uibModalInstance.close('delete');
};
......
dist/origin-web-common.min.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/scripts/templates.js
......@@ -87,7 +87,7 @@ angular.module('openshiftCommonUI').run(['$templateCache', function($templateCac
);
$templateCache.put('src/components/delete-link/delete-button.html',
$templateCache.put('src/components/delete-project/delete-project-button.html',
"<div class=\"actions\">\n" +
" <!-- Avoid whitespace inside the link -->\n" +
" <a href=\"\"\n" +
......@@ -97,45 +97,27 @@ angular.module('openshiftCommonUI').run(['$templateCache', function($templateCac
" ng-attr-aria-disabled=\"{{disableDelete ? 'true' : undefined}}\"\n" +
" ng-class=\"{ 'disabled-link': disableDelete }\"\n" +
" ><i class=\"fa fa-trash-o\" aria-hidden=\"true\"\n" +
" ></i><span class=\"sr-only\">Delete {{kind | humanizeKind}} {{resourceName}}</span></a>\n" +
" ></i><span class=\"sr-only\">Delete Project {{projectName}}</span></a>\n" +
"</div>\n"
);
$templateCache.put('src/components/delete-link/delete-link.html',
"<a href=\"javascript:void(0)\"\n" +
" ng-click=\"openDeleteModal()\"\n" +
" role=\"button\"\n" +
" ng-attr-aria-disabled=\"{{disableDelete ? 'true' : undefined}}\"\n" +
" ng-class=\"{ 'disabled-link': disableDelete }\"\n" +
">{{label || 'Delete'}}</a>\n"
);
$templateCache.put('src/components/delete-link/delete-resource.html',
$templateCache.put('src/components/delete-project/delete-project-modal.html',
"<div class=\"delete-resource-modal\">\n" +
" <!-- Use a form so that the enter key submits when typing a project name to confirm. -->\n" +
" <form>\n" +
" <div class=\"modal-body\">\n" +
" <h1>Are you sure you want to delete the {{typeDisplayName || (kind | humanizeKind)}}\n" +
" '<strong>{{displayName ? displayName : resourceName}}</strong>'?</h1>\n" +
" <div ng-if=\"replicas\" class=\"alert alert-warning\">\n" +
" <span class=\"pficon pficon-warning-triangle-o\" aria-hidden=\"true\"></span>\n" +
" <span class=\"sr-only\">Warning:</span>\n" +
" <strong>{{resourceName}}</strong> has running pods. Deleting the\n" +
" {{typeDisplayName || (kind | humanizeKind)}} will <strong>not</strong> delete the pods\n" +
" it controls. Consider scaling the {{typeDisplayName || (kind | humanizeKind)}} down to\n" +
" 0 before continuing.\n" +
" </div>\n" +
"\n" +
" <p>This<span ng-if=\"isProject\"> will <strong>delete all resources</strong> associated with\n" +
" the project {{displayName ? displayName : resourceName}} and</span> <strong>cannot be\n" +
" undone</strong>. Make sure this is something you really want to do!</p>\n" +
"\n" +
" <h1>Are you sure you want to delete the project\n" +
" '<strong>{{displayName ? displayName : projectName}}</strong>'?</h1>\n" +
" <p>\n" +
" This will <strong>delete all resources</strong> associated with\n" +
" the project {{displayName ? displayName : projectName}} and <strong>cannot be\n" +
" undone</strong>. Make sure this is something you really want to do!\n" +
" </p>\n" +
" <div ng-show=\"typeNameToConfirm\">\n" +
" <p>Type the name of the {{typeDisplayName || (kind | humanizeKind)}} to confirm.</p>\n" +
" <p>Type the name of the project to confirm.</p>\n" +
" <p>\n" +
" <label class=\"sr-only\" for=\"resource-to-delete\">{{typeDisplayName || (kind | humanizeKind)}} to delete</label>\n" +
" <label class=\"sr-only\" for=\"resource-to-delete\">project to delete</label>\n" +
" <input\n" +
" ng-model=\"confirmName\"\n" +
" id=\"resource-to-delete\"\n" +
......@@ -147,62 +129,9 @@ angular.module('openshiftCommonUI').run(['$templateCache', function($templateCac
" autofocus>\n" +
" </p>\n" +
" </div>\n" +
"\n" +
" <div ng-switch=\"kind\">\n" +
" <div ng-switch-when=\"Deployment\">\n" +
" <strong>Note:</strong> None of the replica sets created by this deployment will be deleted.\n" +
"\n" +
" To delete the deployment and all of its replica sets, you can run the command\n" +
" <pre class=\"code prettyprint mar-top-md\">oc delete deployment {{resourceName}} -n {{projectName}}</pre>\n" +
" Learn more about the <a href=\"command-line\">command line tools</a>.\n" +
" </div>\n" +
"\n" +
" <div ng-switch-when=\"DeploymentConfig\">\n" +
" <strong>Note:</strong> None of the deployments created by this deployment config will be deleted.\n" +
"\n" +
" To delete the deployment config and all of its deployments, you can run the command\n" +
" <pre class=\"code prettyprint mar-top-md\">oc delete dc {{resourceName}} -n {{projectName}}</pre>\n" +
" Learn more about the <a href=\"command-line\">command line tools</a>.\n" +
" </div>\n" +
"\n" +
" <div ng-switch-when=\"BuildConfig\">\n" +
" <strong>Note:</strong> None of the builds created by this build config will be deleted.\n" +
"\n" +
" To delete the build config and all of its builds, you can run the command\n" +
" <pre class=\"code prettyprint mar-top-md\">oc delete bc {{resourceName}} -n {{projectName}}</pre>\n" +
" Learn more about the <a href=\"command-line\">command line tools</a>.\n" +
" </div>\n" +
" </div>\n" +
"\n" +
" <!--\n" +
" If this is a deployment config or replication controller with associated HPAs, prompt to\n" +
" delete the HPAs as well.\n" +
" -->\n" +
" <div ng-if=\"hpaList.length > 0\">\n" +
" <p>\n" +
" <span ng-if=\"hpaList.length === 1\">\n" +
" This resource has an autoscaler associated with it.\n" +
" It is recommended you delete the autoscaler with the resource it scales.\n" +
" </span>\n" +
" <span ng-if=\"hpaList.length > 1\">\n" +
" This resource has autoscalers associated with it.\n" +
" It is recommended you delete the autoscalers with the resource they scale.\n" +
" </span>\n" +
" </p>\n" +
" <label>\n" +
" <input type=\"checkbox\" ng-model=\"options.deleteHPAs\">\n" +
" Delete\n" +
" <span ng-if=\"hpaList.length === 1\">\n" +
" Horizontal Pod Autoscaler '<strong>{{hpaList[0].metadata.name}}</strong>'\n" +
" </span>\n" +
" <span ng-if=\"hpaList.length > 1\">\n" +
" {{hpaList.length}} associated Horizontal Pod Autoscalers\n" +
" </span>\n" +
" </label>\n" +
" </div>\n" +
" </div>\n" +
" <div class=\"modal-footer\">\n" +
" <button ng-disabled=\"typeNameToConfirm && confirmName !== resourceName && confirmName !== displayName\" class=\"btn btn-lg btn-danger\" type=\"submit\" ng-click=\"delete();\">Delete</button>\n" +
" <button ng-disabled=\"typeNameToConfirm && confirmName !== projectName && confirmName !== displayName\" class=\"btn btn-lg btn-danger\" type=\"submit\" ng-click=\"delete();\">Delete</button>\n" +
" <button class=\"btn btn-lg btn-default\" type=\"button\" ng-click=\"cancel();\">Cancel</button>\n" +
" </div>\n" +
" </form>\n" +
......@@ -210,6 +139,16 @@ angular.module('openshiftCommonUI').run(['$templateCache', function($templateCac
);
$templateCache.put('src/components/delete-project/delete-project.html',
"<a href=\"javascript:void(0)\"\n" +
" ng-click=\"openDeleteModal()\"\n" +
" role=\"button\"\n" +
" ng-attr-aria-disabled=\"{{disableDelete ? 'true' : undefined}}\"\n" +
" ng-class=\"{ 'disabled-link': disableDelete }\"\n" +
">{{label || 'Delete'}}</a>\n"
);
$templateCache.put('src/components/edit-project/editProject.html',
"<form name=\"editProjectForm\">\n" +
" <fieldset ng-disabled=\"disableInputs\">\n" +
......
package.json
{
"author": "Red Hat",
"name": "origin-web-common",
"version": "0.0.11",
"version": "0.0.12",
"license": "Apache-2.0",
"description": "Library of common services and components for OpenShift Web Console.",
"homepage": "https://github.com/openshift/origin-web-common.git",
......
src/components/delete-link/delete-resource.html deleted 100644 → 0
<div class="delete-resource-modal">
<!-- Use a form so that the enter key submits when typing a project name to confirm. -->
<form>
<div class="modal-body">
<h1>Are you sure you want to delete the {{typeDisplayName || (kind | humanizeKind)}}
'<strong>{{displayName ? displayName : resourceName}}</strong>'?</h1>
<div ng-if="replicas" class="alert alert-warning">
<span class="pficon pficon-warning-triangle-o" aria-hidden="true"></span>
<span class="sr-only">Warning:</span>
<strong>{{resourceName}}</strong> has running pods. Deleting the
{{typeDisplayName || (kind | humanizeKind)}} will <strong>not</strong> delete the pods
it controls. Consider scaling the {{typeDisplayName || (kind | humanizeKind)}} down to
0 before continuing.
</div>
<p>This<span ng-if="isProject"> will <strong>delete all resources</strong> associated with
the project {{displayName ? displayName : resourceName}} and</span> <strong>cannot be
undone</strong>. Make sure this is something you really want to do!</p>
<div ng-show="typeNameToConfirm">
<p>Type the name of the {{typeDisplayName || (kind | humanizeKind)}} to confirm.</p>
<p>
<label class="sr-only" for="resource-to-delete">{{typeDisplayName || (kind | humanizeKind)}} to delete</label>
<input
ng-model="confirmName"
id="resource-to-delete"
type="text"
class="form-control input-lg"
autocorrect="off"
autocapitalize="off"
spellcheck="false"
autofocus>
</p>
</div>
<div ng-switch="kind">
<div ng-switch-when="Deployment">
<strong>Note:</strong> None of the replica sets created by this deployment will be deleted.
To delete the deployment and all of its replica sets, you can run the command
<pre class="code prettyprint mar-top-md">oc delete deployment {{resourceName}} -n {{projectName}}</pre>
Learn more about the <a href="command-line">command line tools</a>.
</div>
<div ng-switch-when="DeploymentConfig">
<strong>Note:</strong> None of the deployments created by this deployment config will be deleted.
To delete the deployment config and all of its deployments, you can run the command
<pre class="code prettyprint mar-top-md">oc delete dc {{resourceName}} -n {{projectName}}</pre>
Learn more about the <a href="command-line">command line tools</a>.
</div>
<div ng-switch-when="BuildConfig">
<strong>Note:</strong> None of the builds created by this build config will be deleted.
To delete the build config and all of its builds, you can run the command
<pre class="code prettyprint mar-top-md">oc delete bc {{resourceName}} -n {{projectName}}</pre>
Learn more about the <a href="command-line">command line tools</a>.
</div>
</div>
<!--
If this is a deployment config or replication controller with associated HPAs, prompt to
delete the HPAs as well.
-->
<div ng-if="hpaList.length > 0">
<p>
<span ng-if="hpaList.length === 1">
This resource has an autoscaler associated with it.
It is recommended you delete the autoscaler with the resource it scales.
</span>
<span ng-if="hpaList.length > 1">
This resource has autoscalers associated with it.
It is recommended you delete the autoscalers with the resource they scale.
</span>
</p>
<label>
<input type="checkbox" ng-model="options.deleteHPAs">
Delete
<span ng-if="hpaList.length === 1">
Horizontal Pod Autoscaler '<strong>{{hpaList[0].metadata.name}}</strong>'
</span>
<span ng-if="hpaList.length > 1">
{{hpaList.length}} associated Horizontal Pod Autoscalers
</span>
</label>
</div>
</div>
<div class="modal-footer">
<button ng-disabled="typeNameToConfirm && confirmName !== resourceName && confirmName !== displayName" class="btn btn-lg btn-danger" type="submit" ng-click="delete();">Delete</button>
<button class="btn btn-lg btn-default" type="button" ng-click="cancel();">Cancel</button>
</div>
</form>
</div>
src/components/delete-link/delete-button.html → src/components/delete-project/delete-project-button.html
......@@ -7,5 +7,5 @@
ng-attr-aria-disabled="{{disableDelete ? 'true' : undefined}}"
ng-class="{ 'disabled-link': disableDelete }"
><i class="fa fa-trash-o" aria-hidden="true"
></i><span class="sr-only">Delete {{kind | humanizeKind}} {{resourceName}}</span></a>
></i><span class="sr-only">Delete Project {{projectName}}</span></a>
</div>
src/components/delete-project/delete-project-modal.html 0 → 100644
<div class="delete-resource-modal">
<!-- Use a form so that the enter key submits when typing a project name to confirm. -->
<form>
<div class="modal-body">
<h1>Are you sure you want to delete the project
'<strong>{{displayName ? displayName : projectName}}</strong>'?</h1>
<p>
This will <strong>delete all resources</strong> associated with
the project {{displayName ? displayName : projectName}} and <strong>cannot be
undone</strong>. Make sure this is something you really want to do!
</p>
<div ng-show="typeNameToConfirm">
<p>Type the name of the project to confirm.</p>
<p>
<label class="sr-only" for="resource-to-delete">project to delete</label>
<input
ng-model="confirmName"
id="resource-to-delete"
type="text"
class="form-control input-lg"
autocorrect="off"
autocapitalize="off"
spellcheck="false"
autofocus>
</p>
</div>
</div>
<div class="modal-footer">
<button ng-disabled="typeNameToConfirm && confirmName !== projectName && confirmName !== displayName" class="btn btn-lg btn-danger" type="submit" ng-click="delete();">Delete</button>
<button class="btn btn-lg btn-default" type="button" ng-click="cancel();">Cancel</button>
</div>
</form>
</div>
src/components/delete-link/deleteLink.js → src/components/delete-project/deleteProject.js
'use strict';
angular.module("openshiftCommonUI")
.directive("deleteLink", function ($uibModal, $location, $filter, $q, hashSizeFilter, APIService, DataService, AlertMessageService, Logger) {
.directive("deleteProject", function ($uibModal, $location, $filter, $q, hashSizeFilter, APIService, DataService, AlertMessageService, Logger) {
return {
restrict: "E",
scope: {
// Resource Kind to delete (e.g., "Pod" or "ReplicationController").
kind: "@",
// Optional resource group.
group: "@?",
// Optional display name for kind.
typeDisplayName: "@?",
// Name of the resource to delete.
resourceName: "@",
// The name of the resource's project. Optional if kind === "Project".
// The name of project to delete
projectName: "@",
// Alerts object for success and error alerts.
alerts: "=",
// Optional display name of the resource to delete.
// Optional display name of the project to delete.
displayName: "@",
// Set to true to disable the delete button.
disableDelete: "=?",
// Force the user to enter the name before we'll delete the resource (e.g. for projects).
// Force the user to enter the name before we'll delete the project.
typeNameToConfirm: "=?",
// Optional link label. Defaults to "Delete".
label: "@?",
// Only show a delete icon with no text.
buttonOnly: "@",
// Stay on the current page without redirecting to the resource list.
// Stay on the current page without redirecting to the projects list.
stayOnCurrentPage: "=?",
// Optional replica count for a resource like a ReplicationController or ReplicaSet to display a warning.
replicas: '=?',
// Array of associated HPAs for this resource. If set, prompts the user to delete the HPA resources as well.
hpaList: "=?",
// Optional callback when the delete succeeds
success: "=?",
// Optional redirect URL when the delete succeeds
......@@ -40,23 +28,14 @@ angular.module("openshiftCommonUI")
},
templateUrl: function(elem, attr) {
if (angular.isDefined(attr.buttonOnly)) {
return "src/components/delete-link/delete-button.html";
return "src/components/delete-project/delete-project-button.html";
}
return "src/components/delete-link/delete-link.html";
return "src/components/delete-project/delete-project.html";
},
// Replace so ".dropdown-menu > li > a" styles are applied.
replace: true,
link: function(scope, element, attrs) {
if (attrs.kind === 'Project') {
scope.isProject = true;
}
// Checkbox value
scope.options = {
deleteHPAs: true
};
var showAlert = function(alert) {
if (scope.stayOnCurrentPage) {
scope.alerts[alert.name] = alert.data;
......@@ -65,32 +44,6 @@ angular.module("openshiftCommonUI")
}
};
var deleteHPA = function(hpa) {
return DataService.delete({
resource: 'horizontalpodautoscalers',
group: 'extensions'
}, hpa.metadata.name, { namespace: scope.projectName })
.then(function() {
showAlert({
name: hpa.metadata.name,
data: {
type: "success",
message: "Horizontal Pod Autoscaler " + hpa.metadata.name + " was marked for deletion."
}
});
})
.catch(function(err) {
showAlert({
name: hpa.metadata.name,
data: {
type: "error",
message: "Horizontal Pod Autoscaler " + hpa.metadata.name + " could not be deleted."
}
});
Logger.error("HPA " + hpa.metadata.name + " could not be deleted.", err);
});
};
var navigateToList = function() {
if (scope.stayOnCurrentPage) {
return;
......@@ -101,11 +54,6 @@ angular.module("openshiftCommonUI")
return;
}
if (scope.kind !== 'Project') {
$location.url(this.resourceListURL(APIService.kindToResource(scope.kind), scope.projectName));
return;
}
if ($location.path() === '/') {
scope.$emit('deleteProject');
return;
......@@ -123,27 +71,23 @@ angular.module("openshiftCommonUI")
// opening the modal with settings scope as parent
var modalInstance = $uibModal.open({
animation: true,
templateUrl: 'src/components/delete-link/delete-resource.html',
controller: 'DeleteModalController',
templateUrl: 'src/components/delete-project/delete-project-modal.html',
controller: 'DeleteProjectModalController',
scope: scope
});
modalInstance.result.then(function() {
// upon clicking delete button, delete resource and send alert
var kind = scope.kind;
var resourceName = scope.resourceName;
var typeDisplayName = scope.typeDisplayName || $filter('humanizeKind')(kind);
var formattedResource = typeDisplayName + ' ' + "\'" + (scope.displayName ? scope.displayName : resourceName) + "\'";
var context = (scope.kind === 'Project') ? {} : {namespace: scope.projectName};
var projectName = scope.projectName;
var formattedResource = "Project \'" + scope.displayName + "\'";
var context = {};
DataService.delete({
resource: APIService.kindToResource(kind),
// group or undefined
group: scope.group
}, resourceName, context)
resource: APIService.kindToResource("Project")
}, projectName, context)
.then(function() {
showAlert({
name: resourceName,
name: projectName,
data: {
type: "success",
message: _.capitalize(formattedResource) + " was marked for deletion."
......@@ -154,26 +98,11 @@ angular.module("openshiftCommonUI")
scope.success();
}
// Delete any associated HPAs if requested.
var promises = [];
if (scope.options.deleteHPAs) {
_.forEach(scope.hpaList, function(hpa) {
promises.push(deleteHPA(hpa));
});
}
if (!promises.length) {
navigateToList();
} else {
// Wait until all promises resolve so that we can add alerts to
// AlertMessageService before navigating, otherwise they aren't
// displayed.
$q.all(promises).then(navigateToList);
}
navigateToList();
})
.catch(function(err) {
// called if failure to delete
scope.alerts[resourceName] = {
scope.alerts[projectName] = {
type: "error",
message: _.capitalize(formattedResource) + "\'" + " could not be deleted.",
details: $filter('getErrorDetails')(err)
......
src/components/delete-link/deleteModal.js → src/components/delete-project/deleteProjectModal.js
......@@ -3,10 +3,10 @@
/**
* @ngdoc function
* @name openshifgCommonUI.controller:DeleteModalController
* @name openshiftCommonUI.controller:DeleteProjectModalController
*/
angular.module('openshiftCommonUI')
.controller('DeleteModalController', function ($scope, $uibModalInstance) {
.controller('DeleteProjectModalController', function ($scope, $uibModalInstance) {
$scope.delete = function() {
$uibModalInstance.close('delete');
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment