Skip to content

Commit 4f2de9f

Browse files
johnforelandjohnforeland
committed
re-formatted
1 parent 00564a1 commit 4f2de9f

File tree

153 files changed

+756
-2804
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

153 files changed

+756
-2804
lines changed

‎bin/check-version.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ const pjson = require('../package.json');
33

44
const version = pjson.engines.node;
55
if (!semver.satisfies(process.version, version)) {
6-
console.log(
7-
`\n\nRequired node version ${version} not satisfied with current version ${process.version}.\n\n`
8-
);
6+
console.log(`\n\nRequired node version ${version} not satisfied with current version ${process.version}.\n\n`);
97
process.exit(1);
108
}

‎config/ssdx-config.json

+1-5
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,5 @@
66
"unpackagable": "unpackagable",
77
"package-key": ".ssdx/.packageKey"
88
},
9-
"permsets_to_assign": [
10-
"Arbeidsgiver_Base_Group",
11-
"Arbeidsgiver_Admin_Group",
12-
"Create_reports_and_dashboards"
13-
]
9+
"permsets_to_assign": ["Arbeidsgiver_Base_Group", "Arbeidsgiver_Admin_Group", "Create_reports_and_dashboards"]
1410
}

‎config/users/community.json

+1-5
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66
"EmailEncodingKey": "UTF-8",
77
"LanguageLocaleKey": "NO",
88
"profileName": "NAV Kontor No IP Range",
9-
"permsets": [
10-
"Arbeidsgiver_Base_Group",
11-
"Arbeidsgiver_tabsForStandardObjects",
12-
"Create_reports_and_dashboards"
13-
],
9+
"permsets": ["Arbeidsgiver_Base_Group", "Arbeidsgiver_tabsForStandardObjects", "Create_reports_and_dashboards"],
1410
"generatePassword": true
1511
}

‎config/users/nav_employee.json

+1-5
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66
"EmailEncodingKey": "UTF-8",
77
"LanguageLocaleKey": "NO",
88
"profileName": "NAV Kontor No IP Range",
9-
"permsets": [
10-
"Arbeidsgiver_Base_Group",
11-
"Arbeidsgiver_tabsForStandardObjects",
12-
"Create_reports_and_dashboards"
13-
],
9+
"permsets": ["Arbeidsgiver_Base_Group", "Arbeidsgiver_tabsForStandardObjects", "Create_reports_and_dashboards"],
1410
"generatePassword": true
1511
}

‎config/users/pull_request.json

+1-5
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66
"EmailEncodingKey": "UTF-8",
77
"LanguageLocaleKey": "NO",
88
"profileName": "Standard Platform User",
9-
"permsets": [
10-
"Arbeidsgiver_Base_Group",
11-
"Arbeidsgiver_tabsForStandardObjects",
12-
"Create_reports_and_dashboards"
13-
],
9+
"permsets": ["Arbeidsgiver_Base_Group", "Arbeidsgiver_tabsForStandardObjects", "Create_reports_and_dashboards"],
1410
"generatePassword": true
1511
}

‎force-app/components/accountMessages/classes/AccountMessagesController.cls

