From ddae98eb3c327abf8c907e940a3103d7230d9698 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fatih=20KILI=C3=87?= <fsk202@gmail.com>
Date: Tue, 3 Jan 2023 17:00:15 +0300
Subject: [PATCH 1/5] check group length to add ResetToDefault button

---
 .../feature-management/feature-management.component.html        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html
index f6a2cef89b..b739377088 100644
--- a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html
+++ b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html
@@ -111,7 +111,7 @@
   </ng-template>
 
   <ng-template #abpFooter>
-    <abp-button iconClass="fa fa-refresh" [disabled]="modalBusy" (click)="resetToDefault()">
+    <abp-button *ngIf="groups.length" iconClass="fa fa-refresh" [disabled]="modalBusy" (click)="resetToDefault()">
       {{ 'AbpFeatureManagement::ResetToDefault' | abpLocalization }}
     </abp-button>
 

From 8978662d94111de2dea755d16979498c8a741d39 Mon Sep 17 00:00:00 2001
From: selman koc <64414348+skoc10@users.noreply.github.com>
Date: Wed, 4 Jan 2023 09:04:17 +0300
Subject: [PATCH 2/5] Update common.props

---
 common.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common.props b/common.props
index 38eeb95240..f8b7c620c2 100644
--- a/common.props
+++ b/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>7.0.0-rc.6</Version>
+    <Version>7.0.0</Version>
     <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
     <PackageIconUrl>https://abp.io/assets/abp_nupkg.png</PackageIconUrl>
     <PackageProjectUrl>https://abp.io/</PackageProjectUrl>

From 32f7131714d14ffcffc459d9ed173059950dec26 Mon Sep 17 00:00:00 2001
From: muhammedaltug <muhammetaltug@gmail.com>
Date: Wed, 4 Jan 2023 09:45:07 +0300
Subject: [PATCH 3/5] fix scrollbar

---
 .../feature-management.component.html         | 183 ++++++++++--------
 1 file changed, 97 insertions(+), 86 deletions(-)

diff --git a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html
index b739377088..8927ee6cb2 100644
--- a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html
+++ b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html
@@ -5,113 +5,124 @@
 
   <ng-template #abpBody>
     <div class="row">
-      <div class="col-md-4">
-        <ul
-          ngbNav
-          #nav="ngbNav"
-          [(activeId)]="selectedGroupDisplayName"
-          class="nav-pills"
-          orientation="vertical"
-        >
-          <li
-            *ngFor="let group of groups; trackBy: track.by('name')"
-            [ngbNavItem]="group.displayName"
+      <ng-container *ngIf="groups.length">
+        <div class="col-md-4">
+          <ul
+            ngbNav
+            #nav="ngbNav"
+            [(activeId)]="selectedGroupDisplayName"
+            class="nav-pills"
+            orientation="vertical"
           >
-            <a ngbNavLink>{{ group.displayName }}</a>
-            <ng-template ngbNavContent>
-              <h4>{{ selectedGroupDisplayName }}</h4>
-              <hr class="mt-2 mb-3" />
+            <li
+              *ngFor="let group of groups; trackBy: track.by('name')"
+              [ngbNavItem]="group.displayName"
+            >
+              <a ngbNavLink>{{ group.displayName }}</a>
+              <ng-template ngbNavContent>
+                <h4>{{ selectedGroupDisplayName }}</h4>
+                <hr class="mt-2 mb-3" />
 
-              <div
-                class="mt-2"
-                *ngFor="let feature of features[group.name]; let i = index; trackBy: track.by('id')"
-                [ngStyle]="feature.style"
-                [ngSwitch]="feature.valueType?.name"
-                (keyup.enter)="save()"
-              >
-                <ng-container *ngSwitchCase="valueTypes.ToggleStringValueType">
-                  <div class="form-check">
-                    <input
-                      class="form-check-input"
-                      type="checkbox"
-                      [id]="feature.name"
-                      [(ngModel)]="feature.value"
-                      (ngModelChange)="onCheckboxClick($event, feature)"
-                    />
+                <div
+                  class="mt-2"
+                  *ngFor="
+                    let feature of features[group.name];
+                    let i = index;
+                    trackBy: track.by('id')
+                  "
+                  [ngStyle]="feature.style"
+                  [ngSwitch]="feature.valueType?.name"
+                  (keyup.enter)="save()"
+                >
+                  <ng-container *ngSwitchCase="valueTypes.ToggleStringValueType">
+                    <div class="form-check">
+                      <input
+                        class="form-check-input"
+                        type="checkbox"
+                        [id]="feature.name"
+                        [(ngModel)]="feature.value"
+                        (ngModelChange)="onCheckboxClick($event, feature)"
+                      />
 
