Skip to content

Github issue#1212, Filter project types in admin view #1238

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
vikasrohit merged 1 commit into from
Oct 9, 2017
Merged

Github issue#1212, Filter project types in admin view #1238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 7 additions & 11 deletions src/components/TopBar/Filters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,7 @@ import React, {PropTypes} from 'react'
import _ from 'lodash'
import { Dropdown, DropdownItem, SwitchButton } from 'appirio-tech-react-components'
import { PROJECT_STATUS } from '../../config/constants'

const projectTypes = [
{ val: null, label: 'All Types' },
{ val: 'generic', label: 'Work Project' },
{ val: 'visual_design', label: 'Visual Design' },
{ val: 'visual_prototype', label: 'Visual Prototype' },
{ val: 'app_dev', label: 'App Development' }
]
import { projectTypes } from '../../config/projectWizard'

const projectStatuses = [
{ val: 'in(draft,in_review,reviewed,active)', label: 'Open' },
Expand All @@ -19,12 +12,15 @@ const projectStatuses = [

const Filters = ({ criteria, handleMyProjectsFilter, applyFilters }) => {

const type = _.find(projectTypes, t => t.val === (criteria.type || null))
const type = _.find(projectTypes, t => t.id === (criteria.type || null))
const status = _.find(projectStatuses, t => t.val === (criteria.status || null))

const _types = _.map(projectTypes, p => {
return { val: { type: p.val }, label: p.label }
return { val: { type: p.id }, label: p.name }
})
// adds null valued object for All Types selection
_types.splice(0, 0, { val: { type: null}, label: 'All Types' })

const _statuses = _.map(projectStatuses, p => {
return { val: { status: p.val }, label: p.label }
})
Expand All @@ -36,7 +32,7 @@ const Filters = ({ criteria, handleMyProjectsFilter, applyFilters }) => {
<label className="first">Project Type</label>
<div className="search-select-widget">
<Dropdown theme="new-theme" noPointer pointerShadow>
<a className="dropdown-menu-header">{ type.label || 'All Types' }</a>
<a className="dropdown-menu-header">{ _.get(type, 'name') || 'All Types' }</a>
<ul className="dropdown-menu-list">
{
_types.map((item, i) =>
Expand Down
3 changes: 3 additions & 0 deletions src/config/projectWizard/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,9 @@ const products = {

export default products

// exports all project types as an array
export const projectTypes = _.mapValues(products, (p, key) => ({...p, name: key }) )

export function findProduct(product) {
if (product === 'generic_dev') {
return 'Development'
Expand Down