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

Rename selectors to utilities #572

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion src/components/AddPaymentForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import { GET_CLIENT_PAYMENTS } from '../operations/queries/PaymentQueries'
import { CREATE_PAYMENT } from '../operations/mutations/PaymentMutations'
import {
selectCurrencyInformation
} from '../scripts/selectors'
} from '../scripts/utilities'

const AddPaymentForm = (props) => {

Expand Down
2 changes: 1 addition & 1 deletion src/components/AddProjectDetails.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import CurrencyTextField from '@unicef/material-ui-currency-textfield'
import { EXPECTED_BUDGET_TIMEFRAME_OPTIONS, MAX_INT } from '../constants'
import {
selectCurrencyInformation
} from '../scripts/selectors'
} from '../scripts/utilities'

const AddProjectDetails = (props) => {

Expand Down
2 changes: 1 addition & 1 deletion src/components/AddProjectForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { sessionUser } from '../reactivities/variables'
import {
verifyGithubURL,
verifyTogglURL
} from '../scripts/selectors'
} from '../scripts/utilities'
import { EXPECTED_BUDGET_TIMEFRAME_OPTIONS } from '../constants'
import { GET_CLIENT_INFO } from '../operations/queries/ClientQueries'
import { ADD_PROJECT, SYNC_TOGGL_PROJECT } from '../operations/mutations/ProjectMutations'
Expand Down
2 changes: 1 addition & 1 deletion src/components/AllocationAddSpecifics.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import {
formatAmount,
selectCurrencyInformation,
selectCurrencySymbol
} from '../scripts/selectors'
} from '../scripts/utilities'

const AllocationAddSpecifics = (props) => {

Expand Down
2 changes: 1 addition & 1 deletion src/components/AllocationClientSpecifics.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import { GET_CLIENT_PROJECTS } from '../operations/queries/ClientQueries'
import {
formatAmount,
selectCurrencyInformation
} from '../scripts/selectors'
} from '../scripts/utilities'

const AllocationClientSpecifics = (props) => {

Expand Down
2 changes: 1 addition & 1 deletion src/components/AllocationProposeSpecifics.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { GET_ALL_PROJECTS, GET_PROJECT_CLIENT_PAYMENTS } from '../operations/que
import {
formatAmount,
selectCurrencyInformation
} from '../scripts/selectors'
} from '../scripts/utilities'

const AllocationProposeSpecifics = (props) => {

Expand Down
2 changes: 1 addition & 1 deletion src/components/AllocationTile.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import AllocationOverview from './AllocationOverview'
import {
formatAmount,
selectCurrencyInformation
} from '../scripts/selectors'
} from '../scripts/utilities'
import { grey, orange, red, setlifeBlue } from '../styles/colors.scss'

