Merge pull request #12805 from wy65701436/fix-resource-order

udpate resource list order

src/common/dao/label.go

@@ -60,7 +60,7 @@ func ListLabels(query *models.LabelQuery) ([]*models.Label, error) {
 			qs = qs.Offset((query.Page - 1) * query.Size)
 		}
 	}
-	qs = qs.OrderBy("Name")
+	qs = qs.OrderBy("-CreationTime")
 
 	labels := []*models.Label{}
 	_, err := qs.All(&labels)

src/common/dao/notification/notification_policy.go

@@ -32,7 +32,7 @@ func GetNotificationPolicyByName(name string, projectID int64) (*models.Notifica
 // GetNotificationPolicies returns all notification policy in project
 func GetNotificationPolicies(projectID int64) ([]*models.NotificationPolicy, error) {
 	var policies []*models.NotificationPolicy
-	qs := dao.GetOrmer().QueryTable(new(models.NotificationPolicy)).Filter("ProjectID", projectID)
+	qs := dao.GetOrmer().QueryTable(new(models.NotificationPolicy)).Filter("ProjectID", projectID).OrderBy("-CreationTime")
 
 	_, err := qs.All(&policies)
 	if err != nil {

src/replication/dao/policy.go

@@ -61,7 +61,7 @@ func GetPolicies(queries ...*model.PolicyQuery) (int64, []*models.RepPolicy, err
 	if query.Page > 0 && query.Size > 0 {
 		qs = qs.Limit(query.Size, (query.Page-1)*query.Size)
 	}
-	_, err = qs.All(&policies)
+	_, err = qs.OrderBy("-CreationTime").All(&policies)
 	if err != nil {
 		return total, nil, err
 	}

src/replication/dao/policy_test.go

@@ -97,7 +97,7 @@ func TestGetPolicies(t *testing.T) {
 	}{
 		{name: "GetTotalOfRepPolicies nil", args: args{name: "Test 0"}, wantPolicies: []*models.RepPolicy{}},
 		{name: "GetTotalOfRepPolicies 1", args: args{name: "Test 1"}, wantPolicies: []*models.RepPolicy{testPolic1}},
-		{name: "GetTotalOfRepPolicies 2", args: args{name: "Test", page: 1, pageSize: 2}, wantPolicies: []*models.RepPolicy{testPolic1, testPolic2}},
+		{name: "GetTotalOfRepPolicies 2", args: args{name: "Test", page: 1, pageSize: 2}, wantPolicies: []*models.RepPolicy{testPolic3, testPolic2}},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {