@if (!isMobile()) {
@@ -36,164 +36,73 @@
}
-
-
-
-
-
- |
- Title
-
- |
- Contributors |
-
- Modified
-
- |
-
-
-
-
- |
-
-
- {{ project.title }}
-
- |
- {{ getContributorsList(project) }} |
- {{ project.dateModified | date: "MMM d, y, h:mm a" }} |
-
-
-
-
-
-
-
-
- |
- Title
-
- |
- Contributors |
-
- Modified
-
- |
-
-
-
-
- |
-
-
- {{ project.title }}
-
- |
- {{ getContributorsList(project) }} |
- {{ project.dateModified | date: "MMM d, y, h:mm a" }} |
-
-
-
-
-
-
-
-
- |
- Title
-
- |
- Contributors |
-
- Modified
-
- |
-
-
-
-
- | {{ project.title }} |
- {{ getContributorsList(project) }} |
- {{ project.dateModified | date: "MMM d, y, h:mm a" }} |
-
-
-
-
- You don't have any bookmarks. Click the bookmark icon on projects or
- registrations to add them here.
-
+ @if (!bookmarks().length && !isLoading()) {
+
+ You don't have any bookmarks. Click the bookmark icon on projects
+ or registrations to add them here.
+
+ } @else {
+
+ }
diff --git a/src/app/features/my-projects/my-projects.component.ts b/src/app/features/my-projects/my-projects.component.ts
index b2a9fdf36..8fdcaf079 100644
--- a/src/app/features/my-projects/my-projects.component.ts
+++ b/src/app/features/my-projects/my-projects.component.ts
@@ -1,47 +1,59 @@
import {
ChangeDetectionStrategy,
Component,
- computed,
+ DestroyRef,
+ effect,
inject,
OnInit,
signal,
+ untracked,
} from '@angular/core';
import { SubHeaderComponent } from '@shared/components/sub-header/sub-header.component';
-import { toSignal } from '@angular/core/rxjs-interop';
+import { toSignal, takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { IS_MEDIUM, IS_WEB, IS_XSMALL } from '@shared/utils/breakpoints.tokens';
import { DropdownModule } from 'primeng/dropdown';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { FormsModule } from '@angular/forms';
import { Select } from 'primeng/select';
import { Tab, TabList, TabPanel, TabPanels, Tabs } from 'primeng/tabs';
import { TabOption } from '@shared/entities/tab-option.interface';
-import { SearchInputComponent } from '@shared/components/search-input/search-input.component';
-import { Project } from '@osf/features/home/models/project.entity';
-import { DatePipe, NgClass } from '@angular/common';
-import { TableModule } from 'primeng/table';
+import { TablePageEvent } from 'primeng/table';
+import type { SortEvent } from 'primeng/api';
import { DialogService } from 'primeng/dynamicdialog';
import { AddProjectFormComponent } from './add-project-form/add-project-form.component';
-import { GetProjects, HomeSelectors } from 'src/app/features/home/store';
import { Store } from '@ngxs/store';
-import { Router, RouterOutlet } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
+import {
+ GetMyProjects,
+ MyProjectsSelectors,
+ ClearMyProjects,
+ GetMyRegistrations,
+ GetMyPreprints,
+ GetBookmarksCollectionId,
+ GetMyBookmarks,
+} from '@core/store/my-projects';
+import { debounceTime, distinctUntilChanged, Subject } from 'rxjs';
+import { MyProjectsSearchFilters } from '@osf/features/my-projects/entities/my-projects-search-filters.models';
+import { TableParameters } from '@shared/entities/table-parameters.interface';
+import { MY_PROJECTS_TABLE_PARAMS } from '@core/constants/my-projects-table.constants';
+import { parseQueryFilterParams } from '@core/helpers/http.helper';
+import { SortOrder } from '@shared/utils/sort-order.enum';
+import { MyProjectsItem } from '@osf/features/my-projects/entities/my-projects.entities';
+import { QueryParams } from '@osf/shared/entities/query-params.interface';
+import { MyProjectsTableComponent } from '@shared/components/my-projects-table/my-projects-table.component';
@Component({
selector: 'osf-my-projects',
imports: [
SubHeaderComponent,
DropdownModule,
- ReactiveFormsModule,
+ FormsModule,
Select,
Tab,
TabList,
TabPanel,
TabPanels,
Tabs,
- SearchInputComponent,
- FormsModule,
- DatePipe,
- TableModule,
- NgClass,
- RouterOutlet,
+ MyProjectsTableComponent,
],
templateUrl: './my-projects.component.html',
styleUrl: './my-projects.component.scss',
@@ -49,10 +61,15 @@ import { Router, RouterOutlet } from '@angular/router';
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class MyProjectsComponent implements OnInit {
+ readonly #destroyRef = inject(DestroyRef);
readonly #dialogService = inject(DialogService);
readonly #store = inject(Store);
readonly #router = inject(Router);
+ readonly #route = inject(ActivatedRoute);
+ readonly #searchSubject = new Subject
();
+
protected readonly defaultTabValue = 0;
+ protected readonly isLoading = signal(false);
protected readonly isDesktop = toSignal(inject(IS_WEB));
protected readonly isTablet = toSignal(inject(IS_MEDIUM));
protected readonly isMobile = toSignal(inject(IS_XSMALL));
@@ -62,38 +79,317 @@ export class MyProjectsComponent implements OnInit {
{ label: 'My Preprints', value: 2 },
{ label: 'Bookmarks', value: 3 },
];
+
+ protected readonly queryParams = toSignal(this.#route.queryParams);
+ protected readonly currentPage = signal(1);
+ protected readonly currentPageSize = signal(MY_PROJECTS_TABLE_PARAMS.rows);
protected readonly searchValue = signal('');
+ protected readonly selectedTab = signal(this.defaultTabValue);
+ protected readonly activeProject = signal(null);
+ protected readonly sortColumn = signal(undefined);
+ protected readonly sortOrder = signal(SortOrder.Asc);
+ protected readonly tableParams = signal({
+ ...MY_PROJECTS_TABLE_PARAMS,
+ firstRowIndex: 0,
+ });
+
protected readonly projects = this.#store.selectSignal(
- HomeSelectors.getProjects,
+ MyProjectsSelectors.getProjects,
);
- protected readonly selectedTab = signal(this.defaultTabValue);
- readonly activeProject = signal(null);
-
- filteredProjects = computed(() => {
- const search = this.searchValue().toLowerCase();
- return this.projects().filter(
- (project) =>
- project.title.toLowerCase().includes(search) ||
- project.bibliographicContributors.some((i) =>
- i.users.familyName.toLowerCase().includes(search),
- ),
- );
- });
+ protected readonly registrations = this.#store.selectSignal(
+ MyProjectsSelectors.getRegistrations,
+ );
+ protected readonly preprints = this.#store.selectSignal(
+ MyProjectsSelectors.getPreprints,
+ );
+ protected readonly bookmarks = this.#store.selectSignal(
+ MyProjectsSelectors.getBookmarks,
+ );
+ protected readonly totalProjectsCount = this.#store.selectSignal(
+ MyProjectsSelectors.getTotalProjectsCount,
+ );
+ protected readonly totalRegistrationsCount = this.#store.selectSignal(
+ MyProjectsSelectors.getTotalRegistrationsCount,
+ );
+ protected readonly totalPreprintsCount = this.#store.selectSignal(
+ MyProjectsSelectors.getTotalPreprintsCount,
+ );
+ protected readonly totalBookmarksCount = this.#store.selectSignal(
+ MyProjectsSelectors.getTotalBookmarksCount,
+ );
+
+ protected readonly bookmarksCollectionId = this.#store.selectSignal(
+ MyProjectsSelectors.getBookmarksCollectionId,
+ );
+
+ constructor() {
+ this.#setupQueryParamsEffect();
+ this.#setupSearchSubscription();
+ this.#setupTotalRecordsEffect();
+ this.#setupCleanup();
+ }
+
+ ngOnInit(): void {
+ this.#store.dispatch(new GetBookmarksCollectionId());
+ }
+
+ #setupCleanup(): void {
+ this.#destroyRef.onDestroy(() => {
+ this.#store.dispatch(new ClearMyProjects());
+ });
+ }
+
+ #setupSearchSubscription(): void {
+ this.#searchSubject
+ .pipe(
+ debounceTime(300),
+ distinctUntilChanged(),
+ takeUntilDestroyed(this.#destroyRef),
+ )
+ .subscribe((searchValue) => {
+ this.#handleSearch(searchValue);
+ });
+ }
+
+ #setupTotalRecordsEffect(): void {
+ effect(() => {
+ const totalRecords = this.#getTotalRecordsForCurrentTab();
+ untracked(() => {
+ this.#updateTableParams({ totalRecords });
+ });
+ });
+ }
+
+ #getTotalRecordsForCurrentTab(): number {
+ switch (this.selectedTab()) {
+ case 0:
+ return this.totalProjectsCount();
+ case 1:
+ return this.totalRegistrationsCount();
+ case 2:
+ return this.totalPreprintsCount();
+ case 3:
+ return this.totalBookmarksCount();
+ default:
+ return 0;
+ }
+ }
+
+ #setupQueryParamsEffect(): void {
+ effect(() => {
+ const params = this.queryParams();
+ if (!params) return;
+
+ const { page, size, search, sortColumn, sortOrder } =
+ parseQueryFilterParams(params);
+
+ this.#updateComponentState({ page, size, search, sortColumn, sortOrder });
+ this.#fetchDataForCurrentTab({
+ page,
+ size,
+ search,
+ sortColumn,
+ sortOrder,
+ });
+ });
+ }
+
+ #updateComponentState(params: QueryParams): void {
+ untracked(() => {
+ const size = params.size || MY_PROJECTS_TABLE_PARAMS.rows;
+
+ this.currentPage.set(params.page ?? 1);
+ this.currentPageSize.set(size);
+ this.searchValue.set(params.search || '');
+ this.sortColumn.set(params.sortColumn);
+ this.sortOrder.set(params.sortOrder ?? SortOrder.Asc);
- getContributorsList(item: Project) {
- return this.projects()
- .find((i) => i.id === item.id)
- ?.bibliographicContributors.map((i) => i.users.familyName)
- .join(', ');
+ this.#updateTableParams({
+ rows: size,
+ firstRowIndex: ((params.page ?? 1) - 1) * size,
+ });
+ });
+ }
+
+ #updateTableParams(updates: Partial): void {
+ this.tableParams.update((current) => ({
+ ...current,
+ ...updates,
+ }));
+ }
+
+ #fetchDataForCurrentTab(params: QueryParams): void {
+ this.isLoading.set(true);
+ const filters = this.#createFilters(params);
+ const pageNumber = params.page ?? 1;
+ const pageSize = params.size ?? MY_PROJECTS_TABLE_PARAMS.rows;
+
+ let action$;
+ switch (this.selectedTab()) {
+ case 0:
+ action$ = this.#store.dispatch(
+ new GetMyProjects(pageNumber, pageSize, filters),
+ );
+ break;
+ case 1:
+ action$ = this.#store.dispatch(
+ new GetMyRegistrations(pageNumber, pageSize, filters),
+ );
+ break;
+ case 2:
+ action$ = this.#store.dispatch(
+ new GetMyPreprints(pageNumber, pageSize, filters),
+ );
+ break;
+ case 3:
+ if (this.bookmarksCollectionId()) {
+ action$ = this.#store.dispatch(
+ new GetMyBookmarks(
+ this.bookmarksCollectionId(),
+ pageNumber,
+ pageSize,
+ filters,
+ ),
+ );
+ }
+ break;
+ }
+
+ action$?.pipe(takeUntilDestroyed(this.#destroyRef)).subscribe({
+ complete: () => {
+ this.isLoading.set(false);
+ },
+ error: () => {
+ this.isLoading.set(false);
+ },
+ });
+
+ // switch (this.selectedTab()) {
+ // case 0:
+ // this.#store.dispatch(new GetMyProjects(pageNumber, pageSize, filters));
+ // break;
+ // case 1:
+ // this.#store.dispatch(
+ // new GetMyRegistrations(pageNumber, pageSize, filters),
+ // );
+ // break;
+ // case 2:
+ // this.#store.dispatch(new GetMyPreprints(pageNumber, pageSize, filters));
+ // break;
+ // case 3:
+ // if (this.bookmarksCollectionId()) {
+ // this.#store.dispatch(
+ // new GetMyBookmarks(
+ // this.bookmarksCollectionId(),
+ // pageNumber,
+ // pageSize,
+ // filters,
+ // ),
+ // );
+ // }
+ // break;
+ // }
}
- createProject(): void {
- let dialogWidth = '850px';
+ #createFilters(params: QueryParams): MyProjectsSearchFilters {
+ return {
+ searchValue: params.search || '',
+ searchFields: ['title', 'tags', 'description'],
+ sortColumn: params.sortColumn,
+ sortOrder: params.sortOrder,
+ };
+ }
+
+ #handleSearch(searchValue: string): void {
+ const currentParams = this.queryParams() || {};
+ this.#updateQueryParams({
+ search: searchValue,
+ page: 1,
+ sortColumn: currentParams['sortColumn'],
+ sortOrder:
+ currentParams['sortOrder'] === 'desc' ? SortOrder.Desc : SortOrder.Asc,
+ });
+ }
+
+ #updateQueryParams(updates: Partial): void {
+ const currentParams = this.queryParams() || {};
+ const queryParams: Record = {};
+
+ if ('page' in updates || currentParams['page']) {
+ queryParams['page'] = updates.page?.toString() ?? currentParams['page'];
+ }
+ if ('size' in updates || currentParams['size']) {
+ queryParams['size'] = updates.size?.toString() ?? currentParams['size'];
+ }
+
+ if ('search' in updates || currentParams['search']) {
+ const search = updates.search ?? currentParams['search'];
+ if (search) {
+ queryParams['search'] = search;
+ }
+ }
- if (this.isMobile()) {
- dialogWidth = '95vw';
+ if ('sortColumn' in updates) {
+ if (updates.sortColumn) {
+ queryParams['sortColumn'] = updates.sortColumn;
+ queryParams['sortOrder'] =
+ updates.sortOrder === SortOrder.Desc ? 'desc' : 'asc';
+ }
+ } else if (currentParams['sortColumn']) {
+ queryParams['sortColumn'] = currentParams['sortColumn'];
+ queryParams['sortOrder'] = currentParams['sortOrder'];
}
+ this.#router.navigate([], {
+ relativeTo: this.#route,
+ queryParams,
+ });
+ }
+
+ protected onSearchChange(value: string): void {
+ this.searchValue.set(value);
+ this.#searchSubject.next(value);
+ }
+
+ protected onPageChange(event: TablePageEvent): void {
+ const page = Math.floor(event.first / event.rows) + 1;
+ const currentParams = this.queryParams() || {};
+
+ this.#updateQueryParams({
+ page,
+ size: event.rows,
+ sortColumn: currentParams['sortColumn'],
+ sortOrder:
+ currentParams['sortOrder'] === 'desc' ? SortOrder.Desc : SortOrder.Asc,
+ });
+ }
+
+ protected onSort(event: SortEvent): void {
+ if (event.field) {
+ this.#updateQueryParams({
+ sortColumn: event.field,
+ sortOrder: event.order === -1 ? SortOrder.Desc : SortOrder.Asc,
+ });
+ }
+ }
+
+ protected onTabChange(tabIndex: number): void {
+ this.#store.dispatch(new ClearMyProjects());
+ this.selectedTab.set(tabIndex);
+ const currentParams = this.queryParams() || {};
+
+ this.#updateQueryParams({
+ page: 1,
+ size: currentParams['size'],
+ search: '',
+ sortColumn: undefined,
+ sortOrder: undefined,
+ });
+ }
+
+ protected createProject(): void {
+ const dialogWidth = this.isMobile() ? '95vw' : '850px';
+
this.#dialogService.open(AddProjectFormComponent, {
width: dialogWidth,
focusOnShow: false,
@@ -104,12 +400,8 @@ export class MyProjectsComponent implements OnInit {
});
}
- navigateToProject(project: Project): void {
+ protected navigateToProject(project: MyProjectsItem): void {
this.activeProject.set(project);
this.#router.navigate(['/my-projects', project.id]);
}
-
- ngOnInit() {
- this.#store.dispatch(GetProjects);
- }
}
diff --git a/src/app/features/my-projects/my-projects.service.ts b/src/app/features/my-projects/my-projects.service.ts
index 7eb9e1cdd..ce9a73a3d 100644
--- a/src/app/features/my-projects/my-projects.service.ts
+++ b/src/app/features/my-projects/my-projects.service.ts
@@ -1,6 +1,132 @@
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
+import { JsonApiService } from '@core/services/json-api/json-api.service';
+import { Observable } from 'rxjs';
+import { MyProjectsSearchFilters } from '@osf/features/my-projects/entities/my-projects-search-filters.models';
+import { MyProjectsMapper } from '@osf/features/my-projects/mappers/my-projects.mapper';
+import {
+ MyProjectsItemResponse,
+ MyProjectsItemGetResponse,
+ MyProjectsJsonApiResponse,
+ SparseCollectionsResponse,
+} from '@osf/features/my-projects/entities/my-projects.entities';
+import { map } from 'rxjs/operators';
+import { SortOrder } from '@shared/utils/sort-order.enum';
+import { EndpointType } from '@osf/features/my-projects/entities/my-projects.types';
@Injectable({
providedIn: 'root',
})
-export class MyProjectsService {}
+export class MyProjectsService {
+ #baseUrl = 'https://api.staging4.osf.io/v2/';
+ #jsonApiService = inject(JsonApiService);
+ #sortFieldMap: Record = {
+ title: 'title',
+ dateModified: 'date_modified',
+ };
+
+ #getMyItems(
+ endpoint: EndpointType,
+ filters?: MyProjectsSearchFilters,
+ pageNumber?: number,
+ pageSize?: number,
+ ): Observable {
+ const params: Record = {
+ 'embed[]': ['bibliographic_contributors'],
+ [`fields[${endpoint}]`]:
+ 'title,date_modified,public,bibliographic_contributors',
+ 'fields[users]': 'family_name,full_name,given_name,middle_name',
+ };
+
+ if (filters?.searchValue && filters.searchFields?.length) {
+ params[`filter[${filters.searchFields.join(',')}]`] = filters.searchValue;
+ }
+
+ if (pageNumber) {
+ params['page'] = pageNumber;
+ }
+
+ if (pageSize) {
+ params['page[size]'] = pageSize;
+ }
+
+ if (filters?.sortColumn && this.#sortFieldMap[filters.sortColumn]) {
+ const apiField = this.#sortFieldMap[filters.sortColumn];
+ const sortPrefix = filters.sortOrder === SortOrder.Desc ? '-' : '';
+ params['sort'] = `${sortPrefix}${apiField}`;
+ } else {
+ params['sort'] = '-date_modified';
+ }
+
+ const url = endpoint.startsWith('collections/')
+ ? this.#baseUrl + endpoint
+ : this.#baseUrl + 'users/me/' + endpoint;
+
+ return this.#jsonApiService
+ .get(url, params)
+ .pipe(
+ map((response: MyProjectsJsonApiResponse) => ({
+ data: response.data.map((item: MyProjectsItemGetResponse) =>
+ MyProjectsMapper.fromResponse(item),
+ ),
+ links: response.links,
+ })),
+ );
+ }
+
+ getMyProjects(
+ filters?: MyProjectsSearchFilters,
+ pageNumber?: number,
+ pageSize?: number,
+ ): Observable {
+ return this.#getMyItems('nodes', filters, pageNumber, pageSize);
+ }
+
+ getBookmarksCollectionId(): Observable {
+ const params: Record = {
+ 'fields[collections]': 'title,bookmarks',
+ };
+
+ return this.#jsonApiService
+ .get(this.#baseUrl + 'collections', params)
+ .pipe(
+ map((response) => {
+ const bookmarksCollection = response.data.find(
+ (collection) =>
+ collection.attributes.title === 'Bookmarks' &&
+ collection.attributes.bookmarks,
+ );
+ return bookmarksCollection?.id ?? '';
+ }),
+ );
+ }
+
+ getMyRegistrations(
+ filters?: MyProjectsSearchFilters,
+ pageNumber?: number,
+ pageSize?: number,
+ ): Observable {
+ return this.#getMyItems('registrations', filters, pageNumber, pageSize);
+ }
+
+ getMyPreprints(
+ filters?: MyProjectsSearchFilters,
+ pageNumber?: number,
+ pageSize?: number,
+ ): Observable {
+ return this.#getMyItems('preprints', filters, pageNumber, pageSize);
+ }
+
+ getMyBookmarks(
+ collectionId: string,
+ filters?: MyProjectsSearchFilters,
+ pageNumber?: number,
+ pageSize?: number,
+ ): Observable {
+ return this.#getMyItems(
+ `collections/${collectionId}/linked_nodes`,
+ filters,
+ pageNumber,
+ pageSize,
+ );
+ }
+}
diff --git a/src/app/features/settings/addons/addons.service.ts b/src/app/features/settings/addons/addons.service.ts
index 7fb7452b0..39aba6b0e 100644
--- a/src/app/features/settings/addons/addons.service.ts
+++ b/src/app/features/settings/addons/addons.service.ts
@@ -42,7 +42,9 @@ export class AddonsService {
if (!currentUser) throw new Error('Current user not found');
const userUri = `https://staging4.osf.io/${currentUser.id}`;
- const params = { 'filter[user_uri]': userUri };
+ const params = {
+ 'filter[user_uri]': userUri,
+ };
return this.#jsonApiService
.get<
@@ -55,10 +57,13 @@ export class AddonsService {
addonType: string,
referenceId: string,
): Observable {
+ const params = {
+ [`fields[external-${addonType}-services]`]: 'external_service_name',
+ };
return this.#jsonApiService
.get<
JsonApiResponse
- >(this.#baseUrl + `user-references/${referenceId}/authorized_${addonType}_accounts?include=external-${addonType}-service`)
+ >(this.#baseUrl + `user-references/${referenceId}/authorized_${addonType}_accounts?include=external-${addonType}-service`, params)
.pipe(
map((response) => {
return response.data.map((item) =>
diff --git a/src/app/features/settings/addons/entities/addons.entities.ts b/src/app/features/settings/addons/entities/addons.entities.ts
index 3c6435d75..6fb69262b 100644
--- a/src/app/features/settings/addons/entities/addons.entities.ts
+++ b/src/app/features/settings/addons/entities/addons.entities.ts
@@ -11,18 +11,12 @@ export interface AddonGetResponse {
};
relationships: {
addon_imp: {
- links: {
- related: string;
- };
data: {
type: string;
id: string;
};
};
};
- links: {
- self: string;
- };
}
export interface AuthorizedAddonGetResponse {
@@ -39,46 +33,24 @@ export interface AuthorizedAddonGetResponse {
};
relationships: {
account_owner: {
- links: {
- related: string;
- };
data: {
type: string;
id: string;
};
};
- authorized_operations: {
- links: {
- related: string;
- };
- };
- configured_storage_addons: {
- links: {
- related: string;
- };
- };
external_storage_service?: {
- links: {
- related: string;
- };
data: {
type: string;
id: string;
};
};
external_citation_service?: {
- links: {
- related: string;
- };
data: {
type: string;
id: string;
};
};
};
- links: {
- self: string;
- };
}
export interface Addon {
@@ -117,18 +89,12 @@ export interface IncludedAddonData {
relationships?: Record<
string,
{
- links: {
- related: string;
- };
data?: {
type: string;
id: string;
};
}
>;
- links?: {
- self: string;
- };
}
export interface UserReference {
@@ -137,31 +103,6 @@ export interface UserReference {
attributes: {
user_uri: string;
};
- relationships: {
- authorized_storage_accounts: {
- links: {
- related: string;
- };
- };
- authorized_citation_accounts: {
- links: {
- related: string;
- };
- };
- authorized_computing_accounts: {
- links: {
- related: string;
- };
- };
- configured_resources: {
- links: {
- related: string;
- };
- };
- };
- links: {
- self: string;
- };
}
export interface AddonRequest {
@@ -214,30 +155,16 @@ export interface AddonResponse {
};
relationships: {
account_owner: {
- links: {
- related: string;
- };
data: {
type: 'user-references';
id: string;
};
};
- authorized_operations: {
- links: {
- related: string;
- };
- };
external_storage_service: {
- links: {
- related: string;
- };
data: {
type: string;
id: string;
};
};
};
- links: {
- self: string;
- };
}
diff --git a/src/app/features/settings/tokens/entities/tokens.models.ts b/src/app/features/settings/tokens/entities/tokens.models.ts
index bb278dae6..b1cee985b 100644
--- a/src/app/features/settings/tokens/entities/tokens.models.ts
+++ b/src/app/features/settings/tokens/entities/tokens.models.ts
@@ -19,10 +19,6 @@ export interface TokenCreateResponse {
scopes: string;
owner: string;
};
- links: {
- html: string;
- self: string;
- };
}
// API Response Model for GET request
@@ -34,10 +30,6 @@ export interface TokenGetResponse {
scopes: string;
owner: string;
};
- links: {
- html: string;
- self: string;
- };
}
// Domain Models
@@ -47,6 +39,4 @@ export interface Token {
tokenId: string;
scopes: string[];
ownerId: string;
- htmlUrl: string;
- apiUrl: string;
}
diff --git a/src/app/features/settings/tokens/token.mapper.ts b/src/app/features/settings/tokens/token.mapper.ts
index 3bd6de110..60060c003 100644
--- a/src/app/features/settings/tokens/token.mapper.ts
+++ b/src/app/features/settings/tokens/token.mapper.ts
@@ -25,8 +25,6 @@ export class TokenMapper {
tokenId: response.attributes.token_id,
scopes: response.attributes.scopes.split(' '),
ownerId: response.attributes.owner,
- htmlUrl: response.links.html,
- apiUrl: response.links.self,
};
}
@@ -37,8 +35,6 @@ export class TokenMapper {
tokenId: response.id,
scopes: response.attributes.scopes.split(' '),
ownerId: response.attributes.owner,
- htmlUrl: response.links.html,
- apiUrl: response.links.self,
};
}
}
diff --git a/src/app/shared/components/my-projects-table/my-projects-table.component.html b/src/app/shared/components/my-projects-table/my-projects-table.component.html
new file mode 100644
index 000000000..2c61deb38
--- /dev/null
+++ b/src/app/shared/components/my-projects-table/my-projects-table.component.html
@@ -0,0 +1,86 @@
+
+
+ @if (isLoading()) {
+
+
+
+ |
+ Title
+
+ |
+ Contributors |
+
+ Modified
+
+ |
+
+
+
+
+ |
+
+ |
+
+
+
+ } @else {
+
+
+
+ |
+ Title
+
+ |
+ Contributors |
+
+ Modified
+
+ |
+
+
+
+
+ |
+
+
+ {{ item.title }}
+
+ |
+
+ @for (contributor of item.contributors; track contributor) {
+ {{ contributor.fullName }}{{ $last ? "" : ", " }}
+ }
+ |
+ {{ item.dateModified | date: "MMM d, y, h:mm a" }} |
+
+
+
+ }
+