+9-37
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,8 @@ public with sharing class AccountMessagesController {
33
public static AccountMessagesWrapper getData(String recordId) {
44
Account account = getAccount(recordId);
55

6-
if (
7-
account.INT_IsBankrupt__c == true ||
8-
account.INT_IsInForcedSettlementOrResolution__c == true
9-
) {
10-
AccountMessagesWrapper wrapper = convertAccountHistoryToWrapper(
11-
account
12-
);
6+
if (account.INT_IsBankrupt__c == true || account.INT_IsInForcedSettlementOrResolution__c == true) {
7+
AccountMessagesWrapper wrapper = convertAccountHistoryToWrapper(account);
138

149
return wrapper;
1510
}
@@ -20,23 +15,15 @@ public with sharing class AccountMessagesController {
2015
@AuraEnabled
2116
public static Account getAccount(Id recordId) {
2217
Id currentId;
23-
Account parent = [
24-
SELECT ParentId
25-
FROM Account
26-
WHERE Id = :recordId
27-
LIMIT 1
28-
];
18+
Account parent = [SELECT ParentId FROM Account WHERE Id = :recordId LIMIT 1];
2919
if (parent.ParentId != null) {
3020
currentId = parent.ParentId;
3121
} else {
3222
currentId = recordId;
3323
}
3424

3525
Account currentAccount = [
36-
SELECT
37-
Id,
38-
INT_IsBankrupt__c,
39-
INT_IsInForcedSettlementOrResolution__c
26+
SELECT Id, INT_IsBankrupt__c, INT_IsInForcedSettlementOrResolution__c
4027
FROM Account
4128
WHERE Id = :currentId
4229
LIMIT 1
@@ -47,28 +34,19 @@ public with sharing class AccountMessagesController {
4734

4835
@AuraEnabled
4936
public static Account findRelatedAccount(Id accountId, String value) {
50-
Account currentAccount = [
51-
SELECT Name
52-
FROM Account
53-
WHERE Id = :accountId
54-
LIMIT 1
55-
][0];
37+
Account currentAccount = [SELECT Name FROM Account WHERE Id = :accountId LIMIT 1][0];
5638
String newAccountName = currentAccount.Name + value;
5739
Account newAccount = [
5840
SELECT Id, Name
5941
FROM Account
60-
WHERE
61-
Name = :newAccountName
62-
AND INT_OrganizationalStructure__c = 'AAFY'
42+
WHERE Name = :newAccountName AND INT_OrganizationalStructure__c = 'AAFY'
6343
];
6444

6545
return newAccount;
6646
}
6747

6848
@AuraEnabled
69-
public static AccountMessagesWrapper convertAccountHistoryToWrapper(
70-
Account account
71-
) {
49+
public static AccountMessagesWrapper convertAccountHistoryToWrapper(Account account) {
7250
String value = 'Denne virksomheten er ';
7351
Id accountId = account.Id;
7452
Account relatedAccount;
@@ -80,18 +58,12 @@ public with sharing class AccountMessagesController {
8058
value = value + 'konkurs';
8159
}
8260
if (account.INT_IsInForcedSettlementOrResolution__c) {
83-
relatedAccount = findRelatedAccount(
84-
accountId,
85-
' TVANGSAVVIKLINGSBO'
86-
);
61+
relatedAccount = findRelatedAccount(accountId, ' TVANGSAVVIKLINGSBO');
8762
relatedAccountId = relatedAccount.Id;
8863
value = value + 'under tvangsavvikling';
8964
}
9065

91-
AccountMessagesWrapper wrapper = new AccountMessagesWrapper(
92-
relatedAccountId,
93-
value
94-
);
66+
AccountMessagesWrapper wrapper = new AccountMessagesWrapper(relatedAccountId, value);
9567

9668
return wrapper;
9769
}

‎force-app/components/accountMessages/classes/AccountMessagesController_Test.cls

+11-38
Original file line numberDiff line numberDiff line change
@@ -18,48 +18,21 @@ private without sharing class AccountMessagesController_Test {
1818
update acts;
1919

2020
Test.StartTest();
21-
AccountMessagesWrapper result = AccountMessagesController.getData(
22-
acts[0].Id
23-
);
24-
AccountMessagesWrapper accountIsNull = AccountMessagesController.getData(
25-
acts[6].Id
26-
);
27-
Account getBankruptAccount = AccountMessagesController.getAccount(
28-
acts[0].Id
29-
);
30-
Account getBankruptParent = AccountMessagesController.getAccount(
31-
acts[1].Id
32-
);
33-
Account getRelatedAccount = AccountMessagesController.findRelatedAccount(
34-
acts[1].Id,
35-
' KONKURSBO'
36-
);
37-
Account getRelatedAccount2 = AccountMessagesController.findRelatedAccount(
38-
acts[3].Id,
39-
' TVANGSAVVIKLINGSBO'
40-
);
41-
AccountMessagesWrapper accountIsBankrupt = AccountMessagesController.convertAccountHistoryToWrapper(
42-
acts[0]
43-
);
21+
AccountMessagesWrapper result = AccountMessagesController.getData(acts[0].Id);
22+
AccountMessagesWrapper accountIsNull = AccountMessagesController.getData(acts[6].Id);
23+
Account getBankruptAccount = AccountMessagesController.getAccount(acts[0].Id);
24+
Account getBankruptParent = AccountMessagesController.getAccount(acts[1].Id);
25+
Account getRelatedAccount = AccountMessagesController.findRelatedAccount(acts[1].Id, ' KONKURSBO');
26+
Account getRelatedAccount2 = AccountMessagesController.findRelatedAccount(acts[3].Id, ' TVANGSAVVIKLINGSBO');
27+
AccountMessagesWrapper accountIsBankrupt = AccountMessagesController.convertAccountHistoryToWrapper(acts[0]);
4428
AccountMessagesWrapper accountIsInForcedSettlement = AccountMessagesController.convertAccountHistoryToWrapper(
4529
acts[3]
4630
);
47-
AccountMessagesWrapper accountIsNotBankrupt = AccountMessagesController.convertAccountHistoryToWrapper(
48-
acts[6]
49-
);
31+
AccountMessagesWrapper accountIsNotBankrupt = AccountMessagesController.convertAccountHistoryToWrapper(acts[6]);
5032
Test.StopTest();
51-
System.assertEquals(
52-
accountIsBankrupt.field,
53-
'Denne virksomheten er konkurs'
54-
);
55-
System.assertEquals(
56-
accountIsInForcedSettlement.field,
57-
'Denne virksomheten er under tvangsavvikling'
58-
);
59-
System.assertEquals(
60-
accountIsNotBankrupt.field,
61-
'Denne virksomheten er '
62-
);
33+
System.assertEquals(accountIsBankrupt.field, 'Denne virksomheten er konkurs');
34+
System.assertEquals(accountIsInForcedSettlement.field, 'Denne virksomheten er under tvangsavvikling');
35+
System.assertEquals(accountIsNotBankrupt.field, 'Denne virksomheten er ');
6336
System.assertEquals(accountIsNull, null);
6437
}
6538
}

‎force-app/components/accountMessages/lwc/accountMessages/accountMessages.html

+1-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
style="height: 50px"
77
>
88
<div class="slds-p-horizontal_small">
9-
<p>
10-
{field}. <a onclick={openRecord}>Klikk her for å gå til boet</a>
11-
</p>
9+
<p>{field}. <a onclick={openRecord}>Klikk her for å gå til boet</a></p>
1210
</div>
1311
</div>
1412
<div

‎force-app/components/accountTeamMember/classes/AccountTeamMemberControllerTest.cls

+3-9
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ private without sharing class AccountTeamMemberControllerTest {
33
@isTest
44
private static void AccountTeamMemberControllerTest() {
55
List<Account> accounts = TAG_TestDataFactory.createAccounts(1);
6-
User standardUser = TAG_TestDataFactory.createStandardUser(
7-
'Last UNIQUE NAME'
8-
);
6+
User standardUser = TAG_TestDataFactory.createStandardUser('Last UNIQUE NAME');
97

108
List<AccountTeamMember> atms = new List<AccountTeamMember>();
119
AccountTeamMember atm = new AccountTeamMember();
@@ -17,13 +15,9 @@ private without sharing class AccountTeamMemberControllerTest {
1715
insert atms;
1816

1917
Test.StartTest();
20-
List<AccountTeamMember> result = accountTeamMemberController.getData(
21-
accounts[0].Id
22-
);
18+
List<AccountTeamMember> result = accountTeamMemberController.getData(accounts[0].Id);
2319
accountTeamMemberController.deleteTeamMember(atms[0].Id);
24-
List<AccountTeamMember> deletedResult = accountTeamMemberController.getData(
25-
accounts[0].Id
26-
);
20+
List<AccountTeamMember> deletedResult = accountTeamMemberController.getData(accounts[0].Id);
2721
Test.StopTest();
2822

2923
System.assertEquals(atms.size(), result.size());

‎force-app/components/accountTeamMember/classes/DeleteAccountTeamTest.cls

+3-9
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ private without sharing class DeleteAccountTeamTest {
33
@isTest
44
private static void testAccountTeamDelete() {
55
List<Account> accounts = TAG_TestDataFactory.createAccounts(1);
6-
User standardUser = TAG_TestDataFactory.createStandardUser(
7-
'Last UNIQUE NAME'
8-
);
6+
User standardUser = TAG_TestDataFactory.createStandardUser('Last UNIQUE NAME');
97

108
List<AccountTeamMember> atms = new List<AccountTeamMember>();
119
AccountTeamMember atm = new AccountTeamMember();
@@ -31,9 +29,7 @@ private without sharing class DeleteAccountTeamTest {
3129
@isTest
3230
private static void testAccountTeamDelete_DeleteMultipleMembers() {
3331
List<Account> accounts = TAG_TestDataFactory.createAccounts(5);
34-
User standardUser = TAG_TestDataFactory.createStandardUser(
35-
'Last UNIQUE NAME'
36-
);
32+
User standardUser = TAG_TestDataFactory.createStandardUser('Last UNIQUE NAME');
3733

3834
List<AccountTeamMember> atms = new List<AccountTeamMember>();
3935

@@ -61,9 +57,7 @@ private without sharing class DeleteAccountTeamTest {
6157
@isTest
6258
private static void testAccountTeamDelete_UpdateWithoutDeleting() {
6359
List<Account> accounts = TAG_TestDataFactory.createAccounts(1);
64-
User standardUser = TAG_TestDataFactory.createStandardUser(
65-
'Last UNIQUE NAME'
66-
);
60+
User standardUser = TAG_TestDataFactory.createStandardUser('Last UNIQUE NAME');
6761

6862
List<AccountTeamMember> atms = new List<AccountTeamMember>();
6963
AccountTeamMember atm = new AccountTeamMember();

‎force-app/components/accountTeamMember/classes/accountTeamMemberController.cls

+1-5
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,7 @@ public without sharing class accountTeamMemberController {
1919

2020
@AuraEnabled
2121
public static void deleteTeamMember(Id atmId) {
22-
AccountTeamMember recordToDelete = [
23-
SELECT Id
24-
FROM AccountTeamMember
25-
WHERE Id = :atmId
26-
];
22+
AccountTeamMember recordToDelete = [SELECT Id FROM AccountTeamMember WHERE Id = :atmId];
2723
delete recordToDelete;
2824
}
2925
}

‎force-app/components/accountTeamMember/lwc/accountTeamMember/accountTeamMember.html

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
<template>
22
<article class="slds-card">
33
<div class="slds-card__header slds-grid">
4-
<header
5-
class="slds-media slds-media_center slds-has-flexi-truncate"
6-
>
4+
<header class="slds-media slds-media_center slds-has-flexi-truncate">
75
<div class="slds-media__figure">
8-
<lightning-icon
9-
icon-name="standard:team_member"
10-
alternative-text="Approved"
11-
title="Approved"
12-
>
6+
<lightning-icon icon-name="standard:team_member" alternative-text="Approved" title="Approved">
137
</lightning-icon>
148
</div>
159
<div class="slds-media__body">

‎force-app/components/accountTeamMember/lwc/accountTeamMember/accountTeamMember.js

+2-5
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ const columns = [
2727
}
2828
];
2929

30-
export default class AccountTeamMember extends NavigationMixin(
31-
LightningElement
32-
) {
30+
export default class AccountTeamMember extends NavigationMixin(LightningElement) {
3331
@api recordId;
3432
@track data;
3533
@track amount = 0;
@@ -85,8 +83,7 @@ export default class AccountTeamMember extends NavigationMixin(
8583
.then((result) => {
8684
this.dispatchEvent(
8785
new ShowToastEvent({
88-
message:
89-
'Kontaktperson ' + currentRow.UserId + ' slettet ',
86+
message: 'Kontaktperson ' + currentRow.UserId + ' slettet ',
9087
variant: 'success'
9188
})
9289
);

‎force-app/components/accountTeamMember/lwc/accountTeamMember/accountTeamMember.js-meta.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,5 @@
66
<target>lightning__RecordPage</target>
77
</targets>
88
<masterLabel>Account Team Custom</masterLabel>
9-
<description
10-
>A custom component to add and delete account team members</description>
9+
<description>A custom component to add and delete account team members</description>
1110
</LightningComponentBundle>

‎force-app/components/activityTimeline/customMetadata/TAG_ActivityTimelineChild/ActivityTimelineChild.TAG_Opportunity_Inkludering.md-meta.xml

+1-3
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,7 @@
7070
</values>
7171
<values>
7272
<field>SubtitlePastEnglish__c</field>
73-
<value
74-
xsi:type="xsd:string"
75-
>were responsible for this opportunity</value>
73+
<value xsi:type="xsd:string">were responsible for this opportunity</value>
7674
</values>
7775
<values>
7876
<field>SubtitlePastNorwegian__c</field>

‎force-app/components/activityTimeline/customMetadata/TAG_ActivityTimelineChild/ActivityTimelineChild.TAG_TemporaryLayoff.md-meta.xml

+1-3
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,7 @@
8080
</values>
8181
<values>
8282
<field>SObjectTypeValue__c</field>
83-
<value
84-
xsi:type="xsd:string"
85-
>PERMITTERING_UTEN_LØNN;MASSEOPPSIGELSE;INNSKRENKNING_I_ARBEIDSTID</value>
83+
<value xsi:type="xsd:string">PERMITTERING_UTEN_LØNN;MASSEOPPSIGELSE;INNSKRENKNING_I_ARBEIDSTID</value>
8684
</values>
8785
<values>
8886
<field>SubtitleFutureEnglish__c</field>

0 commit comments

Comments
 (0)