Skip to content

Commit

Permalink
merge from main
Browse files Browse the repository at this point in the history
  • Loading branch information
kjetilhau committed Nov 8, 2024
2 parents 030b1ef + e763969 commit 62a6689
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 15 deletions.
19 changes: 19 additions & 0 deletions .changeset/pr-853-2163110665.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@

---
"fusion-project-portal": major
---
BREAKING CHANGE:

Updates the API endpoints that gives Portal Apps as list of objects:

{portalId:guid}/apps
{portalId:guid}/contexts/{contextId:guid}/apps
Now instead, these endpoint returns a list of appKeys (strings).

The old ones:

{portalId:guid}/appkeys
{portalId:guid}/contexts/{contextId:guid}/appkeys
are now identical, and are deprecated and will be removed when front-end has adopted the updated endpoints.

In addition some refactoring has been done. As a result, compiler warnings has been greatly reduced
16 changes: 5 additions & 11 deletions .github/workflows/deploy-portal-administration-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,11 @@ jobs:
steps:
- name: Check out code
uses: actions/checkout@v4

- name: Setup Node.js
uses: actions/setup-node@v2
with:
fetch-depth: 2
node-version: "20"

- name: Get fusion token
id: "get-fusion-token"
Expand All @@ -34,21 +37,12 @@ jobs:
tenant-id: ${{secrets.AZURE_TENANT_ID}}
resource-id: ${{secrets.AZURE_FUSION_SCOPE}}

- name: Setup Node.js
uses: actions/setup-node@v2
with:
node-version: "21"

- name: Install Global
run: |
cd client
yarn install
- name: Install
run: |
cd client/apps/portal-administration
yarn install
npm i -g @equinor/fusion-framework-cli
npm i -g typescript
- name: Deploy
run: |
Expand Down
3 changes: 1 addition & 2 deletions client/apps/portal-administration/app.manifest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ import { defineAppManifest, mergeManifests } from '@equinor/fusion-framework-cli

export default defineAppManifest((env, { base }) => {
return mergeManifests(base, {
name: 'Portal Administration',
shortName: 'PA',
displayName: 'Portal Administration',
description: 'Portal Administration tool for fusion as a service',
});
});
2 changes: 1 addition & 1 deletion client/apps/portal-administration/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "portal-administration",
"version": "1.0.1",
"version": "1.0.2",
"description": "",
"private": true,
"type": "module",
Expand Down
2 changes: 1 addition & 1 deletion client/apps/portal-administration/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export default function () {
return (
<Style.Root>
<QueryClientProvider client={queryClient}>
<RouterProvider router={router} fallbackElement={<p>Router Error.</p>} />
<RouterProvider router={router} fallbackElement={<p>Router Error...</p>} />
</QueryClientProvider>
</Style.Root>
);
Expand Down

0 comments on commit 62a6689

Please sign in to comment.