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

moderate comments UI #25

Merged
merged 8 commits into from
Oct 24, 2024
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
33 changes: 26 additions & 7 deletions .storybook/decorators.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ import { Provider as ReduxProvider } from 'react-redux'
import configureStore from '../codebases/compdem/client-admin/src/store'
import { MemoryRouter } from 'react-router'

const store = configureStore()

export const withThemeUi = (Story) => (
<ThemeProvider theme={compdemAdminTheme}>
<Story />
Expand All @@ -20,11 +18,32 @@ export const withDelibThemeUi = (Story) => (
</ThemeProvider>
)

export const withRedux = (Story) => (
<ReduxProvider store={store}>
<Story />
</ReduxProvider>
)
/**
*
* Provide components support for redux-store
* optionally passing custom initial state, and using default initial state if not passed
*
* @example
* export const MyComponent = () => Template.bind({})
* MyComponent.parameters = {
* store: {
* initialState: {
* foo: 'bar'
* },
* }
* };
*
* Source: https://github.com/yannbf/mealdrop/blob/main/.storybook/decorators.tsx#L118
*/
export const withRedux = (Story, { parameters }) => {
// Creates a store by merging optional custom initialState
const store = configureStore(parameters.store?.initialState)
return (
<ReduxProvider store={store}>
<Story />
</ReduxProvider>
)
}

export const svgDecorator = (Story) => (
<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="300" height="100">
Expand Down
10 changes: 10 additions & 0 deletions .storybook/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,16 @@ export const getComments = () => {
return commentsData
}

export const getUnmoderatedComments = () => {
return commentsData.filter(comment => comment.mod === 0)
}
export const getAcceptedComments = () => {
return commentsData.filter(comment => comment.mod === 1)
}
export const getRejectedComments = () => {
return commentsData.filter(comment => comment.mod === -1)
}

// Simulates response data from /api/v3/reports?report_id=r3bpnywujybyru4rkx92i
export const getReports = () => {
return reportsData
Expand Down
20 changes: 15 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"react-dom": "^16.14.0",
"react-redux": "7.2.2",
"react-router-dom": "^5.2.0",
"redux-thunk": "~2.3.0",
"redux": "4.0.5",
"redux-thunk": "2.3.0",
"storybook": "^8.3.2",
"storybook-branch-switcher": "^0.5.0"
},
Expand Down
23 changes: 23 additions & 0 deletions stories/compdem/client-admin/ModerateCommentsAccepted.stories.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import React from "react";
import { withRedux, withThemeUi } from "../../../.storybook/decorators";
import ModerateCommentsAccepted from "../../../codebases/compdem/client-admin/src/components/conversation-admin/comment-moderation/moderate-comments-accepted";
import { getAcceptedComments } from "../../../.storybook/utils";

export default {
component: ModerateCommentsAccepted,
decorators: [withThemeUi, withRedux],
parameters: {
store: {
initialState: {
mod_comments_accepted: {},
},
},
},
};

const Template = (args) => <ModerateCommentsAccepted {...args} />;

export const Default = Template.bind({});
Default.args = {
accepted_comments: getAcceptedComments(),
};
23 changes: 23 additions & 0 deletions stories/compdem/client-admin/ModerateCommentsRejected.stories.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import React from "react";
import { withRedux, withThemeUi } from "../../../.storybook/decorators";
import ModerateCommentsRejected from "../../../codebases/compdem/client-admin/src/components/conversation-admin/comment-moderation/moderate-comments-rejected";
import { getRejectedComments } from "../../../.storybook/utils";

export default {
component: ModerateCommentsRejected,
decorators: [withThemeUi, withRedux],
parameters: {
store: {
initialState: {
mod_comments_rejected: {},
},
},
},
};

const Template = (args) => <ModerateCommentsRejected {...args} />;

export const Default = Template.bind({});
Default.args = {
rejected_comments: getRejectedComments(),
};
23 changes: 23 additions & 0 deletions stories/compdem/client-admin/ModerateCommentsTodo.stories.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import React from "react";
import { withRedux, withThemeUi } from "../../../.storybook/decorators";
import { getUnmoderatedComments } from "../../../.storybook/utils";
import ModerateCommentsTodo from "../../../codebases/compdem/client-admin/src/components/conversation-admin/comment-moderation/moderate-comments-todo";

export default {
component: ModerateCommentsTodo,
decorators: [withThemeUi, withRedux],
parameters: {
store: {
initialState: {
mod_comments_unmoderated: {},
},
},
},
};

const Template = (args) => <ModerateCommentsTodo {...args} />;

export const Default = Template.bind({});
Default.args = {
unmoderated_comments: getUnmoderatedComments(),
}