Browse Source

Merge pull request #15100 from abpframework/auto-merge/rel-7-0/1585

Merge branch dev with rel-7.0
pull/15101/head
Muhammed Altuğ 4 years ago
committed by GitHub
parent
commit
acef02beb8
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 14
      docs/en/Getting-Started-React-Native.md
  2. 2
      npm/ng-packs/package.json
  3. 4
      npm/ng-packs/packages/components/tree/src/lib/components/tree.component.ts
  4. 2
      npm/ng-packs/packages/core/package.json
  5. 1
      npm/ng-packs/packages/core/src/lib/tests/for.directive.spec.ts

14
docs/en/Getting-Started-React-Native.md

@ -95,6 +95,20 @@ A React Native application running on an Android emulator or a physical phone **
Run the backend application as described in the [getting started document](Getting-Started.md).
> You should turn off the "Https Restriction" if you're using OpenIddict as a central identity management solution. Because the IOS Simulator doesn't support self-signed certificates and OpenIddict is set to only work with HTTPS by default.
## How to disable the Https-only settings of OpenIddict
Go to MyProjectNameHttpApiHostModule.cs under the host project. Add put these codes under the `PreConfigureServices` function.
```csharp
#if DEBUG
PreConfigure<OpenIddictServerBuilder>(options => {
options.UseAspNetCore()
.DisableTransportSecurityRequirement();
});
#endif
```
## How to Configure & Run the React Native Application

2
npm/ng-packs/package.json

@ -104,7 +104,7 @@
"jest-environment-jsdom": "28.1.1",
"jest-preset-angular": "12.2.2",
"jsonc-parser": "^2.3.0",
"just-clone": "^3.2.1",
"just-clone": "^6.1.1",
"just-compare": "^1.4.0",
"lerna": "^4.0.0",
"lint-staged": "^13.0.3",

4
npm/ng-packs/packages/components/tree/src/lib/components/tree.component.ts

@ -68,13 +68,13 @@ export class TreeComponent implements OnInit {
}
private loadStyle() {
if (disableTreeStyleLoading) {
if (this.disableTreeStyleLoading) {
return;
}
const loaded$ = this.lazyLoadService.load(
LOADING_STRATEGY.AppendAnonymousStyleToHead('ng-zorro-antd-tree.css'),
);
subscriptionService.addOne(loaded$);
this.subscriptionService.addOne(loaded$);
}
onSelectedNodeChange(node) {

2
npm/ng-packs/packages/core/package.json

@ -9,7 +9,7 @@
"dependencies": {
"@abp/utils": "~7.0.0-rc.4",
"angular-oauth2-oidc": "^15.0.1",
"just-clone": "^3.2.1",
"just-clone": "^6.1.1",
"just-compare": "^1.4.0",
"ts-toolbelt": "6.15.4",
"tslib": "^2.0.0"

1
npm/ng-packs/packages/core/src/lib/tests/for.directive.spec.ts

@ -1,6 +1,5 @@
import { SpectatorDirective, createDirectiveFactory } from '@ngneat/spectator/jest';
import { ForDirective } from '../directives/for.directive';
import { uuid } from '../utils';
describe('ForDirective', () => {
let spectator: SpectatorDirective<ForDirective>;

Loading…
Cancel
Save