Skip to content

Commit 020da88

Browse files
saramoh2309saramoh2309
authored
Merge pull request #1878 from navikt/homePateUpdates
small design changes
2 parents c5b8ac2 + b111251 commit 020da88

28 files changed

+455
-346
lines changed

‎force-app/main/default/objectTranslations/NKS_Announcement__c-no/NKS_Opening_Hours_Information__c.fieldTranslation-meta.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<CustomFieldTranslation xmlns="http://soap.sforce.com/2006/04/metadata">
3+
<label>Informasjon om åpningstider</label>
4+
<name>NKS_Opening_Hours_Information__c</name>
5+
</CustomFieldTranslation>

‎force-app/main/default/objectTranslations/NKS_Announcement__c-no/NKS_Opening_Hours_Label__c.fieldTranslation-meta.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<CustomFieldTranslation xmlns="http://soap.sforce.com/2006/04/metadata">
3+
<label>Tittel for åpningstider</label>
4+
<name>NKS_Opening_Hours_Label__c</name>
5+
</CustomFieldTranslation>

‎force-app/main/default/objects/NKS_Announcement__c/fields/NKS_Opening_Hours_Information__c.field-meta.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
3+
<fullName>NKS_Opening_Hours_Information__c</fullName>
4+
<externalId>false</externalId>
5+
<label>Opening Hours Information</label>
6+
<length>32768</length>
7+
<trackFeedHistory>false</trackFeedHistory>
8+
<trackHistory>false</trackHistory>
9+
<trackTrending>false</trackTrending>
10+
<type>Html</type>
11+
<visibleLines>10</visibleLines>
12+
</CustomField>

‎force-app/main/default/objects/NKS_Announcement__c/fields/NKS_Opening_Hours_Label__c.field-meta.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
3+
<fullName>NKS_Opening_Hours_Label__c</fullName>
4+
<externalId>false</externalId>
5+
<label>Opening Hours Label</label>
6+
<length>255</length>
7+
<required>false</required>
8+
<trackFeedHistory>false</trackFeedHistory>
9+
<trackHistory>false</trackHistory>
10+
<trackTrending>false</trackTrending>
11+
<type>Text</type>
12+
<unique>false</unique>
13+
</CustomField>

‎force-app/nksHomePage/classes/NKS_HomePageController.cls‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,20 @@ public with sharing class NKS_HomePageController {
4848
}
4949

