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.

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

Dev to Stage | Release | Jan 09 #214

Merged
merged 4 commits into from
Jan 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
Describe your specific features or fixes
Describe your specific features or fixes and provide a preview link for the feature being incorporated

Resolves: [MWPW-NUMBER](https://jira.corp.adobe.com/browse/MWPW-NUMBER)

Test URLs:
- Before: https://main--events-milo--adobecom.hlx.page/
- After: https://<branch>--events-milo--adobecom.hlx.page/

To test the feature, please load up the branch locally and run it against your local ESP and ESL server.
For more information on how to set up ESL and ESP locally, please refer to: https://wiki.corp.adobe.com/display/adobedotcom/Events+Milo+FE+Dev+Wiki#EventsMiloFEDevWiki-Localdevelopmentsetup
2 changes: 1 addition & 1 deletion events/blocks/event-map/event-map.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
max-width: 1750px;
margin: auto;
box-sizing: content-box;
padding: 32px 20px 0;
padding: 32px 20px 20px;
}

.event-map h2 {
Expand Down
11 changes: 9 additions & 2 deletions events/blocks/events-form/events-form.js
Original file line number Diff line number Diff line change
Expand Up @@ -407,14 +407,21 @@ function decorateSuccessScreen(screen) {
}

const { data } = resp;
const espStatus = data?.espProvider?.status;
const result = data?.espProvider || data;

if (!result) {
buildErrorMsg(screen, 500);
return;
}

const espStatus = result.status;

if ((espStatus && espStatus !== 204)) {
buildErrorMsg(screen, espStatus);
return;
}

if (data?.espProvider?.attendeeDeleted) BlockMediator.set('rsvpData', null);
if (result.attendeeDeleted) BlockMediator.set('rsvpData', null);

firstScreen.classList.add('hidden');
secondScreen.classList.remove('hidden');
Expand Down
5 changes: 5 additions & 0 deletions events/blocks/profile-cards/profile-cards.js
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,11 @@ export default function init(el) {
return;
}

if (!data || data.length === 0) {
el.remove();
return;
}

const cardsWrapper = createTag('div', { class: 'cards-wrapper' });
el.append(cardsWrapper);

Expand Down
6 changes: 4 additions & 2 deletions events/scripts/esp-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,19 @@ import BlockMediator from './deps/block-mediator.min.js';

const API_CONFIG = {
esl: {
local: { host: 'http://localhost:8499' },
dev: { host: 'https://wcms-events-service-layer-deploy-ethos102-stage-va-9c3ecd.stage.cloud.adobe.io' },
dev02: { host: 'https://wcms-events-service-layer-deploy-ethos102-stage-va-d5dc93.stage.cloud.adobe.io' },
stage: { host: 'https://events-service-layer-stage.adobe.io' },
stage02: { host: 'https://events-service-layer-stage02.adobe.io' },
stage02: { host: 'https://wcms-events-service-layer-deploy-ethos105-stage-or-8f7ce1.stage.cloud.adobe.io' },
prod: { host: 'https://events-service-layer.adobe.io' },
},
esp: {
local: { host: 'http://localhost:8500' },
dev: { host: 'https://wcms-events-service-platform-deploy-ethos102-stage-caff5f.stage.cloud.adobe.io' },
dev02: { host: 'https://wcms-events-service-platform-deploy-ethos102-stage-c81eb6.stage.cloud.adobe.io' },
stage: { host: 'https://events-service-platform-stage-or2.adobe.io' },
stage02: { host: 'https://events-service-platform-stage02.adobe.io' },
stage02: { host: 'https://wcms-events-service-platform-deploy-ethos105-stage-9a5fdc.stage.cloud.adobe.io' },
prod: { host: 'https://events-service-platform.adobe.io' },
},
};
Expand Down
2 changes: 1 addition & 1 deletion events/scripts/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export function getEventServiceEnv() {
if (host.startsWith('main--')) return 'prod';
}

if (host.includes('localhost')) return 'dev';
if (host.includes('localhost')) return 'local';

if (host.includes('stage.adobe')
|| host.includes('corp.adobe')
Expand Down
Loading