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

Plugin and advertisement screen revamp #2006

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

Plugin and advertisement screen revamp #2006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6173faf
advertisement and plugin screen
duplixx May 24, 2024
afd1fa6
Merge branch 'develop' into plugin-advertisement-revamp
duplixx Nov 13, 2024
323a0c7
added revamped design
duplixx Nov 13, 2024
9bc0676
fixes added
duplixx Nov 13, 2024
9e12260
fixed testcases
duplixx Nov 14, 2024
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
4 changes: 2 additions & 2 deletions public/locales/en/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -923,7 +923,7 @@
"register": "register"
},
"addOnStore": {
"title": "Add On Store",
"title": "Plugin Store",
"searchName": "Ex: Donations",
"search": "Search",
"enable": "Enabled",
Expand Down Expand Up @@ -1227,7 +1227,7 @@
"RstartDate": "Select Start Date",
"RendDate": "Select End Date",
"RClose": "Close the window",
"addNew": "Create new advertisement",
"addNew": "Create",
"EXname": "Ex. Cookie Shop",
"EXlink": "Ex. http://yourwebsite.com/photo",
"createAdvertisement": "Create Advertisement",
Expand Down
6 changes: 5 additions & 1 deletion src/components/AddOn/core/AddOnEntry/AddOnEntry.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,12 @@
margin-left: auto;
display: flex !important;
align-items: center;
background-color: transparent;
color: #31bb6b;
}
.card {
border: 4px solid green;
}

.entryaction i {
margin-right: 8px;
}
Expand Down
12 changes: 8 additions & 4 deletions src/components/AddOn/core/AddOnEntry/AddOnEntry.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ interface InterfaceAddOnEntryProps {
component?: string; // Optional props
modified?: any; // Optional props
uninstalledOrgs: string[];
getInstalledPlugins: () => any;
getInstalledPlugins: () => void;
}

/**
Expand Down Expand Up @@ -59,6 +59,7 @@ function addOnEntry({

// Getting orgId from URL parameters
const { orgId: currentOrg } = useParams();
// console.log(currentOrg);
if (!currentOrg) {
// If orgId is not present in the URL, navigate to the org list page
return <Navigate to={'/orglist'} />;
Expand Down Expand Up @@ -101,7 +102,10 @@ function addOnEntry({

return (
<>
<Card data-testid="AddOnEntry">
<Card
data-testid="AddOnEntry"
style={{ border: '1px solid #31BB6B', borderRadius: '10px' }}
>
{/* {uninstalledOrgs.includes(currentOrg) && (
<Form.Check
type="switch"
Expand All @@ -114,7 +118,7 @@ function addOnEntry({
/>
)} */}
<Card.Body>
<Card.Title>{title}</Card.Title>
<Card.Title style={{ fontWeight: '800' }}>{title}</Card.Title>
<Card.Subtitle className="mb-2 text-muted author">
{createdBy}
</Card.Subtitle>
Expand All @@ -134,7 +138,7 @@ function addOnEntry({
<Spinner animation="grow" />
) : (
<i
className={!isInstalledLocal ? 'fa fa-trash' : 'fa fa-cubes'}
className={!isInstalledLocal ? 'fa fa-trash' : 'fa fa-plus'}
duplixx marked this conversation as resolved.
Show resolved Hide resolved
></i>
)}
{/* {installed ? 'Remove' : configurable ? 'Installed' : 'Install'} */}
Expand Down
45 changes: 43 additions & 2 deletions src/components/AddOn/core/AddOnStore/AddOnStore.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,12 @@
border-bottom: 3px solid #31bb6b;
width: 15%;
}

