From fc11044fd956c1814c8980aa7fe8aec4bd9d6f01 Mon Sep 17 00:00:00 2001
From: Daishan Peng <daishan@rancher.com>
Date: Thu, 19 Apr 2018 11:50:37 -0700
Subject: [PATCH] improve catalog status

---
 apis/management.cattle.io/v3/catalog_types.go | 3 ---
 apis/management.cattle.io/v3/schema/schema.go | 3 +++
 apis/project.cattle.io/v3/app_types.go        | 3 +--
 status/status.go                              | 1 +
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apis/management.cattle.io/v3/catalog_types.go b/apis/management.cattle.io/v3/catalog_types.go
index d497b7d5..10245a29 100644
--- a/apis/management.cattle.io/v3/catalog_types.go
+++ b/apis/management.cattle.io/v3/catalog_types.go
@@ -71,16 +71,13 @@ type TemplateSpec struct {
 	CatalogID                string `json:"catalogId,omitempty" norman:"type=reference[catalog]"`
 	DefaultTemplateVersionID string `json:"defaultTemplateVersionId,omitempty" norman:"type=reference[templateVersion]"`
 
-	IsSystem       string `json:"isSystem,omitempty"`
 	Description    string `json:"description,omitempty"`
 	DefaultVersion string `json:"defaultVersion,omitempty" yaml:"default_version,omitempty"`
 	Path           string `json:"path,omitempty"`
 	Maintainer     string `json:"maintainer,omitempty"`
-	License        string `json:"license,omitempty"`
 	ProjectURL     string `json:"projectURL,omitempty" yaml:"project_url,omitempty"`
 	UpgradeFrom    string `json:"upgradeFrom,omitempty"`
 	FolderName     string `json:"folderName,omitempty"`
-	Base           string `json:"templateBase"`
 	Icon           string `json:"icon,omitempty"`
 	IconFilename   string `json:"iconFilename,omitempty"`
 	Readme         string `json:"readme,omitempty"`
diff --git a/apis/management.cattle.io/v3/schema/schema.go b/apis/management.cattle.io/v3/schema/schema.go
index 3c7447dd..02fd0927 100644
--- a/apis/management.cattle.io/v3/schema/schema.go
+++ b/apis/management.cattle.io/v3/schema/schema.go
@@ -65,6 +65,9 @@ func catalogTypes(schemas *types.Schemas) *types.Schemas {
 				"refresh": {},
 			}
 		}).
+		AddMapperForType(&Version, v3.Template{},
+			m.DisplayName{},
+		).
 		MustImport(&Version, v3.Template{}).
 		MustImport(&Version, v3.TemplateVersion{}).
 		MustImport(&Version, v3.TemplateContent{})
diff --git a/apis/project.cattle.io/v3/app_types.go b/apis/project.cattle.io/v3/app_types.go
index a1fe3312..b9440874 100644
--- a/apis/project.cattle.io/v3/app_types.go
+++ b/apis/project.cattle.io/v3/app_types.go
@@ -27,8 +27,7 @@ type AppSpec struct {
 }
 
 var (
-	AppConditionInstalled condition.Cond = "installed"
-	AppConditionUpdated   condition.Cond = "updated"
+	AppConditionInstalled condition.Cond = "Installed"
 )
 
 type AppStatus struct {
diff --git a/status/status.go b/status/status.go
index fafc53aa..8ca2e2f8 100644
--- a/status/status.go
+++ b/status/status.go
@@ -47,6 +47,7 @@ var transitioningMap = map[string]string{
 	"Pending":                     "pending",
 	"PodScheduled":                "scheduling",
 	"Provisioned":                 "provisioning",
+	"Refreshed":                   "refreshed",
 	"Registered":                  "registering",
 	"Removed":                     "removing",
 	"Saved":                       "saving",