code-dot-org · wjordan · Sep 6, 2018 · Aug 27, 2018 · Aug 29, 2018 · Aug 30, 2018
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -439,8 +439,8 @@ GEM
      representable (~> 3.0)
      retriable (>= 2.0, < 4.0)
      signet (~> 0.9)
-    google_drive (2.1.2)
-      google-api-client (>= 0.9.0, < 1.0.0)
+    google_drive (2.1.3)
+      google-api-client (>= 0.11.0, < 1.0.0)
      googleauth (>= 0.5.0, < 1.0.0)
      nokogiri (>= 1.5.3, < 2.0.0)
    googleauth (0.5.1)

diff --git a/apps/src/code-studio/pd/application_dashboard/detail_view_application_specific_questions.jsx b/apps/src/code-studio/pd/application_dashboard/detail_view_application_specific_questions.jsx
@@ -13,6 +13,7 @@ import {
  LabelOverrides as FacilitatorLabelOverrides,
  NumberedQuestions
 } from '@cdo/apps/generated/pd/facilitator1819ApplicationConstants';
+import SendPrincipalApprovalButton from './send_principal_approval_button';

 const TEACHER = 'Teacher';
 const FACILITATOR = 'Facilitator';
@@ -27,12 +28,14 @@ const paneledQuestions = {

 export default class DetailViewApplicationSpecificQuestions extends React.Component {
  static propTypes = {
+    id: PropTypes.string,
    formResponses: PropTypes.object.isRequired,
    applicationType: PropTypes.oneOf([TEACHER, FACILITATOR]).isRequired,
    editing: PropTypes.bool,
    scores: PropTypes.object,
    handleScoreChange: PropTypes.func,
-    applicationGuid: PropTypes.string
+    applicationGuid: PropTypes.string,
+    principalApprovalState: PropTypes.oneOf(['not_sent', 'sent', 'received'])
  };

  constructor(props) {
@@ -60,18 +63,31 @@ export default class DetailViewApplicationSpecificQuestions extends React.Compon
  renderResponsesForSection(section) {
    // Lame edge case but has to be done
    if (section === 'detailViewPrincipalApproval' && !this.props.formResponses['principalApproval']) {
-      return (
-        <span>
-          <h4>
-            Not yet submitted
-          </h4>
+      if (this.props.principalApprovalState === 'not_sent') {
+        return (
+          <div>
+            <h4>
+              Not required - request not sent to principal
+            </h4>
+            <SendPrincipalApprovalButton
+              id={this.props.id}
+            />
+          </div>
+        );
+      } else {
+        return (
          <span>
-            Link to principal approval form: (<a href={`/pd/application/principal_approval/${this.props.applicationGuid}`} target="_blank">
-             {`http://studio.code.org/pd/application/principal_approval/${this.props.applicationGuid}`}
-            </a>)
+            <h4>
+              Not yet submitted
+            </h4>
+            <span>
+              Link to principal approval form: (<a href={`/pd/application/principal_approval/${this.props.applicationGuid}`} target="_blank">
+               {`http://studio.code.org/pd/application/principal_approval/${this.props.applicationGuid}`}
+              </a>)
+            </span>
          </span>
-        </span>
-      );
+        );
+      }
    } else {
      return Object.keys(this.pageLabels[section]).map((question, j) => {
        return (

diff --git a/apps/src/code-studio/pd/application_dashboard/detail_view_contents.jsx b/apps/src/code-studio/pd/application_dashboard/detail_view_contents.jsx
@@ -97,7 +97,8 @@ export class DetailViewContents extends React.Component {
      application_guid: PropTypes.string,
      registered_teachercon: PropTypes.bool,
      registered_fit_weekend: PropTypes.bool,
-      attending_teachercon: PropTypes.bool
+      attending_teachercon: PropTypes.bool,
+      principal_approval_state: PropTypes.oneOf(['not_sent', 'sent', 'received'])
    }).isRequired,
    viewType: PropTypes.oneOf(['teacher', 'facilitator']).isRequired,
    onUpdate: PropTypes.func,
@@ -636,12 +637,14 @@ export class DetailViewContents extends React.Component {
  renderQuestions = () => {
    return (
      <DetailViewApplicationSpecificQuestions
+        id={this.props.applicationId}
        formResponses={this.props.applicationData.form_data}
        applicationType={this.props.applicationData.application_type}
        editing={this.state.editing}
        scores={this.state.response_scores}
        handleScoreChange={this.handleScoreChange}
        applicationGuid={this.props.applicationData.application_guid}
+        principalApprovalState={this.props.applicationData.principal_approval_state}
      />
    );
  };

diff --git a/apps/src/code-studio/pd/application_dashboard/quick_view_table.jsx b/apps/src/code-studio/pd/application_dashboard/quick_view_table.jsx
@@ -7,6 +7,7 @@ import {Button} from 'react-bootstrap';
 import _, {orderBy} from 'lodash';
 import { StatusColors } from './constants';
 import wrappedSortable from '@cdo/apps/templates/tables/wrapped_sortable';
+import SendPrincipalApprovalButton from './send_principal_approval_button';

 const styles = {
  table: {
@@ -179,10 +180,10 @@ export class QuickViewTable extends React.Component {
    },{
      property: 'id',
      header: {
-        label: 'View Application',
+        label: 'Actions',
      },
      cell: {
-        format: this.formatViewButton
+        format: this.formatActionsCell
      }
    });

@@ -236,15 +237,23 @@ export class QuickViewTable extends React.Component {
    );
  };

-  formatViewButton = (id) => {
+  formatActionsCell = (id, props) => {
    return (
-      <Button
-        bsSize="xsmall"
-        target="_blank"
-        href={this.context.router.createHref(`/${this.props.path}/${id}`)}
-      >
-        View Application
-      </Button>
+      <div>
+        <Button
+          bsSize="xsmall"
+          target="_blank"
+          href={this.context.router.createHref(`/${this.props.path}/${id}`)}
+        >
+          View Application
+        </Button>
+        <br/>
+        {
+          props['rowData']['principal_approval'] === 'No approval sent' && (
+            <SendPrincipalApprovalButton id={id}/>
+          )
+        }
+      </div>
    );
  };


diff --git a/apps/src/code-studio/pd/application_dashboard/send_principal_approval_button.jsx b/apps/src/code-studio/pd/application_dashboard/send_principal_approval_button.jsx
@@ -0,0 +1,56 @@
+import React, {PropTypes} from 'react';
+import Spinner from '../components/spinner.jsx';
+import $ from 'jquery';
+import {Button} from 'react-bootstrap';
+
+export default class SendPrincipalApprovalButton extends React.Component {
+  static propTypes = {
+    id: PropTypes.oneOfType([PropTypes.number, PropTypes.string]).isRequired
+  };
+
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      requestSending: false,
+      requestSent: false
+    };
+  }
+
+  sendPrincipalApproval = () => {
+    this.setState({
+      requestSending: true
+    });
+
+    $.ajax({
+      method: 'POST',
+      url: `/api/v1/pd/application/resend_principal_approval/${this.props.id}`
+    }).done(data => {
+      this.setState({
+        requestSent: true
+      });
+    });
+  };
+
+  render() {
+    if (this.state.requestSent) {
+      return (
+        <span>
+          Email sent!
+        </span>
+      );
+    } else if (this.state.requestSending) {
+      return (<Spinner size="small"/>);
+    } else {
+      return (
+        <Button
+          bsSize="xsmall"
+          target="_blank"
+          onClick={this.sendPrincipalApproval}
+        >
+          Send email to principal
+        </Button>
+      );
+    }
+  }
+}
diff --git a/apps/src/code-studio/pd/components/spinner.jsx b/apps/src/code-studio/pd/components/spinner.jsx
@@ -2,11 +2,15 @@
 * Loading spinner.
 */

-import React from 'react';
+import React, {PropTypes} from 'react';
 import FontAwesome from '@cdo/apps/templates/FontAwesome';

 export default class Spinner extends React.Component {
+  static propTypes = {
+    size: PropTypes.oneOf(['small', 'large'])
+  };
+
  render() {
-    return <FontAwesome icon="spinner" className="fa-pulse fa-3x"/>;
+    return <FontAwesome icon="spinner" className={`fa-pulse ${this.props.size !== 'small' ? 'fa-3x' : ''}`}/>;
  }
 }
diff --git a/apps/src/sites/studio/pages/projects/index.js b/apps/src/sites/studio/pages/projects/index.js
@@ -73,7 +73,7 @@ $(document).ready(() => {
    ReactDOM.render(
      <Provider store={store}>
        <PublicGallery
-          projectValidator={projectsData.projectValidator}
+          limitedGallery={projectsData.limitedGallery}
        />
      </Provider>,
      publicGallery);

diff --git a/apps/src/templates/projects/ProjectCardGrid.jsx b/apps/src/templates/projects/ProjectCardGrid.jsx
@@ -40,9 +40,8 @@ class ProjectCardGrid extends Component {
    }).isRequired,
    galleryType: PropTypes.oneOf(['personal', 'public']).isRequired,
    selectedGallery: PropTypes.string.isRequired,
-    // Project Validators need access to view more links for App Lab and Game Lab, hidden for everyone else.
-    // TODO: Erin B - remove when we have profanity filter and/or enough featured projects.
-    projectValidator: PropTypes.bool
+    // Controls hiding/showing view more links for App Lab and Game Lab.
+    limitedGallery: PropTypes.bool
  };

  componentWillReceiveProps(nextProps) {
@@ -115,7 +114,7 @@ class ProjectCardGrid extends Component {
              labKey="applab"
              labName={i18n.projectTypeApplab()}
              labViewMoreString={i18n.projectTypeApplabViewMore()}
-              hideViewMoreLink={!this.props.projectValidator}
+              hideViewMoreLink={this.props.limitedGallery}
              projectList={projectLists.applab}
              numProjectsToShow={numProjects}
              galleryType={this.props.galleryType}
@@ -127,7 +126,7 @@ class ProjectCardGrid extends Component {
              labKey="gamelab"
              labName={i18n.projectTypeGamelab()}
              labViewMoreString={i18n.projectTypeGamelabViewMore()}
-              hideViewMoreLink={!this.props.projectValidator}
+              hideViewMoreLink={this.props.limitedGallery}
              projectList={projectLists.gamelab}
              numProjectsToShow={numProjects}
              galleryType={this.props.galleryType}
@@ -204,7 +203,7 @@ class ProjectCardGrid extends Component {
                labKey="applab"
                labName={i18n.projectTypeAllProjectsApplab()}
                labViewMoreString={i18n.projectsViewAll()}
-                hideViewMoreLink={!this.props.projectValidator}
+                hideViewMoreLink={this.props.limitedGallery}
                projectList={projectLists.applab}
                numProjectsToShow={numProjects}
                galleryType={this.props.galleryType}
@@ -217,7 +216,7 @@ class ProjectCardGrid extends Component {
                labKey="gamelab"
                labName={i18n.projectTypeAllProjectsGamelab()}
                labViewMoreString={i18n.projectsViewAll()}
-                hideViewMoreLink={!this.props.projectValidator}
+                hideViewMoreLink={this.props.limitedGallery}
                projectList={projectLists.gamelab}
                numProjectsToShow={numProjects}
                galleryType={this.props.galleryType}

diff --git a/apps/src/templates/projects/PublicGallery.jsx b/apps/src/templates/projects/PublicGallery.jsx
@@ -38,9 +38,8 @@ class PublicGallery extends Component {
      artist: PropTypes.arrayOf(publishedProjectPropType),
      minecraft: PropTypes.arrayOf(publishedProjectPropType),
    }),
-    // Project Validators need access to view more links for App Lab and Game Lab, hidden for everyone else.
-    // TODO: Erin B - remove when we have profanity filter and/or enough featured projects.
-    projectValidator: PropTypes.bool
+    // Controls hiding/showing view more links for App Lab and Game Lab.
+    limitedGallery: PropTypes.bool
  };

  /**
@@ -70,7 +69,7 @@ class PublicGallery extends Component {
        <ProjectCardGrid
          projectLists={this.mapProjectData(projectLists)}
          galleryType="public"
-          projectValidator={this.props.projectValidator}
+          limitedGallery={this.props.limitedGallery}
        />
        <div style={styles.clear}/>
        <div style={styles.linkBox}>

diff --git a/apps/style/code-studio/levelbuilder.scss b/apps/style/code-studio/levelbuilder.scss
@@ -187,10 +187,21 @@ table.checkboxes {
  padding-top: 2%;
 }
 .audit_log{
+  width: 100%;
+
  tr:nth-child(odd){
    background-color: #f9cb81;
  }
+
  td{
-    padding: 5%;
+    padding: 2%;
+  }
+
+  .aud_date{
+    width: 25%;
+  }
+
+  .aud_person{
+    width: 43%;
  }
 }
diff --git a/dashboard/app/controllers/admin_users_controller.rb b/dashboard/app/controllers/admin_users_controller.rb
@@ -10,6 +10,7 @@ class AdminUsersController < ApplicationController
  RESTRICTED_USER_ATTRIBUTES_FOR_VIEW = %w(
    users.id
    email
+    primary_contact_info_id
    name
    user_type
    current_sign_in_at

diff --git a/...board/app/controllers/api/v1/pd/application/principal_approval_applications_controller.rb b/...board/app/controllers/api/v1/pd/application/principal_approval_applications_controller.rb
@@ -1,9 +1,7 @@
 module Api::V1::Pd::Application
  class PrincipalApprovalApplicationsController < Api::V1::Pd::FormsController
    def new_form
-      @application = Pd::Application::PrincipalApproval1819Application.new(
-        # current_user may not exist but might as well record it
-        user: current_user,
+      @application = Pd::Application::PrincipalApproval1819Application.find_or_create_by(
        application_guid: params.require(:application_guid)
      )
    end

diff --git a/dashboard/app/controllers/api/v1/pd/application/teacher_applications_controller.rb b/dashboard/app/controllers/api/v1/pd/application/teacher_applications_controller.rb
@@ -8,6 +8,12 @@ def new_form
      )
    end

+    def resend_principal_approval
+      ::Pd::Application::PrincipalApproval1819Application.create_placeholder_and_send_mail(
+        Pd::Application::Teacher1819Application.find(params[:id])
+      )
+    end
+
    protected

    def on_successful_create
@@ -16,7 +22,10 @@ def on_successful_create
      @application.update_user_school_info!

      ::Pd::Application::Teacher1819ApplicationMailer.confirmation(@application).deliver_now
-      ::Pd::Application::Teacher1819ApplicationMailer.principal_approval(@application).deliver_now
+
+      unless @application.regional_partner&.principal_approval == RegionalPartner::SELECTIVE_APPROVAL
+        ::Pd::Application::PrincipalApproval1819Application.create_placeholder_and_send_mail(@application)
+      end
    end
  end
 end
diff --git a/dashboard/app/controllers/pd/application/principal_approval_application_controller.rb b/dashboard/app/controllers/pd/application/principal_approval_application_controller.rb
@@ -23,7 +23,12 @@ def new
        principal_email: application_hash[:principal_email]
      }

-      if Pd::Application::PrincipalApproval1819Application.exists?(application_guid: params[:application_guid])
+      # Return submitted if the approval exists and is not a placeholder
+      # Rather annoyingly, we can't say "unless existing_approval&.placeholder?" because
+      # if there is no approval, (handling legacy case and proper fallback behavior
+      # in case we fail to create placeholders) we'd be rendering submitted
+      existing_approval = Pd::Application::PrincipalApproval1819Application.find_by(application_guid: params[:application_guid])
+      if existing_approval && !existing_approval.placeholder?
        return render :submitted
      end