-                    <label class="form-check-label" [htmlFor]="feature.name">{{
-                      feature.displayName
-                    }}</label>
-                    <ng-container
-                      *ngTemplateOutlet="descTmp; context: { $implicit: feature.description }"
-                    ></ng-container>
-                  </div>
-                </ng-container>
-                <ng-container *ngSwitchCase="valueTypes.FreeTextStringValueType">
-                  <div class="mb-3 form-group">
-                    <label [htmlFor]="feature.name" class="form-label">{{
-                      feature.displayName
-                    }}</label>
-                    <input
-                      class="form-control"
-                      type="text"
-                      [id]="feature.name"
-                      [(ngModel)]="feature.value"
-                      [abpFeatureManagementFreeText]="feature"
-                    />
-
-                    <ng-container
-                      *ngTemplateOutlet="descTmp; context: { $implicit: feature.description }"
-                    ></ng-container>
-                  </div>
-                </ng-container>
-                <ng-container *ngSwitchCase="valueTypes.SelectionStringValueType">
-                  <ng-container *ngIf="feature.valueType.itemSource?.items?.length">
+                      <label class="form-check-label" [htmlFor]="feature.name">{{
+                        feature.displayName
+                      }}</label>
+                      <ng-container
+                        *ngTemplateOutlet="descTmp; context: { $implicit: feature.description }"
+                      ></ng-container>
+                    </div>
+                  </ng-container>
+                  <ng-container *ngSwitchCase="valueTypes.FreeTextStringValueType">
                     <div class="mb-3 form-group">
                       <label [htmlFor]="feature.name" class="form-label">{{
                         feature.displayName
                       }}</label>
-                      <select class="form-select" [id]="feature.name" [(ngModel)]="feature.value">
-                        <option
-                          *ngFor="
-                            let item of feature.valueType.itemSource?.items;
-                            trackBy: track.by('value')
-                          "
-                          [ngValue]="item.value"
-                        >
-                          {{
-                            item.displayText?.resourceName + '::' + item.displayText?.name
-                              | abpLocalization
-                          }}
-                        </option>
-                      </select>
+                      <input
+                        class="form-control"
+                        type="text"
+                        [id]="feature.name"
+                        [(ngModel)]="feature.value"
+                        [abpFeatureManagementFreeText]="feature"
+                      />
+
                       <ng-container
                         *ngTemplateOutlet="descTmp; context: { $implicit: feature.description }"
                       ></ng-container>
                     </div>
                   </ng-container>
-                </ng-container>
-                <ng-container *ngSwitchDefault>{{ feature.displayName }}</ng-container>
-              </div>
-            </ng-template>
-          </li>
-        </ul>
-      </div>
+                  <ng-container *ngSwitchCase="valueTypes.SelectionStringValueType">
+                    <ng-container *ngIf="feature.valueType.itemSource?.items?.length">
+                      <div class="mb-3 form-group">
+                        <label [htmlFor]="feature.name" class="form-label">{{
+                          feature.displayName
+                        }}</label>
+                        <select class="form-select" [id]="feature.name" [(ngModel)]="feature.value">
+                          <option
+                            *ngFor="
+                              let item of feature.valueType.itemSource?.items;
+                              trackBy: track.by('value')
+                            "
+                            [ngValue]="item.value"
+                          >
+                            {{
+                              item.displayText?.resourceName + '::' + item.displayText?.name
+                                | abpLocalization
+                            }}
+                          </option>
+                        </select>
+                        <ng-container
+                          *ngTemplateOutlet="descTmp; context: { $implicit: feature.description }"
+                        ></ng-container>
+                      </div>
+                    </ng-container>
+                  </ng-container>
+                  <ng-container *ngSwitchDefault>{{ feature.displayName }}</ng-container>
+                </div>
+              </ng-template>
+            </li>
+          </ul>
+        </div>
 
