From 2a55d20eff768b6cd9c2dbd4abcc103b33e098dd Mon Sep 17 00:00:00 2001
From: Prabhat Khera <91852476+prabhat-org@users.noreply.github.com>
Date: Tue, 7 Mar 2023 21:09:41 +1300
Subject: [PATCH]  fix(annotations): minor issues in Annotations EE-4089
 (#8612)

---
 .../imageRegistry/por-image-registry.html     |  2 +-
 .../create/createApplication.html             |  4 +--
 .../create/createConfiguration.html           |  2 +-
 app/kubernetes/views/deploy/deploy.html       | 26 +++++++++----------
 app/portainer/react/components/index.ts       |  4 ++-
 .../CreateIngressView/IngressForm.tsx         |  6 ++---
 6 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/app/docker/components/imageRegistry/por-image-registry.html b/app/docker/components/imageRegistry/por-image-registry.html
index 22eab8cd5..b62036f4d 100644
--- a/app/docker/components/imageRegistry/por-image-registry.html
+++ b/app/docker/components/imageRegistry/por-image-registry.html
@@ -1,7 +1,7 @@
 <!-- use registry -->
 <div class="row">
   <div class="form-group" ng-if="$ctrl.model.UseRegistry">
-    <label for="image_registry" class="control-label col-sm-3 col-lg-2 required text-left" ng-class="$ctrl.labelClass"> Registry </label>
+    <label for="image_registry" class="control-label col-sm-3 col-lg-2 text-left" ng-class="$ctrl.labelClass"> Registry </label>
     <div ng-class="$ctrl.inputClass" class="col-sm-8">
       <select
         ng-options="registry as registry.Name for registry in $ctrl.registries track by registry.Id"
diff --git a/app/kubernetes/views/applications/create/createApplication.html b/app/kubernetes/views/applications/create/createApplication.html
index 452b6d5a0..31c8a704c 100644
--- a/app/kubernetes/views/applications/create/createApplication.html
+++ b/app/kubernetes/views/applications/create/createApplication.html
@@ -336,7 +336,7 @@
                       </div>
                     </div>
 
-                    <div class="col-sm-12 mt-4">
+                    <div class="col-sm-12 mt-2">
                       <span
                         ng-if="ctrl.formValues.Containers.length <= 1"
                         class="btn btn-primary btn-sm btn btn-sm btn-light mb-2 !ml-0"
@@ -503,7 +503,7 @@
                   </div>
 
                   <div class="form-group" ng-if="ctrl.storageClassAvailable()">
-                    <div class="col-sm-12 vertical-center pt-2.5" style="margin-top: 5px" ng-if="!ctrl.allQuotasExhaustedAndNoVolumesAvailable()">
+                    <div class="col-sm-12 vertical-center mb-2 pt-2.5" style="margin-top: 5px" ng-if="!ctrl.allQuotasExhaustedAndNoVolumesAvailable()">
                       <label class="control-label !pt-0 text-left">Persisted folders</label>
                     </div>
 
diff --git a/app/kubernetes/views/configurations/create/createConfiguration.html b/app/kubernetes/views/configurations/create/createConfiguration.html
index 8d905b2a1..d4a9fba40 100644
--- a/app/kubernetes/views/configurations/create/createConfiguration.html
+++ b/app/kubernetes/views/configurations/create/createConfiguration.html
@@ -15,7 +15,7 @@
           <form class="form-horizontal" name="kubernetesConfigurationCreationForm" autocomplete="off">
             <!-- resource-pool -->
             <div class="form-group" ng-if="ctrl.formValues.ResourcePool">
-              <label for="resource-pool-selector" class="col-sm-3 col-lg-2 control-label required text-left">Namespace</label>
+              <label for="resource-pool-selector" class="col-sm-3 col-lg-2 control-label text-left">Namespace</label>
               <div class="col-sm-8 col-lg-9">
                 <select
                   class="form-control"
diff --git a/app/kubernetes/views/deploy/deploy.html b/app/kubernetes/views/deploy/deploy.html
index b22a7f91c..cfa13c8f6 100644
--- a/app/kubernetes/views/deploy/deploy.html
+++ b/app/kubernetes/views/deploy/deploy.html
@@ -12,19 +12,7 @@
           <uib-tabset active="ctrl.state.activeTab" justified="true" type="pills">
             <uib-tab index="0">
               <uib-tab-heading> <pr-icon icon="'code'"></pr-icon> Deploy </uib-tab-heading>
-              <div class="col-sm-12 form-section-title"> Namespace </div>
-              <form class="form-horizontal mt-3" name="ctrl.deploymentForm">
-                <div class="form-group" ng-if="ctrl.formValues.Namespace">
-                  <label for="target_node" class="col-lg-2 col-sm-3 control-label text-left">Namespace</label>
-                  <div class="col-sm-8">
-                    <select
-                      ng-disabled="ctrl.formValues.namespace_toggle"
-                      class="form-control"
-                      ng-model="ctrl.formValues.Namespace"
-                      ng-options="namespace.Name as namespace.Name for namespace in ctrl.namespaces"
-                    ></select>
-                  </div>
-                </div>
+              <form class="form-horizontal mt-6" name="ctrl.deploymentForm">
                 <div class="form-group" ng-if="ctrl.formValues.Namespace">
                   <label for="toggle_logo" class="col-lg-2 col-sm-3 control-label text-left">
                     Use namespace(s) specified from manifest
@@ -40,6 +28,18 @@
                     <span class="ml-2 mb-1 switch-values" ng-if="!ctrl.formValues.namespace_toggle">No</span> -->
                   </div>
                 </div>
+                <div class="form-group" ng-if="ctrl.formValues.Namespace">
+                  <label for="target_node" class="col-lg-2 col-sm-3 control-label text-left">Namespace</label>
+                  <div class="col-sm-8">
+                    <select
+                      ng-disabled="ctrl.formValues.namespace_toggle"
+                      class="form-control"
+                      ng-model="ctrl.formValues.Namespace"
+                      ng-options="namespace.Name as namespace.Name for namespace in ctrl.namespaces"
+                    ></select>
+                  </div>
+                </div>
+
                 <div class="form-group" ng-if="!ctrl.formValues.Namespace">
                   <div class="col-sm-12 small text-warning">
                     <pr-icon icon="'alert-triangle'" mode="'warning'"></pr-icon>
diff --git a/app/portainer/react/components/index.ts b/app/portainer/react/components/index.ts
index 89acc30ce..17f6d4916 100644
--- a/app/portainer/react/components/index.ts
+++ b/app/portainer/react/components/index.ts
@@ -4,6 +4,7 @@ import { r2a } from '@/react-tools/react2angular';
 import { withCurrentUser } from '@/react-tools/withCurrentUser';
 import { withReactQuery } from '@/react-tools/withReactQuery';
 import { withUIRouter } from '@/react-tools/withUIRouter';
+import { AnnotationsBeTeaser } from '@/react/kubernetes/annotations/AnnotationsBeTeaser';
 
 import { Icon } from '@@/Icon';
 import { ReactQueryDevtoolsWrapper } from '@@/ReactQueryDevtoolsWrapper';
@@ -188,4 +189,5 @@ export const componentsModule = angular
       'value',
       'height',
     ])
