Skip to content

Add to collections #2433

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

Closed
wants to merge 2 commits into from
Closed

Add to collections #2433

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
f900d6c
changed the searchbar to functional
VarunMotiyani Sep 13, 2023
2d89ea0
refactored AddToCollections component to allow new storage to localst…
VarunMotiyani Sep 13, 2023
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
9 changes: 3 additions & 6 deletions client/modules/IDE/actions/collections.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { setToastText, showToast } from './toast';

const TOAST_DISPLAY_TIME_MS = 1500;

// eslint-disable-next-line
export function getCollections(username) {
return (dispatch) => {
dispatch(startLoader());
Expand All @@ -16,8 +15,7 @@ export function getCollections(username) {
} else {
url = '/collections';
}
console.log(url);
apiClient
return apiClient
.get(url)
.then((response) => {
dispatch({
Expand All @@ -27,10 +25,9 @@ export function getCollections(username) {
dispatch(stopLoader());
})
.catch((error) => {
const { response } = error;
dispatch({
type: ActionTypes.ERROR,
error: response.data
error: error?.response?.data
});
dispatch(stopLoader());
});
Expand Down Expand Up @@ -183,4 +180,4 @@ export function deleteCollection(collectionId) {
return response.data;
});
};
}
}
234 changes: 75 additions & 159 deletions client/modules/IDE/components/AddToCollectionList.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,38 @@


Settings

Hi! Here some our recommendations to get the best out of BLACKBOX:

Be as clear as possible

End the question in what language you want the answer to be, e.g: ‘connect to mongodb in python
or you can just
Go to Blackbox
Here are some suggestion (choose one):
Write a function that reads data from a json file
How to delete docs from mongodb in phyton
Connect to mongodb in nodejs
Ask any coding question
send
refresh
Blackbox AI Chat is in beta and Blackbox is not liable for the content generated. By using Blackbox, you acknowledge that you agree to agree to Blackbox's Terms and Privacy Policy
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bro...wtf is this? It's definitely not a valid file with this text up here.

The fact that you left this in shows total carelessness and you're wasting my time on reviewing a file that you clearly did not review yourself.

import PropTypes from 'prop-types';
import React from 'react';
import React, { useEffect, useState } from 'react';
import { Helmet } from 'react-helmet';
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
import { withTranslation } from 'react-i18next';
import { useTranslation } from 'react-i18next';
import { useDispatch, useSelector } from 'react-redux';
import styled from 'styled-components';
import * as ProjectActions from '../actions/project';
import * as ProjectsActions from '../actions/projects';
import * as CollectionsActions from '../actions/collections';
import * as ToastActions from '../actions/toast';
import * as SortingActions from '../actions/sorting';
import getSortedCollections from '../selectors/collections';
import Loader from '../../App/components/loader';
import {
addToCollection,
getCollections,
removeFromCollection
} from '../actions/collections';
import getSortedCollections from '../selectors/collections';
import QuickAddList from './QuickAddList';
import { remSize } from '../../../theme';

const projectInCollection = (project, collection) =>
collection.items.find((item) => item.projectId === project.id) != null;

export const CollectionAddSketchWrapper = styled.div`
width: ${remSize(600)};
max-width: 100%;
Expand All @@ -31,166 +46,67 @@ export const QuickAddWrapper = styled.div`
height: 100%;
`;

class CollectionList extends React.Component {
constructor(props) {
super(props);
const AddToCollectionList = ({ projectId }) => {
const { t } = useTranslation();

if (props.projectId) {
props.getProject(props.projectId);
}
const dispatch = useDispatch();

this.props.getCollections(this.props.username);
const username = useSelector((state) => state.user.username);

this.state = {
hasLoadedData: false
};
}
const collections = useSelector(getSortedCollections);

componentDidUpdate(prevProps) {
if (prevProps.loading === true && this.props.loading === false) {
// eslint-disable-next-line react/no-did-update-set-state
this.setState({
hasLoadedData: true
});
}
}
// TODO: improve loading state
const loading = useSelector((state) => state.loading);
const [hasLoadedData, setHasLoadedData] = useState(false);
const showLoader = loading && !hasLoadedData;

getTitle() {
if (this.props.username === this.props.user.username) {
return this.props.t('AddToCollectionList.Title');
}
return this.props.t('AddToCollectionList.AnothersTitle', {
anotheruser: this.props.username
});
}
useEffect(() => {
dispatch(getCollections(username)).then(() => setHasLoadedData(true));
}, [dispatch, username]);

handleCollectionAdd = (collection) => {
this.props.addToCollection(collection.id, this.props.project.id);
const handleCollectionAdd = (collection) => {
dispatch(addToCollection(collection.id, projectId));
};

handleCollectionRemove = (collection) => {
this.props.removeFromCollection(collection.id, this.props.project.id);
const handleCollectionRemove = (collection) => {
dispatch(removeFromCollection(collection.id, projectId));
};

render() {
const { collections, project } = this.props;
const hasCollections = collections.length > 0;
const collectionWithSketchStatus = collections.map((collection) => ({
...collection,
url: `/${collection.owner.username}/collections/${collection.id}`,
isAdded: projectInCollection(project, collection)
}));

let content = null;

if (this.props.loading && !this.state.hasLoadedData) {
content = <Loader />;
} else if (hasCollections) {
content = (
<QuickAddList
items={collectionWithSketchStatus}
onAdd={this.handleCollectionAdd}
onRemove={this.handleCollectionRemove}
t={this.props.t}
/>
);
} else {
content = this.props.t('AddToCollectionList.Empty');
const collectionWithSketchStatus = collections.map((collection) => ({
...collection,
url: `/${collection.owner.username}/collections/${collection.id}`,
isAdded: collection.items.some((item) => item.projectId === projectId)
}));

const getContent = () => {
if (showLoader) {
return <Loader />;
} else if (collections.length === 0) {
return t('AddToCollectionList.Empty');
}

return (
<CollectionAddSketchWrapper>
<QuickAddWrapper>
<Helmet>
<title>{this.getTitle()}</title>
</Helmet>
{content}
</QuickAddWrapper>
</CollectionAddSketchWrapper>
<QuickAddList
items={collectionWithSketchStatus}
onAdd={handleCollectionAdd}
onRemove={handleCollectionRemove}
/>
);
}
}

const ProjectShape = PropTypes.shape({
id: PropTypes.string.isRequired,
name: PropTypes.string.isRequired,
createdAt: PropTypes.string.isRequired,
updatedAt: PropTypes.string.isRequired,
user: PropTypes.shape({
username: PropTypes.string.isRequired
}).isRequired
});

const ItemsShape = PropTypes.shape({
createdAt: PropTypes.string.isRequired,
updatedAt: PropTypes.string.isRequired,
project: ProjectShape
});

CollectionList.propTypes = {
user: PropTypes.shape({
username: PropTypes.string,
authenticated: PropTypes.bool.isRequired
}).isRequired,
projectId: PropTypes.string.isRequired,
getCollections: PropTypes.func.isRequired,
getProject: PropTypes.func.isRequired,
addToCollection: PropTypes.func.isRequired,
removeFromCollection: PropTypes.func.isRequired,
collections: PropTypes.arrayOf(
PropTypes.shape({
id: PropTypes.string.isRequired,
name: PropTypes.string.isRequired,
description: PropTypes.string,
createdAt: PropTypes.string.isRequired,
updatedAt: PropTypes.string.isRequired,
items: PropTypes.arrayOf(ItemsShape)
})
).isRequired,
username: PropTypes.string,
loading: PropTypes.bool.isRequired,
project: PropTypes.shape({
id: PropTypes.string,
owner: PropTypes.shape({
id: PropTypes.string
})
}),
t: PropTypes.func.isRequired
};
};

CollectionList.defaultProps = {
project: {
id: undefined,
owner: undefined
},
username: undefined
return (
<CollectionAddSketchWrapper>
<QuickAddWrapper>
<Helmet>
<title>{t('AddToCollectionList.Title')}</title>
</Helmet>
{getContent()}
</QuickAddWrapper>
</CollectionAddSketchWrapper>
);
};

function mapStateToProps(state, ownProps) {
return {
user: state.user,
collections: getSortedCollections(state),
sorting: state.sorting,
loading: state.loading,
project: ownProps.project || state.project,
projectId: ownProps && ownProps.params ? ownProps.prams.project_id : null
};
}

function mapDispatchToProps(dispatch) {
return bindActionCreators(
Object.assign(
{},
CollectionsActions,
ProjectsActions,
ProjectActions,
ToastActions,
SortingActions
),
dispatch
);
}
AddToCollectionList.propTypes = {
projectId: PropTypes.string.isRequired
};

export default withTranslation()(
connect(mapStateToProps, mapDispatchToProps)(CollectionList)
);
export default AddToCollectionList;
Loading