Upgrade to SkyPortal 582ddd01660c1fce1f131be5e30f24bf80ac0474

extensions/skyportal/static/js/actions.js

@@ -22,7 +22,42 @@ import * as favoritesActions from "./ducks/favorites";
 import * as rejectedActions from "./ducks/rejected_candidates";
 import * as tnsrobotsActions from "./ducks/tnsrobots";
 import * as enumTypesActions from "./ducks/enum_types";
+<<<<<<< extensions/skyportal/static/js/actions.js
 import * as shiftActions from "./ducks/shifts";
+=======
+import * as usersActions from "./ducks/users";
+import * as streamsActions from "./ducks/streams";
+import * as analysisServicesActions from "./ducks/analysis_services";
+
+// we also import actions that won't be hydrated, to make sure they are
+// registered as reducers, to avoid conflicts with redux-state-sync
+/* eslint-disable no-unused-vars */
+import * as sourceActions from "./ducks/source";
+import * as sourcesActions from "./ducks/sources";
+import * as recentGcnEventsActions from "./ducks/recentGcnEvents";
+import * as gcnTagsActions from "./ducks/gcnTags";
+import * as gcnEventActions from "./ducks/gcnEvent";
+import * as gcnEventsActions from "./ducks/gcnEvents";
+import * as weatherActions from "./ducks/weather";
+import * as spatialCatalogsActions from "./ducks/spatialCatalogs";
+import * as photometryActions from "./ducks/photometry";
+import * as classificationsActions from "./ducks/classifications";
+import * as sourcesInGcnActions from "./ducks/sourcesingcn";
+import * as candidateActions from "./ducks/candidate";
+import * as candidatesActions from "./ducks/candidates";
+import * as galaxiesActions from "./ducks/galaxies";
+import * as observationsActions from "./ducks/observations";
+import * as catalogQueriesActions from "./ducks/catalog_query";
+import * as surveyEfficiencyObservationsActions from "./ducks/survey_efficiency_observations";
+import * as surveyEfficiencyObservationPlansActions from "./ducks/survey_efficiency_observation_plans";
+import * as localizationActions from "./ducks/localization";
+import * as shiftActions from "./ducks/shift";
+import * as shiftsActions from "./ducks/shifts";
+import * as remindersActions from "./ducks/reminders";
+import * as groupActions from "./ducks/group";
+import * as instrumentActions from "./ducks/instrument";
+/* eslint-enable no-unused-vars */
+>>>>>>> skyportal/static/js/actions.js
 
 export default function hydrate() {
   return (dispatch) => {
@@ -47,10 +82,17 @@ export default function hydrate() {
     dispatch(rejectedActions.fetchRejected());
     dispatch(tnsrobotsActions.fetchTNSRobots());
     dispatch(enumTypesActions.fetchEnumTypes());
+    dispatch(allocationsActions.fetchAllocationsApiClassname());
     dispatch(observationPlansActions.fetchObservationPlanNames());
     dispatch(defaultFollowupRequestsActions.fetchDefaultFollowupRequests());
     dispatch(defaultObservationPlansActions.fetchDefaultObservationPlans());
     dispatch(defaultSurveyEfficienciesActions.fetchDefaultSurveyEfficiencies());
+<<<<<<< extensions/skyportal/static/js/actions.js
     dispatch(shiftActions.fetchShifts());
+=======
+    dispatch(usersActions.fetchUsers());
+    dispatch(streamsActions.fetchStreams());
+    dispatch(analysisServicesActions.fetchAnalysisServices());
+>>>>>>> skyportal/static/js/actions.js
   };
 }

extensions/skyportal/static/js/components/RecentSources.jsx

@@ -66,12 +66,14 @@ export const useSourceListStyles = makeStyles((theme) => ({
     display: "flex",
     flexFlow: "row nowrap",
     alignItems: "center",
-    padding: "0 0.625rem",
+    padding: "0 0.325rem",
   },
   sourceInfo: {
     display: "flex",
     flexDirection: "row",
+    justifyContent: "space-between",
     margin: "10px",
+    marginRight: 0,
     width: "100%",
   },
   sourceNameContainer: {
@@ -80,25 +82,45 @@ export const useSourceListStyles = makeStyles((theme) => ({
   },
   sourceName: {
     fontSize: "1rem",
+    paddingBottom: 0,
+    marginBottom: 0,
   },
   sourceNameLink: {
     color:
       theme.palette.mode === "dark"
         ? theme.palette.secondary.main
         : theme.palette.primary.main,
   },
+  classification: {
+    fontSize: "0.95rem",
+    color:
+      theme.palette.mode === "dark"
+        ? theme.palette.secondary.main
+        : theme.palette.primary.main,
+    fontWeight: "bold",
+    fontStyle: "italic",
+    marginLeft: "-0.09rem",
+    marginTop: "-0.4rem",
+  },
+  sourceCoordinates: {
+    marginTop: "0.1rem",
+    display: "flex",
+    flexDirection: "column",
+    "& > span": {
+      marginTop: "-0.2rem",
+    },
+  },
   link: {
     color: theme.palette.warning.main,
   },
   quickViewContainer: {
     display: "flex",
     flexDirection: "column",
     width: "45%",
-    alignItems: "center",
+    alignItems: "flex-end",
     justifyContent: "space-between",
   },
   quickViewButton: {
-    minHeight: "30px",
     visibility: "hidden",
     textAlign: "center",
     display: "none",
@@ -308,11 +330,16 @@ const RecentSourcesList = ({ sources, styles, search = false }) => {
     <div className={styles.sourceListContainer}>
       <ul className={styles.sourceList}>
         {sources.map((source) => {
+<<<<<<< extensions/skyportal/static/js/components/RecentSources.jsx
           let recentSourceName = `${source.obj_id}`;
           let grandma_source_classification = "I-care";
           let confirmed_or_rejected = 'not_confirmed';
           let grandma_obs_classification = null;
           let obs_status = null;
+=======
+          const recentSourceName = `${source.obj_id}`;
+          let classification = null;
+>>>>>>> skyportal/static/js/components/RecentSources.jsx
           if (source.classifications.length > 0) {
             // Display the most recent non-zero probability class
             const filteredClasses = source.classifications?.filter(
@@ -323,6 +350,7 @@ const RecentSourcesList = ({ sources, styles, search = false }) => {
             );
 
             if (sortedClasses.length > 0) {
+<<<<<<< extensions/skyportal/static/js/components/RecentSources.jsx
               const classification = sortedClasses[0].classification;
               if (!rejected_classes.includes(classification) && !confirmed_classes.includes(classification) && !not_confirmed_classes.includes(classification) && !obs_classes.includes(classification)) {
                 recentSourceName += ` (${classification})`;
@@ -351,6 +379,9 @@ const RecentSourcesList = ({ sources, styles, search = false }) => {
               } else if (grandma_obs_classification == 'STOP GRANDMA') {
                 obs_status = 'stop';
               }
+=======
+              classification = `(${sortedClasses[0].classification})`;
+>>>>>>> skyportal/static/js/components/RecentSources.jsx
             }
 
           }
@@ -396,6 +427,7 @@ const RecentSourcesList = ({ sources, styles, search = false }) => {
                   </Link>
                   <div className={styles.sourceInfo}>
                     <div className={styles.sourceNameContainer}>
+<<<<<<< extensions/skyportal/static/js/components/RecentSources.jsx
                       <span className={styles.sourceName}>
                         <Link to={`/source/${source.obj_id}`}>
                           <span className={styles.sourceNameLink}>
@@ -415,17 +447,60 @@ const RecentSourcesList = ({ sources, styles, search = false }) => {
                           source.ra
                         )} ${dec_to_dms(source.dec)}`}
                       </span>
+=======
+                      <Link
+                        to={`/source/${source.obj_id}`}
+                        className={styles.sourceName}
+                      >
+                        <span className={styles.sourceNameLink}>
+                          {recentSourceName}
+                        </span>
+                      </Link>
+                      {classification && (
+                        <span className={styles.classification}>
+                          {classification}
+                        </span>
+                      )}
+                      <div className={styles.sourceCoordinates}>
+                        <span
+                          style={{ fontSize: "0.95rem", whiteSpace: "pre" }}
+                        >
+                          {`\u03B1: ${ra_to_hours(source.ra)}`}
+                        </span>
+                        <span
+                          style={{ fontSize: "0.95rem", whiteSpace: "pre" }}
+                        >
+                          {`\u03B4: ${dec_to_dms(source.dec)}`}
+                        </span>
+                      </div>
+>>>>>>> skyportal/static/js/components/RecentSources.jsx
                       {source.resaved && <span>(Source was re-saved)</span>}
                     </div>
                     <div className={styles.quickViewContainer}>
-                      <span>
+                      <span style={{ textAlign: "right" }}>
                         {dayjs().to(dayjs.utc(`${source.created_at}Z`))}
                       </span>
+<<<<<<< extensions/skyportal/static/js/components/RecentSources.jsx
                       <SourceStatus source={source} />
                       <SourceQuickView
                         sourceId={source.obj_id}
                         className={styles.quickViewButton}
                       />
+=======
+                      <div
+                        style={{
+                          minHeight: "3rem",
+                          display: "flex",
+                          justifyContent: "space-between",
+                          alignItems: "flex-end",
+                        }}
+                      >
+                        <SourceQuickView
+                          sourceId={source.obj_id}
+                          className={styles.quickViewButton}
+                        />
+                      </div>
+>>>>>>> skyportal/static/js/components/RecentSources.jsx
                     </div>
                   </div>
                 </div>
@@ -525,41 +600,7 @@ RecentSources.propTypes = {
 };
 
 RecentSourcesSearchbar.propTypes = {
-  recentSources: PropTypes.arrayOf(
-    PropTypes.shape({
-      obj_id: PropTypes.string.isRequired,
-      ra: PropTypes.number,
-      dec: PropTypes.number,
-      created_at: PropTypes.string.isRequired,
-      thumbnails: PropTypes.arrayOf(
-        PropTypes.shape({
-          public_url: PropTypes.string,
-          is_grayscale: PropTypes.bool,
-          type: PropTypes.string,
-        })
-      ),
-      resaved: PropTypes.bool,
-      classifications: PropTypes.arrayOf(
-        PropTypes.shape({
-          author_name: PropTypes.string,
-          probability: PropTypes.number,
-          modified: PropTypes.string,
-          classification: PropTypes.string,
-          id: PropTypes.number,
-          obj_id: PropTypes.string,
-          author_id: PropTypes.number,
-          taxonomy_id: PropTypes.number,
-          created_at: PropTypes.string,
-        })
-      ),
-    })
-  ),
   styles: PropTypes.shape(Object).isRequired,
-  filter: PropTypes.func.isRequired,
-};
-
-RecentSourcesSearchbar.defaultProps = {
-  recentSources: undefined,
 };
 
 export default RecentSources;

extensions/skyportal/static/js/components/SourceDesktop.jsx

@@ -546,7 +546,11 @@ const SourceDesktop = ({ source }) => {
                 <div key="tns_name">
                   <a
                     key={source.tns_name}
-                    href={`https://www.wis-tns.org/object/${source.tns_name}`}
+                    href={`https://www.wis-tns.org/object/${
+                      source.tns_name.trim().includes(" ")
+                        ? source.tns_name.split(" ")[1]
+                        : source.tns_name
+                    }`}
                     target="_blank"
                     rel="noopener noreferrer"
                   >