-  ).name;
+  )
+  .component('annotationsBeTeaser', r2a(AnnotationsBeTeaser, [])).name;
diff --git a/app/react/kubernetes/ingresses/CreateIngressView/IngressForm.tsx b/app/react/kubernetes/ingresses/CreateIngressView/IngressForm.tsx
index 5178641c9..58733891f 100644
--- a/app/react/kubernetes/ingresses/CreateIngressView/IngressForm.tsx
+++ b/app/react/kubernetes/ingresses/CreateIngressView/IngressForm.tsx
@@ -116,7 +116,7 @@ export function IngressForm({
           <div className="form-horizontal">
             <div className="form-group">
               <label
-                className="control-label text-muted col-sm-3 col-lg-2 required"
+                className="control-label text-muted col-sm-3 col-lg-2"
                 htmlFor="namespace"
               >
                 Namespace
@@ -491,9 +491,7 @@ export function IngressForm({
 
                     <div className="form-group col-sm-3 col-xl-2 !m-0 !pl-0">
                       <div className="input-group input-group-sm">
-                        <span className="input-group-addon required">
-                          Path type
-                        </span>
+                        <span className="input-group-addon">Path type</span>
                         <Select
                           key={servicePorts.toString() + path.PathType}
                           name={`ingress_pathType_${hostIndex}_${pathIndex}`}