remove dummy data finished

Author: dengjun

package.json

@@ -6,7 +6,7 @@
     "dev-https": "cross-env APPMODE=development webpack-dev-server --https --port 8008",
     "build": "webpack --mode=${APPMODE:-development} --env.config=${APPENV:-dev}",
     "analyze": "webpack --mode=production --env.analyze=true",
-    "lint": "eslint src --ext js,jsx",
+    "lint": "eslint src --ext js,jsx --fix",
     "format": "prettier --write \"./**\"",
     "test": "cross-env BABEL_ENV=test jest",
     "watch-tests": "cross-env BABEL_ENV=test jest --watch",

src/actions/lookup.js

@@ -13,13 +13,9 @@ async function checkIsLoggedIn() {
   return service.checkIsLoggedIn();
 }
 
-async function getGigPhases() {
-  return service.getGigPhases();
-}
-
-async function getGigStatuses() {
-  return service.getGigStatuses();
-}
+// async function getGigStatuses() {
+//   return service.getGigStatuses();
+// }
 
 /**
  * Gets all the countries.
@@ -51,7 +47,6 @@ export default createActions({
   GET_TAGS: getTags,
   GET_COMMUNITY_LIST: getCommunityList,
   CHECK_IS_LOGGED_IN: checkIsLoggedIn,
-  GET_GIG_PHASES: getGigPhases,
-  GET_GIG_STATUSES: getGigStatuses,
+  // GET_GIG_STATUSES: getGigStatuses,
   GET_ALL_COUNTRIES: getAllCountries,
 });

src/assets/data/my-gigs.json

@@ -13,27 +13,24 @@ import "./styles.scss";
 
 const MyGigs = ({
   myGigs,
-  phases,
-  getPhases,
   getMyGigs,
   loadMore,
   total,
   numLoaded,
   profile,
-  statuses,
+  // statuses,
   getProfile,
-  getStatuses,
+  // getStatuses,
   updateProfile,
   updateProfileSuccess,
 }) => {
   const propsRef = useRef();
-  propsRef.current = { getMyGigs, getPhases, getProfile, getStatuses };
+  propsRef.current = { getMyGigs, getProfile };
 
   useEffect(() => {
     propsRef.current.getMyGigs();
-    propsRef.current.getPhases();
     propsRef.current.getProfile();
-    propsRef.current.getStatuses();
+    // propsRef.current.getStatuses();
   }, []);
 
   const [openUpdateProfile, setOpenUpdateProfile] = useState(false);
@@ -65,7 +62,6 @@ const MyGigs = ({
         </h1>
         <JobListing
           jobs={myGigs}
-          phases={phases}
           loadMore={loadMore}
           total={total}
           numLoaded={numLoaded}
@@ -74,7 +70,7 @@ const MyGigs = ({
       <Modal open={openUpdateProfile}>
         <UpdateGigProfile
           profile={profile}
-          statuses={statuses}
+          // statuses={statuses}
           onSubmit={(profileEdit) => {
             updateProfile(profileEdit);
             setOpenUpdateProfile(false);
@@ -102,9 +98,9 @@ MyGigs.propTypes = {
   total: PT.number,
   numLoaded: PT.number,
   profile: PT.shape(),
-  statuses: PT.arrayOf(PT.string),
+  // statuses: PT.arrayOf(PT.string),
   getProfile: PT.func,
-  getStatuses: PT.func,
+  // getStatuses: PT.func,
   updateProfile: PT.func,
   updateProfileSuccess: PT.bool,
 };
@@ -113,18 +109,16 @@ const mapStateToProps = (state) => ({
   myGigs: state.myGigs.myGigs,
   total: state.myGigs.total,
   numLoaded: state.myGigs.numLoaded,
-  phases: state.lookup.gigPhases,
   profile: state.myGigs.profile,
-  statuses: state.lookup.gigStatuses,
+  // statuses: state.lookup.gigStatuses,
   updateProfileSuccess: state.myGigs.updatingProfileSucess,
 });
 
 const mapDispatchToProps = {
   getMyGigs: actions.myGigs.getMyGigs,
   loadMore: actions.myGigs.loadMoreMyGigs,
-  getPhases: actions.lookup.getGigPhases,
   getProfile: actions.myGigs.getProfile,
-  getStatuses: actions.lookup.getGigStatuses,
+  // getStatuses: actions.lookup.getGigStatuses,
   updateProfile: actions.myGigs.updateProfile,
 };
 

src/containers/MyGigs/index.jsx

@@ -11,35 +11,34 @@ import IconClose from "assets/icons/close.svg";
 import IconInfo from "assets/icons/info.svg";
 import StatusTooltip from "./tooltips/StatusTooltip";
 import actions from "../../../../actions";
-import _, { size } from "lodash";
+import _, { size, values } from "lodash";
 
-import * as constants from "constants";
+import { GIG_STATUS } from "../../../../constants";
 import * as utils from "utils";
 
 import "./styles.scss";
 
 const UpdateGigProfile = ({
   profile,
-  statuses,
   onSubmit,
   onClose,
   countries,
   getAllCountries,
 }) => {
+  const statuses = values(GIG_STATUS);
   const countryOptions = useMemo(() => {
     const selectedCountry = countries.find(
       (country) => country.countryCode === profile.country
     );
-    const selectedCountryName = _.get(selectedCountry, "name");
     return utils.createDropdownOptions(
       countries.map((country) => country.name),
-      selectedCountryName
+      selectedCountry
     );
   }, [profile, countries]);
 
   const statusOptions = useMemo(() => {
     const selected = profile.status;
-    const options = statuses.filter((s) => s !== constants.GIG_STATUS.PLACED);
+    const options = statuses.filter((s) => s !== GIG_STATUS.PLACED);
     return utils.createDropdownOptions(options, selected);
   }, [profile, statuses]);
 
@@ -278,7 +277,6 @@ const UpdateGigProfile = ({
 
 UpdateGigProfile.propTypes = {
   profile: PT.shape(),
-  statuses: PT.arrayOf(PT.string),
   onSubmit: PT.func,
   onClose: PT.func,
 };

src/containers/MyGigs/modals/UpdateGigProfile/index.jsx

@@ -8,8 +8,7 @@ const defaultState = {
   tags: [],
   subCommunities: [],
   isLoggedIn: null,
-  gigPhases: [],
-  gigStatuses: [],
+  // gigStatuses: [],
   countries: [],
 };
 
@@ -25,13 +24,9 @@ function onCheckIsLoggedInDone(state, { payload }) {
   return { ...state, isLoggedIn: payload };
 }
 
-function onGetGigPhasesDone(state, { payload }) {
-  return { ...state, gigPhases: payload };
-}
-
-function onGetGigStatusesDone(state, { payload }) {
-  return { ...state, gigStatuses: payload };
-}
+// function onGetGigStatusesDone(state, { payload }) {
+//   return { ...state, gigStatuses: payload };
+// }
 
 function onGetAllCountriesDone(state, { payload }) {
   return { ...state, countries: payload };
@@ -42,8 +37,7 @@ export default handleActions(
     GET_TAGS_DONE: onGetTagsDone,
     GET_COMMUNITY_LIST_DONE: onGetCommunityListDone,
     CHECK_IS_LOGGED_IN_DONE: onCheckIsLoggedInDone,
-    GET_GIG_PHASES_DONE: onGetGigPhasesDone,
-    GET_GIG_STATUSES_DONE: onGetGigStatusesDone,
+    // GET_GIG_STATUSES_DONE: onGetGigStatusesDone,
     GET_ALL_COUNTRIES_DONE: onGetAllCountriesDone,
   },
   defaultState

src/reducers/lookup.js

@@ -1,7 +1,6 @@
 import api from "./api";
 import qs from "qs";
 import * as utils from "../utils";
-import myGigsData from "../assets/data/my-gigs.json";
 
 async function getTags() {
   const v3 = true;
@@ -54,13 +53,9 @@ async function getCommunityList() {
   );
 }
 
-async function getGigPhases() {
-  return Promise.resolve(myGigsData.phases);
-}
-
-async function getGigStatuses() {
-  return Promise.resolve(myGigsData.gigStatuses);
-}
+// async function getGigStatuses() {
+//   return Promise.resolve(myGigsData.gigStatuses);
+// }
 
 /**
  * Gets paginated countries
@@ -77,7 +72,6 @@ export default {
   getTags,
   getCommunityList,
   checkIsLoggedIn,
-  getGigPhases,
-  getGigStatuses,
+  // getGigStatuses,
   getPaginatedCountries,
 };

src/services/lookup.js

@@ -10,7 +10,10 @@ export * as myGig from "./myGig";
 export function createDropdownOptions(values, selectedValue) {
   return values.map((value) => ({
     label: `${value}`,
-    selected: !!selectedValue && selectedValue === value,
+    selected:
+      !!selectedValue &&
+      (selectedValue === value ||
+        (selectedValue.name && selectedValue.name === value)),
   }));
 }
 

src/utils/index.js

@@ -124,6 +124,7 @@ module.exports = (webpackConfigEnv) => {
         // Register routes
         require("./src/api/app-routes")(app);
       },
+      hot: true,
       port: 8008,
       host: "0.0.0.0",
     },