Skip to content
Snippets Groups Projects

Issue #3182311 by Xiaohua Guan, yas: Refactor Internet Gateway status messages

Merged xiaohua guan requested to merge issue/cloud-3182311:3182311--refactor-internet into 3.x
2 files
+ 72
12
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -3,7 +3,9 @@
namespace Drupal\aws_cloud\Form\Vpc;
use Drupal\aws_cloud\Form\Ec2\AwsDeleteForm;
use Drupal\cloud\Service\Util\EntityLinkWithNameHtmlGenerator;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Render\Markup;
use Drupal\cloud\Traits\CloudContentEntityTrait;
/**
@@ -36,9 +38,20 @@ class InternetGatewayAttachForm extends AwsDeleteForm {
*/
public function getDescription() {
$entity = $this->entity;
return $this->t('<h2>Internet Gateway Information:</h2><ul><li>Internet Gateway id: %id</li><li>Internet Gateway name: %name</li></ul>', [
'%id' => $entity->getInternetGatewayId(),
'%name' => $entity->getName(),
$module_name = $this->getModuleName($entity);
$internet_gateway_id = $entity->getInternetGatewayId();
$internet_gateway_link = $this->entityLinkRenderer->renderViewElement(
$internet_gateway_id,
"{$module_name}_internet_gateway",
'internet_gateway_id',
[],
'',
EntityLinkWithNameHtmlGenerator::class
);
return $this->t('<h2>Internet Gateway Information:</h2><ul><li>Internet Gateway: %internet_gateway</li></ul>', [
'%internet_gateway' => Markup::create($internet_gateway_link['#markup']),
]);
}
@@ -93,6 +106,9 @@ class InternetGatewayAttachForm extends AwsDeleteForm {
/** @var \Drupal\aws_cloud\Entity\Vpc\InternetGateway $entity */
$entity = $this->entity;
// Get module name.
$module_name = $this->getModuleName($entity);
$vpc_id = $form_state->getValue('vpc_id');
$internet_gateway_id = $entity->getInternetGatewayId();
@@ -111,9 +127,27 @@ class InternetGatewayAttachForm extends AwsDeleteForm {
$this->clearCacheValues();
$this->messenger->addStatus($this->t('The Internet Gateway %internet_gateway is attached to %vpc.', [
'%internet_gateway' => $internet_gateway_id,
'%vpc' => $vpc_id,
$internet_gateway_link = $this->entityLinkRenderer->renderViewElement(
$internet_gateway_id,
"{$module_name}_internet_gateway",
'internet_gateway_id',
[],
'',
EntityLinkWithNameHtmlGenerator::class
);
$vpc_link = $this->entityLinkRenderer->renderViewElement(
$vpc_id,
"{$module_name}_vpc",
'vpc_id',
[],
'',
EntityLinkWithNameHtmlGenerator::class
);
$this->messenger->addStatus($this->t('The Internet Gateway %internet_gateway is attached to VPC %vpc.', [
'%internet_gateway' => Markup::create($internet_gateway_link['#markup']),
'%vpc' => Markup::create($vpc_link['#markup']),
]));
$form_state->setRedirect("view.{$entity->getEntityTypeId()}.list", ['cloud_context' => $entity->getCloudContext()]);
Loading