const AllocationTile = (props) => {
Expand Down
2 changes: 1 addition & 1 deletion src/components/ClientInfo.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import EuroIcon from '@material-ui/icons/Euro'
import ClientEditDialog from './ClientEditDialog'
import LoadingProgress from './LoadingProgress'

import { selectCurrencySymbol } from '../scripts/selectors'
import { selectCurrencySymbol } from '../scripts/utilities'
import { lightGrey } from '../styles/colors.scss'
import { GET_CLIENT_INFO } from '../operations/queries/ClientQueries'

Expand Down
2 changes: 1 addition & 1 deletion src/components/ClientPaymentsManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import AddIcon from '@material-ui/icons/Add'
import { gql, useQuery } from '@apollo/client'

import LoadingProgress from './LoadingProgress'
import { formatAmount, selectCurrencyInformation } from '../scripts/selectors'
import { formatAmount, selectCurrencyInformation } from '../scripts/utilities'
import { GET_CLIENT_TOTAL_PAID } from '../operations/queries/ClientQueries'

const ClientPaymentsManager = ({
Expand Down
2 changes: 1 addition & 1 deletion src/components/ContributorInfoTile.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { GET_CONTRIBUTOR_INFO } from '../operations/queries/ContributorQueries'
import {
formatAmount,
selectCurrencyInformation
} from '../scripts/selectors'
} from '../scripts/utilities'

const ContributorInfoTile = (props) => {

Expand Down
2 changes: 1 addition & 1 deletion src/components/ContributorTile.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {
selectActiveAndUpcomingAllocations,
selectCurrencyInformation,
getExpectedHours
} from '../scripts/selectors'
} from '../scripts/utilities'

const ContributorTile = (props) => {

Expand Down
2 changes: 1 addition & 1 deletion src/components/EditAllocationInfo.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {
isEqual
} from 'lodash'

import { formatAmount, selectCurrencyInformation } from '../scripts/selectors'
import { formatAmount, selectCurrencyInformation } from '../scripts/utilities'

const EditAllocationInfo = (props) => {

Expand Down
2 changes: 1 addition & 1 deletion src/components/Navigation.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import Settings from '@material-ui/icons/Settings'

import { lightBlue } from '../styles/colors.scss'
import { LOGO_URL, SMALL_LOGO_URL } from '../constants'
import { capitalizeWord, matchTitlePage } from '../scripts/selectors'
import { capitalizeWord, matchTitlePage } from '../scripts/utilities'
import { pageName, authUser } from '../reactivities/variables'

const Navigation = (props) => {
Expand Down
2 changes: 1 addition & 1 deletion src/components/PaymentEditDialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import LoadingProgress from './LoadingProgress'
import { EDIT_PAYMENT } from '../operations/mutations/PaymentMutations'
import {
selectCurrencyInformation
} from '../scripts/selectors'
} from '../scripts/utilities'

const PaymentEditDialog = (props) => {

Expand Down
2 changes: 1 addition & 1 deletion src/components/PaymentTile.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import {
import {
formatAmount,
selectCurrencyInformation
} from '../scripts/selectors'
} from '../scripts/utilities'

const PaymentTile = (props) => {

Expand Down
2 changes: 1 addition & 1 deletion src/components/PaymentsAddForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import { GET_CLIENT_PAYMENTS } from '../operations/queries/PaymentQueries'
import { CREATE_PAYMENT } from '../operations/mutations/PaymentMutations'
import {
selectCurrencyInformation
} from '../scripts/selectors'
} from '../scripts/utilities'

const PaymentsAddForm = (props) => {

Expand Down
2 changes: 1 addition & 1 deletion src/components/ProjectContributors.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { pageName } from '../reactivities/variables'
import {
getAllocatedContributors,
getActiveAndUpcomingAllocations
} from '../scripts/selectors'
} from '../scripts/utilities'

const ProjectContributors = (props) => {

Expand Down
3 changes: 1 addition & 2 deletions src/components/ProjectEditDialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,11 @@ import {
selectCurrencyInformation,
verifyGithubURL,
verifyTogglURL
} from '../scripts/selectors'
} from '../scripts/utilities'

import { SYNC_TOGGL_PROJECT, UPDATE_PROJECT } from '../operations/mutations/ProjectMutations'
import { EXPECTED_BUDGET_TIMEFRAME_OPTIONS, MAX_INT } from '../constants'


const ProjectEditDialog = (props) => {

const {
Expand Down
2 changes: 1 addition & 1 deletion src/components/ProjectPayments.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import {
calculateTotalPayments,
formatAmount,
selectCurrencyInformation
} from '../scripts/selectors'
} from '../scripts/utilities'
import { white } from '../styles/colors.scss'

const ProjectPayments = (props) => {
Expand Down
2 changes: 1 addition & 1 deletion src/components/ProjectPaymentsSummary.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
} from '@material-ui/core'

import { GET_PROJECT_PAYMENTS_SUMMARY } from '../operations/queries/ProjectQueries'
import { formatAmount } from '../scripts/selectors'
import { formatAmount } from '../scripts/utilities'

const ProjectPaymentsSummary = (props) => {

Expand Down
2 changes: 1 addition & 1 deletion src/components/ProjectProposedAllocationsTile.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {

import AllocationOverview from './AllocationOverview'
import { GET_PROJECT_TOTAL_PROPOSED } from '../operations/queries/ProjectQueries'
import { formatAmount } from '../scripts/selectors'
import { formatAmount } from '../scripts/utilities'

import moment from 'moment'
import ExpandMoreIcon from '@material-ui/icons/ExpandMore'
Expand Down
2 changes: 1 addition & 1 deletion src/components/ProjectSummary.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
formatAmount,
selectCurrencyInformation,
selectCurrencySymbol
} from '../scripts/selectors'
} from '../scripts/utilities'
import ProjectEditDialog from './ProjectEditDialog'

const ProjectSummary = (props) => {
Expand Down
2 changes: 1 addition & 1 deletion src/components/RateMaxBudgetForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
import CurrencyTextField from '@unicef/material-ui-currency-textfield'

import { CURRENCIES } from '../constants'
import { selectCurrencyInformation } from '../scripts/selectors'
import { selectCurrencyInformation } from '../scripts/utilities'
import { validatePositiveNumbers } from '../scripts/validation'

const RateMaxBudgetForm = (props) => {
Expand Down
2 changes: 1 addition & 1 deletion src/components/RateProratedMonthlyForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { CURRENCIES } from '../constants'
import {
formatAmount,
selectCurrencyInformation
} from '../scripts/selectors'
} from '../scripts/utilities'
import { validatePositiveNumbers } from '../scripts/validation'

const RateProratedMonthlyForm = (props) => {
Expand Down
File renamed without changes.