Skip to content

Commit

Permalink
Release 3.43.1
Browse files Browse the repository at this point in the history
  • Loading branch information
tomwwinter authored Dec 4, 2024
2 parents 8c9c39a + 1debe1d commit aceb2c2
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 14 deletions.
17 changes: 15 additions & 2 deletions .github/workflows/pull-request-update-or-push-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -146,12 +146,12 @@ jobs:
- linux/arm64
os:
- ubuntu-latest
- [self-hosted, Linux, ARM64]
- [ self-hosted, Linux, ARM64 ]
exclude:
- platform: linux/arm64
os: ubuntu-latest
- platform: linux/amd64
os: [self-hosted, Linux, ARM64]
os: [ self-hosted, Linux, ARM64 ]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout repository files
Expand Down Expand Up @@ -210,6 +210,10 @@ jobs:
env:
SOURCE_DATE_EPOCH: 0

- uses: actions/setup-node@v4
with:
node-version: 20

- name: Install Sentry CLI
run: |
npm install -g @sentry/cli
Expand Down Expand Up @@ -276,6 +280,10 @@ jobs:
if: ${{ github.event.ref == '' }}
run: echo "TAG=pr-${{ github.event.number }}" >> $GITHUB_ENV

- uses: actions/setup-node@v4
with:
node-version: 20

- name: Install Sentry CLI
run: |
npm install -g @sentry/cli
Expand Down Expand Up @@ -343,11 +351,16 @@ jobs:
if: ${{ github.event.ref == '' }}
run: echo "TAG=pr-${{ github.event.number }}" >> $GITHUB_ENV

- uses: actions/setup-node@v4
with:
node-version: 20

- name: Install Sentry CLI
run: |
npm install -g @sentry/cli
- name: Create Release
if: ${{ github.event.ref != '' }} # only send "official" releases to Sentry
run: |
sentry-cli releases new "ndb-core@${{ env.TAG }}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -231,9 +231,11 @@ describe("EntityFormService", () => {
@DatabaseField() get getterField(): string {
return this._getterValue;
}

set getterField(value) {
this._getterValue = value;
}

private _getterValue: string = "original value";

@DatabaseField() emptyField;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,8 @@ export class EntityFormService {
for (const [key, value] of Object.entries(form.getRawValue())) {
if (value !== null) {
updatedEntity[key] = value;
} else {
delete updatedEntity[key];
}
}

Expand Down
4 changes: 4 additions & 0 deletions src/app/core/permissions/ability/ability.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,10 @@ export class AbilityService extends LatestEntityLoader<Config<DatabaseRules>> {
rules: DatabaseRule[],
): Promise<DatabaseRule[]> {
const sessionInfo: SessionInfo = this.sessionInfo.value;
if (!sessionInfo) {
// for unauthenticated users, no user variables are available and interpolated
return rules;
}

const user = await firstValueFrom(
// only emit once user entity is loaded (or "null" for user account without entity)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
angularticsAction="app_navigation_link_click"
[angularticsLabel]="item.label"
[routerLink]="item.link ? [item.link] : undefined"
class="indent-item"
[class.matched-background]="item.link === activeLink"
[class.indent-item]="item.link === activeLink"
(click)="toggleSubMenu()"
>
<a class="flex-row gap-small">
Expand Down
2 changes: 2 additions & 0 deletions src/app/core/ui/navigation/menu-item/menu-item.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,6 @@
margin-left: 8px;
padding-left: 8px;
width: auto;
border-end-end-radius: 0;
border-start-end-radius: 0;
}
15 changes: 4 additions & 11 deletions src/app/features/public-form/public-form.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import {
import { EntityFormComponent } from "../../core/common-components/entity-form/entity-form/entity-form.component";
import { MatButtonModule } from "@angular/material/button";
import { ConfigService } from "../../core/config/config.service";
import { EntitySchemaService } from "../../core/entity/schema/entity-schema.service";
import { MatSnackBar } from "@angular/material/snack-bar";
import { MatCardModule } from "@angular/material/card";
import { UntilDestroy, untilDestroyed } from "@ngneat/until-destroy";
Expand Down Expand Up @@ -43,7 +42,6 @@ export class PublicFormComponent<E extends Entity> implements OnInit {
private entityMapper: EntityMapperService,
private entityFormService: EntityFormService,
private configService: ConfigService,
private entitySchemaService: EntitySchemaService,
private snackbar: MatSnackBar,
) {}

Expand Down Expand Up @@ -139,14 +137,9 @@ export class PublicFormComponent<E extends Entity> implements OnInit {

private async initForm() {
this.entity = new this.entityType();
this.entityFormService
.createEntityForm(
[].concat(...this.fieldGroups.map((group) => group.fields)),
this.entity,
)
.then((value) => {
this.form = value;
const formControls = this.form.formGroup.controls;
});
this.form = await this.entityFormService.createEntityForm(
[].concat(...this.fieldGroups.map((group) => group.fields)),
this.entity,
);
}
}

0 comments on commit aceb2c2

Please sign in to comment.