5050
@AuraEnabled(cacheable=true)
51-
public static String getField(String type) {
51+
public static NKS_Announcement__c getAnnouncement(String type) {
5252
List<NKS_Announcement__c> announcement = [
53-
SELECT NKS_Information__c
53+
SELECT NKS_Information__c, NKS_Opening_Hours_Label__c, NKS_Opening_Hours_Information__c
5454
FROM NKS_Announcement__c
5555
WHERE RecordType.DeveloperName = :type AND CreatedDate = LAST_N_DAYS:15
5656
ORDER BY SystemModstamp DESC
5757
LIMIT 1
5858
];
5959
if (announcement.isEmpty() || String.isBlank(announcement[0].NKS_Information__c)) {
60-
return '';
60+
return null;
6161
}
62-
return announcement[0].NKS_Information__c.replace('<img', '<img style="max-height: 100px"');
62+
announcement[0].NKS_Information__c = announcement[0]
63+
.NKS_Information__c.replace('<img', '<img style="max-height: 100px"');
64+
return announcement[0];
6365
}
6466

6567
@AuraEnabled(cacheable=true)

‎force-app/nksHomePage/classes/NKS_HomePageControllerTest.cls‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ public with sharing class NKS_HomePageControllerTest {
55
Id SFUpdateRecordTypeId = Schema.SObjectType.NKS_Announcement__c.getRecordTypeInfosByName()
66
.get('Salesforce Update')
77
.getRecordTypeId();
8-
Id campaignRecordTypeId = Schema.SObjectType.NKS_Announcement__c.getRecordTypeInfosByName()
9-
.get('Campaign')
10-
.getRecordTypeId();
118
Id newsRecordTypeId = Schema.SObjectType.NKS_Announcement__c.getRecordTypeInfosByName()
129
.get('News')
1310
.getRecordTypeId();
@@ -17,11 +14,21 @@ public with sharing class NKS_HomePageControllerTest {
1714
Id nksCurrentRecordTypeId = Schema.SObjectType.NKS_Announcement__c.getRecordTypeInfosByName()
1815
.get('NKS Current')
1916
.getRecordTypeId();
17+
Id trafficRecordTypeId = Schema.SObjectType.NKS_Announcement__c.getRecordTypeInfosByName()
18+
.get('Traffic')
19+
.getRecordTypeId();
2020

2121
NKS_TestDataFactory.createAnnouncements(1, SFUpdateRecordTypeId);
22-
NKS_TestDataFactory.createAnnouncements(1, campaignRecordTypeId);
2322
NKS_TestDataFactory.createAnnouncements(1, newsRecordTypeId);
2423
NKS_TestDataFactory.createAnnouncements(1, nksStatusRecordTypeId);
24+
NKS_Announcement__c traffic = new NKS_Announcement__c(
25+
Name = 'Test Traffic',
26+
NKS_Information__c = 'Leveransen lørdag 31. oktober ble levert som planlagt, og NAV Arbeid og ytelser kan derfor nå innvilge dagpenger til personer også fra den 1. november eller senere. Opprinnelig melding 29.10.20: Hvis bruker har søkt om dagpenger med virkningstidspunkt fra 1.november eller senere, så kan vi få henvendelser hvor bruker etterlyser svar på søknaden. NAV Arbeid og ytelser behandler for tiden ingen søknader om dagpenger med virkningstidspunkt (startdato) fra 1. november eller senere. Årsaken er regelverksendringer fra den datoen, som vi må få oppdatert i fagsystemene først, for at utfall i saken skal bli rett.Informer gjerne bruker om dette, og henvis eller til saksbehandlingstidene på nav.no.!!!!',
27+
RecordTypeId = trafficRecordTypeId,
28+
NKS_Opening_Hours_Label__c = 'Sommer 2025',
29+
NKS_Opening_Hours_Information__c = 'Vi har redusert åpningstidene i sommer.'
30+
);
31+
insert traffic;
2532

2633
List<NKS_Announcement__c> announcements = new List<NKS_Announcement__c>();
2734
for (Integer i = 0; i < 6; i++) {
@@ -47,21 +54,22 @@ public with sharing class NKS_HomePageControllerTest {
4754
}
4855

4956
@isTest
50-
static void testGetField() {
57+
static void testGetAnnouncementSfUpdates() {
5158
Test.startTest();
52-
String info = NKS_HomePageController.getField('Salesforce_Update');
59+
NKS_Announcement__c sfUpdates = NKS_HomePageController.getAnnouncement('Salesforce_Update');
5360
Test.stopTest();
5461

55-
Assert.areEqual(700, info.length());
62+
Assert.areEqual(700, sfUpdates.NKS_Information__c.length());
5663
}
5764

5865
@isTest
59-
static void testGetFieldWithNullValue() {
66+
static void testGetAnnouncementTraffic() {
6067
Test.startTest();
61-
String info = NKS_HomePageController.getField('Traffic');
68+
NKS_Announcement__c traffic = NKS_HomePageController.getAnnouncement('Traffic');
6269
Test.stopTest();
6370

64-
Assert.areEqual('', info);
71+
Assert.areEqual('Sommer 2025', traffic.NKS_Opening_Hours_Label__c);
72+
Assert.areEqual('Vi har redusert åpningstidene i sommer.', traffic.NKS_Opening_Hours_Information__c);
6573
}
6674

6775
@isTest

‎force-app/nksHomePage/layouts/NKS_Announcement__c-Traffic Layout.layout-meta.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,14 @@
1515
<behavior>Edit</behavior>
1616
<field>NKS_Information__c</field>
1717
</layoutItems>
18+
<layoutItems>
19+
<behavior>Edit</behavior>
20+
<field>NKS_Opening_Hours_Label__c</field>
21+
</layoutItems>
22+
<layoutItems>
23+
<behavior>Edit</behavior>
24+
<field>NKS_Opening_Hours_Information__c</field>
25+
</layoutItems>
1826
</layoutColumns>
1927
<style>OneColumn</style>
2028
</layoutSections>

‎force-app/nksHomePage/lwc/nksHomePageCurrent/nksHomePageCurrent.css‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,17 @@
55
.slds-card__footer {
66
border-top: none !important;
77
justify-content: start;
8-
}
9-
10-
.footer-padding {
11-
padding-top: 0;
8+
padding: 0 1rem 1rem 1rem;
129
}
1310

1411
.header-icon {
1512
background-color: #4bca81;
1613
}
14+
15+
.slds-card__header {
16+
padding-top: 1rem;
17+
}
18+
19+
.slds-card__body {
20+
padding: 0 1rem;
21+
}

‎force-app/nksHomePage/lwc/nksHomePageCurrent/nksHomePageCurrent.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ <h2 class="slds-text-heading_medium slds-truncate">{cardLabel}</h2>
5555
</ul>
5656
</template>
5757
</div>
58-
<footer class="slds-card__footer slds-var-p-bottom_medium footer-padding">
58+
<footer class="slds-card__footer slds-var-p-bottom_medium">
5959
<a
6060
class="slds-card__footer-action"
6161
href="https://navno.sharepoint.com/sites/enhet-kontaktsenter/SitePages/Nyhetsarkiv---Toppsaker.aspx"

‎force-app/nksHomePage/lwc/nksHomePageCurrent/nksHomePageCurrent.js-meta.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
3-
<apiVersion>63.0</apiVersion>
3+
<apiVersion>64.0</apiVersion>
44
<isExposed>true</isExposed>
55
<masterLabel>NKS Home page Current</masterLabel>
66
<targets>

0 commit comments

Comments
 (0)