[DNM] Ona Changes

dependencies/pip/requirements.in

@@ -90,3 +90,6 @@ django-trench==0.2.3
 
 # Python 3.8 support
 backports.zoneinfo; python_version < '3.9'
+
+# OnaData support
+PyJWT

dependencies/pip/requirements.txt

@@ -243,7 +243,9 @@ pycparser==2.21
 pygments==2.11.2
     # via -r dependencies/pip/requirements.in
 pyjwt==2.3.0
-    # via twilio
+    # via
+    #   -r dependencies/pip/requirements.in
+    #   twilio
 pymongo==3.12.3
     # via -r dependencies/pip/requirements.in
 pyopenssl==22.0.0

jsapp/js/actions.es6

@@ -23,6 +23,8 @@ import dataShareActions from './actions/dataShareActions';
 import {
   notify,
   replaceSupportEmail,
+  checkIfCookieExists,
+  redirectForOnaDataAuth,
 } from 'utils';
 
 // Configure Reflux
@@ -201,36 +203,68 @@ actions.resources.listTags.completed.listen(function(results){
 });
 
 actions.resources.updateAsset.listen(function(uid, values, params={}) {
-  dataInterface.patchAsset(uid, values)
-    .done((asset) => {
-      actions.resources.updateAsset.completed(asset);
-      if (typeof params.onComplete === 'function') {
-        params.onComplete(asset, uid, values);
+  if (checkIfCookieExists("__kpi_formbuilder")) {
+    redirectForOnaDataAuth()
+  } else {
+    return new Promise((resolve, reject) => {
+      dataInterface.patchAsset(uid, values)
+        .done((asset) => {
+          actions.resources.updateAsset.completed(asset);
+          resolve(asset);
+        })
+        .fail((resp) => {
+          if (resp.status === 500) {
+            reject(resp);
+          } else {
+            alertify.error(resp.responseJSON[0]);
+            reject(resp);
+          }
+        });
+    }).then((asset) => {
+      if (asset.asset_type === "survey") {
+        dataInterface.deployAsset(asset, asset.has_deployment)
+          .done((data) => {
+            if (asset.has_deployment) {
+              notify(t('Successfully updated published form.'));
+            } else {
+              notify(t('Successfully published form.'));
+            }
+          })
+          .fail((resp) => {
+            if (resp.status === 500) {
+              alertify.error(t('Internal Server Error: Kindly ensure the form has atleast one question'));
+            } else {
+              alertify.error(resp.responseText);
+            }
+          });
+      } else {
+        notify(t('Successfully updated asset.'));
       }
-      notify(t('successfully updated'));
+
+      return asset
     })
-    .fail(function(resp){
-      actions.resources.updateAsset.failed(resp);
-      if (params.onFailed) {
-        params.onFailed(resp);
-      }
-    });
+  }
 });
 
 actions.resources.deployAsset.listen(function(asset, redeployment, params={}){
-  dataInterface.deployAsset(asset, redeployment)
-    .done((data) => {
-      actions.resources.deployAsset.completed(data.asset);
-      if (typeof params.onDone === 'function') {
-        params.onDone(data, redeployment);
-      }
-    })
-    .fail((data) => {
-      actions.resources.deployAsset.failed(data, redeployment);
-      if (typeof params.onFail === 'function') {
-        params.onFail(data,  redeployment);
-      }
-    });
+  var asset_type = asset.asset_type;
+  if (asset_type === "survey") {
+    dataInterface.deployAsset(asset, redeployment)
+      .done((data) => {
+        actions.resources.deployAsset.completed(data.asset);
+        if (typeof params.onDone === 'function') {
+          params.onDone(data, redeployment);
+        }
+      })
+      .fail((data) => {
+        actions.resources.deployAsset.failed(data, redeployment);
+        if (typeof params.onFail === 'function') {
+          params.onFail(data,  redeployment);
+        }
+      });
+  } else {
+    notify(t('Asset of type ${asset_type} deployment is disabled'));
+  }
 });
 
 actions.resources.deployAsset.failed.listen(function(data, redeployment){

jsapp/js/bemComponents.ts

@@ -100,6 +100,7 @@ bem.LibNav__search = makeBem(bem.LibNav, 'search');
 bem.LibNav__expanded = makeBem(bem.LibNav, 'expanded');
 bem.LibNav__count = makeBem(bem.LibNav, 'count');
 bem.LibNav__expandedToggle = makeBem(bem.LibNav, 'expandedToggle');
+bem.LibNav__helperContainer = makeBem(bem.LibNav, 'helperContainer');
 
 bem.TemplatesList = makeBem(null, 'templates-list');
 bem.TemplatesList__header = makeBem(bem.TemplatesList, 'header');

jsapp/js/components/account/accountSettingsRoute.es6

@@ -15,6 +15,7 @@ import {
   addRequiredToLabel,
   stringToColor,
 } from 'utils';
+import { TITLE } from '../../ona/config';
 import {ROUTES} from 'js/router/routerConstants';
 import envStore from 'js/envStore';
 import './accountSettings.scss';
@@ -207,7 +208,7 @@ export default class AccountSettings extends React.Component {
     const metaFields = this.getDisplayMetaFields();
 
     return (
-      <DocumentTitle title={`${accountName} | KoboToolbox`}>
+      <DocumentTitle title={`${accountName} | ${ TITLE }`}>
         <bem.AccountSettings>
           <bem.AccountSettings__actions>
             <bem.KoboButton

jsapp/js/components/modalForms/projectSettings.es6

@@ -24,6 +24,7 @@ import {
   isAValidUrl,
   validFileTypes,
 } from 'utils';
+import { TITLE } from '../../ona/config';
 import {
   NAME_MAX_LENGTH,
   PROJECT_SETTINGS_CONTEXTS,
@@ -963,7 +964,7 @@ class ProjectSettings extends React.Component {
             <Checkbox
               checked={this.state.fields['share-metadata']}
               onChange={this.onAnyFieldChange.bind(this, 'share-metadata')}
-              label={t('Help KoboToolbox improve this product by sharing the sector and country where this project will be deployed.') + ' ' + t('All the information is submitted anonymously, and will not include the project name or description listed above.')}
+              label={`Help ${ TITLE } improve this product by sharing the sector and country where this project will be deployed.') + ' ' + t('All the information is submitted anonymously, and will not include the project name or description listed above.`}
             />
           </bem.FormModal__item>
 

jsapp/js/components/reports/reports.es6

@@ -16,6 +16,7 @@ import {txtid} from '../../../xlform/src/model.utils';
 import alertify from 'alertifyjs';
 import {launchPrinting} from 'utils';
 import {REPORT_STYLES} from './reportsConstants';
+import { TITLE } from '../../ona/config';
 import CustomReportForm from './customReportForm';
 import QuestionGraphSettings from './questionGraphSettings';
 import ReportContents from './reportContents';
@@ -525,7 +526,7 @@ export default class Reports extends React.Component {
     const hasGroupBy = this.state.groupBy.length !== 0;
 
     return (
-      <DocumentTitle title={`${docTitle} | KoboToolbox`}>
+      <DocumentTitle title={`${docTitle} | ${ TITLE }`}>
         <bem.FormView m={formViewModifiers}>
           <bem.ReportView>
             {this.renderReportButtons()}

jsapp/js/components/searchcollectionlist.es6

@@ -14,6 +14,7 @@ import DocumentTitle from 'react-document-title';
 import Dropzone from 'react-dropzone';
 import {validFileTypes} from 'utils';
 import {redirectToLogin} from 'js/router/routerUtils';
+import { TITLE } from '../ona/config';
 import {
   ASSET_TYPES,
   COMMON_QUERIES,
@@ -211,7 +212,7 @@ class SearchCollectionList extends Reflux.Component {
       docTitle = t('Library');
     }
     return (
-      <DocumentTitle title={`${docTitle} | KoboToolbox`}>
+      <DocumentTitle title={`${docTitle} | ${ TITLE }`}>
         <Dropzone
           onDrop={this.dropFiles}
           disableClick

jsapp/js/editorMixins/assetNavigator.es6

@@ -221,6 +221,16 @@ class AssetNavigator extends Reflux.Component {
         </bem.LibNav__header>
 
         <bem.LibNav__content>
+          <bem.LibNav__helperContainer>
+            <div className="header">
+              <span className="icon-container"><i className='k-icon-information' /></span>
+              <span><b>Quick tip</b></span>
+            </div>
+            <hr/>
+            <div className="body">
+              {t('You can drag and drop the items below to the form editor on the left')}
+            </div>
+          </bem.LibNav__helperContainer>
           <AssetNavigatorListView searchContext={this.state.searchContext} />
         </bem.LibNav__content>