Skip to content

feature(frontend): implement and use resource store #355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GCham5 wants to merge 9 commits into
base: main
Choose a base branch
from
Open

feature(frontend): implement and use resource store #355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6f363c0
feat(frontend): refactor actions into sharedStore
GCham5 Nov 16, 2022
402ae8b
feat: remove userId from session storage
GCham5 Nov 17, 2022
453d240
feat(frontend): add getResourceInformation to store
GCham5 Nov 17, 2022
300dc14
chore: clean up
GCham5 Nov 22, 2022
2020c49
Merge branch 'main' of https://github.com/tempus-app/tempus into feat…
GCham5 Nov 22, 2022
45858e3
feat(frontend): implement shared store
GCham5 Dec 5, 2022
ad9ce3f
feat: add remaining stores
GCham5 Dec 11, 2022
75f9281
Merge branch 'main' into feature-frontend/implement-and-use-resource-…
GCham5 Dec 11, 2022
66519fe
chore: merge fixes
GCham5 Dec 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions libs/api/shared/feature-auth/src/lib/auth.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ export class AuthService {
const tokens = await this.createTokens(user);
await this.updateRefreshTokenHash(user, tokens.refreshToken);
const partialUser: UserEntity = { ...user };
partialUser.id = null;
partialUser.password = null;
partialUser.refreshToken = null;
const result = new AuthDto(partialUser, tokens.accessToken, tokens.refreshToken);
Expand Down
11 changes: 6 additions & 5 deletions ...ess-owner/features/feature-view-projects/src/lib/view-projects/view-projects.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ import {
selectProjStatusUpdated,
updateProjStatus,
} from '@tempus/client/onboarding-client/business-owner/data-access';
import { Column, ViewProjects, ButtonType } from '@tempus/client/shared/ui-components/presentational';
import { take, Subject, takeUntil, finalize, skip } from 'rxjs';
import { CustomModalType, ModalService, ModalType } from '@tempus/client/shared/ui-components/modal';
import { FormBuilder, Validators } from '@angular/forms';
import { ErorType, ProjectStatus, RoleType } from '@tempus/shared-domain';
import {
AsyncRequestState,
OnboardingClientState,
selectLoggedInUserNameEmail,
} from '@tempus/client/onboarding-client/shared/data-access';
import { Column, ViewProjects, ButtonType } from '@tempus/client/shared/ui-components/presentational';
import { take, Subject, takeUntil, finalize, skip } from 'rxjs';
import { CustomModalType, ModalService, ModalType } from '@tempus/client/shared/ui-components/modal';
import { FormBuilder, Validators } from '@angular/forms';
import { ErorType, ProjectStatus, RoleType } from '@tempus/shared-domain';
import { isValidRole } from '@tempus/client/shared/util';

@Component({
Expand Down Expand Up @@ -192,6 +192,7 @@ export class ViewProjectsComponent implements OnInit {
});
}

// eslint-disable-next-line @typescript-eslint/member-ordering
isValidRole = isValidRole;

openErrorModal = (errorMessage: string) => {
Expand Down
60 changes: 46 additions & 14 deletions ...atures/feature-view-resource-profile/src/lib/create-new-view/create-new-view.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { Store } from '@ngrx/store';
import { TranslateService } from '@ngx-translate/core';
import { OnboardingClientResourceService } from '@tempus/client/onboarding-client/shared/data-access';
import {
createResourceView,
getAllViewsByResourceId,
OnboardingClientResourceService,
OnboardingClientState,
selectResourceViews,
selectView,
} from '@tempus/client/onboarding-client/shared/data-access';
import { EditViewFormComponent } from '@tempus/onboarding-client/shared/feature-edit-view-form';
import { RevisionType, ViewType } from '@tempus/shared-domain';
import { take } from 'rxjs';
import { Subject, takeUntil } from 'rxjs';

@Component({
selector: 'tempus-business-owner-create-new-view',
Expand All @@ -17,6 +25,7 @@ export class BusinessOwnerCreateNewViewComponent implements OnInit {
private router: Router,
private route: ActivatedRoute,
private resourceService: OnboardingClientResourceService,
private sharedStore: Store<OnboardingClientState>,
private translateService: TranslateService,
) {
const { currentLang } = translateService;
Expand All @@ -29,17 +38,30 @@ export class BusinessOwnerCreateNewViewComponent implements OnInit {

resourceId = 0;

destroyed$ = new Subject<void>();

ngOnInit(): void {
this.resourceId = parseInt(this.route.snapshot.paramMap.get('id') || '0', 10);

// New view form loaded with latest approved Primary view
this.resourceService.getResourceProfileViews(this.resourceId).subscribe(data => {
const filteredViews = data.views.filter(
view => view.viewType === ViewType.PRIMARY && view.revisionType === RevisionType.APPROVED,
);
this.newViewForm.setFormDataFromView(filteredViews[0]);
this.newViewForm.enableViewNameField();
});
this.sharedStore.dispatch(getAllViewsByResourceId({ resourceId: this.resourceId, pageNum: 0, pageSize: 1000 }));
this.sharedStore
.select(selectResourceViews)
.pipe(takeUntil(this.destroyed$))
.subscribe(data => {
const filteredViews = data.views.filter(
view => view.viewType === ViewType.PRIMARY && view.revisionType === RevisionType.APPROVED,
);
this.newViewForm.setFormDataFromView(filteredViews[0]);
this.newViewForm.enableViewNameField();
});
// this.resourceService.getResourceProfileViews(this.resourceId).subscribe(data => {
// const filteredViews = data.views.filter(
// view => view.viewType === ViewType.PRIMARY && view.revisionType === RevisionType.APPROVED,
// );
// this.newViewForm.setFormDataFromView(filteredViews[0]);
// this.newViewForm.enableViewNameField();
// });
}

submitChanges() {
Expand All @@ -50,15 +72,25 @@ export class BusinessOwnerCreateNewViewComponent implements OnInit {

createNewView() {
const newView = this.newViewForm.generateNewView();
this.resourceService
.createSecondaryView(this.resourceId, newView)
.pipe(take(1))
.subscribe(view => {
this.sharedStore.dispatch(createResourceView({ resourceId: this.resourceId, newView }));
this.sharedStore
.select(selectView)
.pipe(takeUntil(this.destroyed$))
.subscribe(resourceView => {
this.router.navigate(['../'], {
queryParams: { viewId: view.id },
queryParams: { viewId: resourceView?.id },
relativeTo: this.route,
});
});
// this.resourceService
// .createSecondaryView(this.resourceId, newView)
// .pipe(take(1))
// .subscribe(view => {
// this.router.navigate(['../'], {
// queryParams: { viewId: view.id },
// relativeTo: this.route,
// });
// });
}

closeForm() {
Expand Down
Loading