Skip to content
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

Jump to bottom

Feature/10670 import service from altinn 2 #11384

Merged
31 commits merged into from
Oct 25, 2023
Merged

Feature/10670 import service from altinn 2 #11384

31 commits merged into from
Oct 25, 2023

Conversation

ghost
Copy link

@ghost ghost commented Oct 18, 2023

Description

  • Implementing functionality to import resources from Altinn 2 to Altinn 3.
  • Added tests for all new code.
  • @TheTechArch has implemented the backend.

Related Issue(s)

Verification

  • Your code builds clean without any errors or warnings
  • Manual testing done (required)

wrt95 and others added 20 commits October 16, 2023 10:33
@wrt95
adding basic frontend logic
0456634
@TheTechArch
spll check
e8d8f07
@TheTechArch
typofix
5320b4c
@TheTechArch
Fixed spelling
a37d497
@wrt95
Adding style
e2536e1
@TheTechArch
Fixed ttd handling
0fedcff
@wrt95
Adding handling for service
bb4cbb5
@wrt95
Merge branch 'feature/10670-import-service-from-Altinn-2' of https://…
5e261e6 
…github.com/Altinn/altinn-studio into feature/10670-import-service-from-Altinn-2
@wrt95
fixing code
5f10eb9
@TheTechArch
Fixed cache key
0ad0bb2
@TheTechArch
Changed to post for import
ebb2bc3
@wrt95
Trying to set up import
66c19d5
@wrt95
Merge branch 'feature/10670-import-service-from-Altinn-2' of https://…
880b5d8 
…github.com/Altinn/altinn-studio into feature/10670-import-service-from-Altinn-2
@wrt95
Trying to fix undefined
f2639ef
@wrt95
fixing undefined
13ac020
@wrt95
updating post
52602c7
@wrt95
Cleaning up cod
b8c75de
@wrt95
Adding tests
395e27a
@wrt95
fixing queriesMock
a4d40d8
@wrt95
rollback useGetResourceList
f84ed59
@ghost ghost requested review from TheTechArch and framitdavid October 18, 2023 12:15
@ghost ghost self-assigned this Oct 18, 2023
@github-actions github-actions bot added the solution/studio/designer Issues related to the Altinn Studio Designer solution. label Oct 18, 2023
@codecov
Copy link

codecov bot commented Oct 18, 2023 •
edited
Loading

Codecov Report

Attention: 24 lines in your changes are missing coverage. Please review.

Comparison is base (801c58d) 82.73% compared to head (fc0e87e) 82.76%.
Report is 5 commits behind head on master.

❗ Current head fc0e87e differs from pull request most recent head daa76b2. Consider uploading reports for the commit daa76b2 to get more accurate results

Additional details and impacted files 
@@            Coverage Diff             @@
##           master   #11384      +/-   ##
==========================================
+ Coverage   82.73%   82.76%   +0.02%     
==========================================
  Files         828      837       +9     
  Lines       12524    12589      +65     
  Branches     1674     1679       +5     
==========================================
+ Hits        10362    10419      +57     
- Misses       1900     1908       +8     
  Partials      262      262
Files Coverage Δ
...nd/dashboard/pages/CreateService/CreateService.tsx 96.77% <100.00%> (+0.05%) ⬆️
frontend/packages/shared/src/api/paths.js 100.00% <100.00%> (ø)
frontend/packages/shared/src/api/queries.ts 98.11% <100.00%> (+0.03%) ⬆️
frontend/packages/shared/src/enums/ServerCodes.ts 100.00% <100.00%> (ø)
frontend/packages/shared/src/mocks/queriesMock.ts 100.00% <ø> (ø)
frontend/packages/shared/src/types/QueryKey.ts 100.00% <ø> (ø)
...ourceModal/ServiceContent/ResourceContent/index.ts 100.00% <100.00%> (ø)
...ortResourceModal/ServiceContent/ServiceContent.tsx 100.00% <100.00%> (ø)
...onents/ImportResourceModal/ServiceContent/index.ts 100.00% <100.00%> (ø)
...components/ResourceNameAndId/ResourceNameAndId.tsx 84.00% <ø> (ø)
... and 11 more

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@github-actions github-actions bot added the quality/testing Tests that are missing, needs to be created or could be improved. label Oct 19, 2023
@ghost ghost removed their assignment Oct 20, 2023
@ghost ghost assigned framitdavid Oct 20, 2023
framitdavid
framitdavid requested changes Oct 23, 2023
View reviewed changes
Copy link
Collaborator

@framitdavid framitdavid left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will continue as the first thing tomorrow. It's a little late now. 😴

