Skip to content

Mocks toggle #97

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

Merged
merged 2 commits into from
May 14, 2025
Merged

Mocks toggle #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb72079
Mocks togglable
krystian-panek-vmltech May 14, 2025
ac9ea49
Single feature toggle for mocks
krystian-panek-vmltech May 14, 2025
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
7 changes: 5 additions & 2 deletions core/src/main/java/com/vml/es/aem/acm/core/mock/MockHttpFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,11 @@ public void destroy() {
"Dedicated for dynamic response generation for mocking purposes, ideal for simulating 3rd-party system responses when their base URL is redirected to this service.")
public @interface Config {

@AttributeDefinition(name = "Enabled")
boolean enabled() default true;
@AttributeDefinition(
name = "Enabled",
description =
"When disabled, the filter will not process any requests. Also GUI no longer will display the mock scripts.")
boolean enabled() default false;

@AttributeDefinition(
name = "Whiteboard Filter Regex",
Expand Down
5 changes: 0 additions & 5 deletions ...ain/content/jcr_root/conf/acm/settings/script/extension/example/ACME-300_extension.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import com.vml.es.aem.acm.core.code.ExecutionContext
import com.vml.es.aem.acm.core.code.Execution
import com.vml.es.aem.acm.core.mock.MockContext

void prepareRun(ExecutionContext context) {
context.variable("acme", new AcmeFacade())
Expand All @@ -13,10 +12,6 @@ void completeRun(Execution execution) {
}
}

void prepareMock(MockContext context) {
context.variable("acme", new AcmeFacade())
}

class AcmeFacade {
def now() {
return new Date()
Expand Down
20 changes: 13 additions & 7 deletions ui.frontend/src/pages/ScriptsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@ import FlashOn from '@spectrum-icons/workflow/FlashOn';
import Hand from '@spectrum-icons/workflow/Hand';
import ScriptListRich from '../components/ScriptListRich.tsx';
import ScriptListSimple from '../components/ScriptListSimple.tsx';
import { useAppState } from '../hooks/app.ts';
import { useNavigationTab } from '../hooks/navigation';
import { ScriptType } from '../utils/api.types';
import styles from './ScriptsPage.module.css';

const ScriptsPage = () => {
const appState = useAppState();
const [selectedTab, handleTabChange] = useNavigationTab('manual');

return (
Expand All @@ -29,10 +31,12 @@ const ScriptsPage = () => {
<CloseCircle />
<Text>Disabled</Text>
</Item>
<Item aria-label="Mock scripts" key="mock">
<Beaker />
<Text>Mock</Text>
</Item>
{appState.mockStatus.enabled ? (
<Item aria-label="Mock scripts" key="mock">
<Beaker />
<Text>Mock</Text>
</Item>
) : null}
<Item aria-label="Extension scripts" key="extension">
<Extension />
<Text>Extension</Text>
Expand All @@ -48,9 +52,11 @@ const ScriptsPage = () => {
<Item key="disabled">
<ScriptListRich type={ScriptType.DISABLED} />
</Item>
<Item key="mock">
<ScriptListSimple type={ScriptType.MOCK} />
</Item>
{appState.mockStatus.enabled ? (
<Item key="mock">
<ScriptListSimple type={ScriptType.MOCK} />
</Item>
) : null}
<Item key="extension">
<ScriptListSimple type={ScriptType.EXTENSION} />
</Item>
Expand Down