Merge branch 'main' into feature/api-fusion-apps-migrate

CHANGELOG.md

@@ -1,5 +1,27 @@
 # fusion-project-portal
 
+## 5.0.0
+
+### Major Changes
+
+- d96ab34: - BREAKING CHANGE: The previous proxy endpoint: `/bundles/apps/{appKey}/resources/{*resourcePath}` is no more. Instead use `/fusion-apps/{*wildcard*}` to make proxy calls against the whole Fusion Apps API. See Fusion Apps API Swagger documentation for more information about routes.
+  - Migrated proxy from Fusion Portal to Fusion Apps API
+  - Updated packages to latest version
+  - Refactored and simplified code
+  - Removed unused Project Portal variables in frontend
+  - Update frontend to use the new proxy endpoints
+  - Make frontend client use the new types provided by fusion core
+  - Update the legacy app loader to use the new proxy endpoints and and fix types
+  - Move legacy app code to apps folder for cleaner repository
+  - Setup build of legacy app loader in build pipeline for constant build an deployment.
+  - Update all Fusion dependencies for frontend client
+
+### Patch Changes
+
+- b3edf8a: Fix errors and add data owner on milestones
+- cc5f76c: Rename meetings tab to meeting actions
+- 4a4eba3: Update api version on meeting actions to the newest version.
+
 ## 4.1.4
 
 ### Patch Changes

client/packages/components/src/components/task/Tasks.tsx

@@ -51,7 +51,7 @@ export const Tasks: FC<TasksProps> = ({ height }) => {
 					<TabNav>
 						<Tabs.Tab>All ({assignments.length})</Tabs.Tab>
 						<Tabs.Tab>
-							Meetings
+							Meeting Actions
 							{isLoading.meetingsActions ? (
 								<Style.CircularProgress size={16} />
 							) : (

client/packages/components/src/components/task/hooks/use-assignment.ts

@@ -1,7 +1,7 @@
 import { useFramework } from '@equinor/fusion-framework-react';
 import { useQuery } from 'react-query';
 import { getPimsTasks } from '../work-assigned/assignment-queries';
-import { getMyMeetingsActions, getMyReviewActions } from '../queries/fusion-meetings-queries';
+import { getMyMeetingsActions, getMyReviewActions, myMeetingsActionSelector } from '../queries/fusion-meetings-queries';
 import { getQueryAndNCRequest } from '../queries/query-ncr-request-queries';
 import { Task } from '../types/task';
 import { getFusionTasks, getProCoSysAssignments } from '../queries/fusion-task-queries';
@@ -95,6 +95,7 @@ export function useMeetingsActionsQuery() {
 	return useQuery({
 		queryKey: ['Assignment', 'Meetings', 'Meetings-Actions'],
 		queryFn: async ({ signal }) => getMyMeetingsActions(await client, signal),
+		select: myMeetingsActionSelector,
 		cacheTime: 5000 * 60,
 		refetchInterval: 5000 * 60,
 		staleTime: 2000 * 60,

client/packages/components/src/components/task/queries/fusion-meetings-queries.ts

@@ -2,7 +2,7 @@ import { IHttpClient } from '@equinor/fusion-framework-module-http';
 import { Task } from '../types/task';
 
 import { verifyDate } from '../utils/time';
-import { ActionState, MeetingAction } from '../types/meetings-task';
+import { ActionState, MeetingAction, MeetingType } from '../types/meetings-task';
 import { isTaskOverdue } from './query-ncr-request-queries';
 
 function stripHtml(html?: string) {
@@ -11,11 +11,14 @@ function stripHtml(html?: string) {
 	return tmp.textContent || tmp.innerText || '';
 }
 
-export async function getMyMeetingsActions(client: IHttpClient, signal?: AbortSignal): Promise<Task[]> {
-	const response = await client.fetch('/persons/me/actions', { signal });
+export async function getMyMeetingsActions(client: IHttpClient, signal?: AbortSignal): Promise<MeetingAction[]> {
+	const response = await client.fetch('/persons/me/actions?api-version=4.0', { signal });
 
 	const tasks: MeetingAction[] = await response.json();
+	return tasks;
+}
 
+export function myMeetingsActionSelector(tasks: MeetingAction[]): Task[] {
 	return tasks
 		.filter((a) => a.state !== ActionState.Completed && a.state !== ActionState.NotCompleted)
 		.map((task) => ({

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fusion-project-portal",
-  "version": "4.1.4",
+  "version": "5.0.0",
   "license": "MIT",
   "description": "Project Portal powered by Fusion",
   "devDependencies": {