frontend/language/src/nb.json Outdated Show resolved Hide resolved
frontend/resourceadm/components/ImportResourceModal/ImportResourceModal.tsx Outdated Show resolved Hide resolved
frontend/resourceadm/components/ImportResourceModal/ImportResourceModal.tsx Outdated Show resolved Hide resolved
frontend/resourceadm/components/ImportResourceModal/ImportResourceModal.tsx Outdated Show resolved Hide resolved
frontend/resourceadm/components/ImportResourceModal/ServiceContent/ServiceContent.module.css Outdated Show resolved Hide resolved
...esourceadm/components/ImportResourceModal/ServiceContent/ResourceContent/ResourceContent.tsx Outdated Show resolved Hide resolved
framitdavid
framitdavid approved these changes Oct 24, 2023
View reviewed changes
Copy link
Collaborator

@framitdavid framitdavid left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great work! I just have a few things for considerations.

frontend/resourceadm/components/ImportResourceModal/ImportResourceModal.tsx Outdated Show resolved Hide resolved
...esourceadm/components/ImportResourceModal/ServiceContent/ResourceContent/ResourceContent.tsx Outdated Show resolved Hide resolved
...esourceadm/components/ImportResourceModal/ServiceContent/ResourceContent/ResourceContent.tsx Outdated Show resolved Hide resolved
framitdavid
framitdavid approved these changes Oct 24, 2023
View reviewed changes
Copy link
Collaborator

@framitdavid framitdavid left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! 👏

@github-actions github-actions bot added the area/dashboard Area: Related to the dashboard label Oct 24, 2023
framitdavid
framitdavid approved these changes Oct 24, 2023
View reviewed changes
Copy link
Collaborator

@framitdavid framitdavid left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💯

github-advanced-security[bot]
github-advanced-security bot found potential problems Oct 24, 2023
View reviewed changes
backend/src/Designer/Controllers/ResourceAdminController.cs
Comment on lines +275 to +282
if (OrgUtil.IsTestEnv(org))
{
linkServices = unfiltered.Where(a => a.ServiceType.Equals(ServiceType.Link) && (a.ServiceOwnerCode.ToLower().Equals(org.ToLower()) || a.ServiceOwnerCode.ToLower().Equals("acn"))).ToList();
}
else
{
linkServices = unfiltered.Where(a => a.ServiceType.Equals(ServiceType.Link) && a.ServiceOwnerCode.ToLower().Equals(org.ToLower())).ToList();
}

Check notice

Code scanning / CodeQL

Missed ternary opportunity Note

Both branches of this 'if' statement write to the same variable - consider using '?' to express intent better.
@ghost ghost merged commit 48f9b25 into master Oct 25, 2023
9 checks passed
@ghost ghost deleted the feature/10670-import-service-from-Altinn-2 branch October 25, 2023 06:09
nkylstad pushed a commit that referenced this pull request Nov 1, 2023
@TheTechArch @nkylstad
Feature/10670 import service from altinn 2 (#11384)
de75623 
* adding basic frontend logic

* spll check

* typofix

* Fixed spelling

* Adding style

* Fixed ttd handling

* Adding handling for service

* fixing code

* Fixed cache key

* Changed to post for import

* Trying to set up import

* Trying to fix undefined

* fixing undefined

* updating post

* Cleaning up cod

* Adding tests

* fixing queriesMock

* rollback useGetResourceList

* dotnet format

* Fixed method

* Fixing modal z index and SetupTab

* Fixing feedback fromPR

* Adding ServerCode enum

* Feedback. Added util fo rcommmon org code

---------

Co-authored-by: Rune T. Larsen <rune@hjemmekino.no>
nkylstad pushed a commit that referenced this pull request Nov 5, 2023
@TheTechArch @nkylstad
Feature/10670 import service from altinn 2 (#11384)
7277040 
* adding basic frontend logic

* spll check

* typofix

* Fixed spelling

* Adding style

* Fixed ttd handling

* Adding handling for service

* fixing code

* Fixed cache key

* Changed to post for import

* Trying to set up import

* Trying to fix undefined

* fixing undefined

* updating post

* Cleaning up cod

* Adding tests

* fixing queriesMock

* rollback useGetResourceList

* dotnet format

* Fixed method

* Fixing modal z index and SetupTab

* Fixing feedback fromPR

* Adding ServerCode enum

* Feedback. Added util fo rcommmon org code

---------

Co-authored-by: Rune T. Larsen <rune@hjemmekino.no>
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TheTechArch TheTechArch Awaiting requested review from TheTechArch

Assignees

@framitdavid framitdavid

Labels
area/dashboard Area: Related to the dashboard quality/testing Tests that are missing, needs to be created or could be improved. solution/studio/designer Issues related to the Altinn Studio Designer solution.
Projects
Team Studio
Archived in project
Team Tilgangsinfo
Status: ✅✅Closed
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@TheTechArch @framitdavid @wrt95