-      <ng-template #descTmp let-description>
-        <small *ngIf="description" class="d-block form-text text-muted">{{ description }}</small>
-      </ng-template>
+        <ng-template #descTmp let-description>
+          <small *ngIf="description" class="d-block form-text text-muted">{{ description }}</small>
+        </ng-template>
 
-      <div class="col-md-8"><div [ngbNavOutlet]="nav"></div></div>
+        <div class="col-md-8"><div [ngbNavOutlet]="nav"></div></div>
+      </ng-container>
 
-      <div class="mx-3" *ngIf="!groups.length">
+      <div class="col" *ngIf="!groups.length">
         {{ 'AbpFeatureManagement::NoFeatureFoundMessage' | abpLocalization }}
       </div>
     </div>
   </ng-template>
 
   <ng-template #abpFooter>
-    <abp-button *ngIf="groups.length" iconClass="fa fa-refresh" [disabled]="modalBusy" (click)="resetToDefault()">
+    <abp-button
+      *ngIf="groups.length"
+      iconClass="fa fa-refresh"
+      [disabled]="modalBusy"
+      (click)="resetToDefault()"
+    >
       {{ 'AbpFeatureManagement::ResetToDefault' | abpLocalization }}
     </abp-button>
 

From 4fe222691c1c64f16756bfa0dcd06e48524190dd Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Wed, 4 Jan 2023 15:26:19 +0800
Subject: [PATCH 4/5] Update JSON.md

https://github.com/abpframework/abp/issues/10591#issuecomment-1370050436
---
 docs/en/JSON.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/en/JSON.md b/docs/en/JSON.md
index 27693bafda..2501c6cf45 100644
--- a/docs/en/JSON.md
+++ b/docs/en/JSON.md
@@ -66,3 +66,9 @@ Add [Volo.Abp.Json.Newtonsoft](https://www.nuget.org/packages/Volo.Abp.Json.Newt
 #### AbpNewtonsoftJsonSerializerOptions
 
 - **JsonSerializerSettings(`Newtonsoft.Json.JsonSerializerSettings`)**: Global options for Newtonsoft library operations. See [here](https://www.newtonsoft.com/json/help/html/T_Newtonsoft_Json_JsonSerializerSettings.htm) for reference.
+
+## Configuring JSON options in ASP.NET Core
+
+You can change the JSON behavior in ASP.NET Core by configuring [`JsonOptions`](https://docs.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.mvc.jsonoptions) or
+[MvcNewtonsoftJsonOptions](https://learn.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.mvc.mvcnewtonsoftjsonoptions)(if you use `Newtonsoft.Json`)
+

From 1cffa48b4642a9879d5a50e7f5c07e31ab65f734 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Wed, 4 Jan 2023 15:27:11 +0800
Subject: [PATCH 5/5] Update JSON.md

---
 docs/en/JSON.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/JSON.md b/docs/en/JSON.md
index 2501c6cf45..d4fc550982 100644
--- a/docs/en/JSON.md
+++ b/docs/en/JSON.md
@@ -69,6 +69,6 @@ Add [Volo.Abp.Json.Newtonsoft](https://www.nuget.org/packages/Volo.Abp.Json.Newt
 
 ## Configuring JSON options in ASP.NET Core
 
-You can change the JSON behavior in ASP.NET Core by configuring [`JsonOptions`](https://docs.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.mvc.jsonoptions) or
+You can change the JSON behavior in ASP.NET Core by configuring [JsonOptions](https://docs.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.mvc.jsonoptions) or
 [MvcNewtonsoftJsonOptions](https://learn.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.mvc.mvcnewtonsoftjsonoptions)(if you use `Newtonsoft.Json`)