.actioninput {
.input {
display: flex;
position: relative;
width: 560px;
}
/* .actioninput {
text-decoration: none;
margin-bottom: 50px;
border-color: #e8e5e5;
Expand All @@ -23,9 +27,46 @@
padding-right: 10px;
padding-left: 10px;
box-shadow: none;
} */
.actioninput {
margin-top: 10px;
margin-bottom: 10px;
background-color: white;
box-shadow: 0 1px 1px #31bb6b;
}
.inputField > button {
padding-top: 10px;
padding-bottom: 10px;
}

.actionradio input {
width: fit-content;
margin: inherit;
}
.cardGridItem {
width: 38vw;
}
.justifysp {
display: grid;
width: 100%;
justify-content: space-between;
align-items: baseline;
grid-template-rows: auto;
grid-template-columns: repeat(2, 1fr);
grid-gap: 0.8rem 0.4rem;
}

@media screen and (max-width: 600px) {
.cardGridItem {
width: 100%;
}
.justifysp {
display: grid;
width: 100%;
justify-content: center;
align-items: start;
grid-template-rows: auto;
grid-template-columns: 1fr;
grid-gap: 0.8rem 0.4rem;
}
}
99 changes: 17 additions & 82 deletions src/components/AddOn/core/AddOnStore/AddOnStore.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@ import useLocalStorage from 'utils/useLocalstorage';
import { MockedProvider } from '@apollo/react-testing';

const { getItem } = useLocalStorage();

interface InterfacePlugin {
enabled: boolean;
pluginName: string;
component: string;
}
jest.mock('components/AddOn/support/services/Plugin.helper', () => ({
__esModule: true,
default: jest.fn().mockImplementation(() => ({
Expand Down Expand Up @@ -60,16 +64,18 @@ jest.mock('components/AddOn/support/services/Plugin.helper', () => ({
},
// Add more mock data as needed
]),
generateLinks: jest.fn().mockImplementation((plugins) => {
return plugins
.filter((plugin: { enabled: any }) => plugin.enabled)
.map((installedPlugin: { pluginName: any; component: string }) => {
return {
name: installedPlugin.pluginName,
url: `/plugin/${installedPlugin.component.toLowerCase()}`,
};
});
}),
generateLinks: jest
.fn()
.mockImplementation((plugins: InterfacePlugin[]) => {
return plugins
.filter((plugin) => plugin.enabled)
.map((installedPlugin) => {
return {
name: installedPlugin.pluginName,
url: `/plugin/${installedPlugin.component.toLowerCase()}`,
};
});
}),
})),
}));

Expand Down Expand Up @@ -301,77 +307,6 @@ describe('Testing AddOnStore Component', () => {
expect(message.length).toBeGreaterThanOrEqual(1);
});

test('check filters enabled and disabled under Installed tab', async () => {
const mocks = [ORGANIZATIONS_LIST_MOCK, PLUGIN_GET_MOCK];
render(
<ApolloProvider client={client}>
<Provider store={store}>
<BrowserRouter>
<I18nextProvider i18n={i18nForTest}>
<MockedProvider mocks={mocks} addTypename={false}>
<AddOnStore />
</MockedProvider>
</I18nextProvider>
</BrowserRouter>
</Provider>
</ApolloProvider>,
);

await wait();
userEvent.click(screen.getByText('Installed'));

expect(screen.getByText('Filters')).toBeInTheDocument();
expect(screen.getByLabelText('Enabled')).toBeInTheDocument();
expect(screen.getByLabelText('Disabled')).toBeInTheDocument();

fireEvent.click(screen.getByLabelText('Enabled'));
expect(screen.getByLabelText('Enabled')).toBeChecked();
fireEvent.click(screen.getByLabelText('Disabled'));
expect(screen.getByLabelText('Disabled')).toBeChecked();
});

test('check the working search bar when on Installed tab', async () => {
const mocks = [ORGANIZATIONS_LIST_MOCK, PLUGIN_GET_MOCK];

const { container } = render(
<ApolloProvider client={client}>
<Provider store={store}>
<BrowserRouter>
<I18nextProvider i18n={i18nForTest}>
<MockedProvider mocks={mocks} addTypename={false}>
<AddOnStore />
</MockedProvider>
</I18nextProvider>
</BrowserRouter>
</Provider>
</ApolloProvider>,
);
await wait();
userEvent.click(screen.getByText('Installed'));

await wait();
let searchText = '';
fireEvent.change(screen.getByPlaceholderText('Ex: Donations'), {
target: { value: searchText },
});
expect(container).toHaveTextContent('Plugin 1');
expect(container).toHaveTextContent('Plugin 3');

searchText = 'Plugin 1';
fireEvent.change(screen.getByPlaceholderText('Ex: Donations'), {
target: { value: searchText },
});
const plugin1Elements = screen.queryAllByText('Plugin 1');
expect(plugin1Elements.length).toBeGreaterThan(1);

searchText = 'Test Plugin';
fireEvent.change(screen.getByPlaceholderText('Ex: Donations'), {
target: { value: searchText },
});
const message = screen.getAllByText('Plugin does not exists');
expect(message.length).toBeGreaterThanOrEqual(1);
});

test('AddOnStore loading test', async () => {
expect(true).toBe(true);
const mocks = [ORGANIZATIONS_LIST_MOCK, PLUGIN_LOADING_MOCK];
Expand Down
Loading
Loading