Feature: My Projects Redo

.git-blame-ignore-revs

@@ -2,3 +2,6 @@
 
 # Applied automated eslint autofixes and prettier to map.es6
 be3a9b6041e451b02c671220be50b5ca33cae1a8
+# Prettier/ESLint autofixes to reduce merge noise between diverging branches
+# (beta after react router 6.14 upgrade; feature/my-projects)
+af65c7c161a3e044ec7a5910716edbb09f326462

hub/admin.py

@@ -34,6 +34,7 @@
     SearchQueryTooShortException,
 )
 from kpi.filters import SearchFilter
+from kpi.models.asset import AssetDeploymentStatus
 from .models import (
     ExtraUserDetail,
     ConfigurationFile,
@@ -179,7 +180,7 @@ def deployed_forms_count(self, obj):
         Django admin user changelist page
         """
         assets_count = obj.assets.filter(
-            _deployment_data__active=True
+            _deployment_status=AssetDeploymentStatus.DEPLOYED
         ).aggregate(count=Count('pk'))
         return assets_count['count']
 

jsapp/js/actions.es6

@@ -263,10 +263,13 @@ actions.resources.deployAsset.failed.listen(function(data, redeployment){
   alertify.alert(t('unable to deploy'), failure_message);
 });
 
-actions.resources.setDeploymentActive.listen(function(details) {
+actions.resources.setDeploymentActive.listen(function(details, onComplete) {
   dataInterface.setDeploymentActive(details)
     .done((data) => {
       actions.resources.setDeploymentActive.completed(data.asset);
+      if (typeof onComplete === 'function') {
+        onComplete(data);
+      }
     })
     .fail(actions.resources.setDeploymentActive.failed);
 });

jsapp/js/actions/library.es6

@@ -193,9 +193,9 @@ libraryActions.getCollections.listen((params) => {
 
 libraryActions.moveToCollection.completed.listen((asset) => {
   if (asset.parent === null) {
-    notify(t('Successfuly removed from collection'));
+    notify(t('Successfully removed from collection'));
   } else {
-    notify(t('Successfuly moved to collection'));
+    notify(t('Successfully moved to collection'));
   }
 });
 libraryActions.moveToCollection.failed.listen(() => {

jsapp/js/alertify.ts

@@ -3,6 +3,8 @@ import alertify from 'alertifyjs';
 import {KeyNames} from 'js/constants';
 import type {IconName} from 'jsapp/fonts/k-icons';
 import {escapeHtml} from 'js/utils';
+import type {ReactElement} from 'react';
+import {render} from 'react-dom';
 
 interface MultiConfirmButton {
   label: string;
@@ -184,3 +186,13 @@ export function destroyConfirm(
 
   return dialog;
 }
+
+/**
+ * Useful to pass a complex JSX message into alertify (which accepts only
+ * strings).
+ */
+export function renderJSXMessage(jsx: ReactElement) {
+  const domNode = document.createElement('div');
+  render(jsx, domNode);
+  return domNode.outerHTML;
+}

jsapp/js/api.ts

@@ -16,7 +16,17 @@ const JSON_HEADER = 'application/json';
 //   500 // half second
 // );
 
-const fetchData = async <T>(path: string, method = 'GET', data?: Json) => {
+const fetchData = async <T>(
+  /** If you have full url to be called, remember to use `prependRootUrl`. */
+  path: string,
+  method = 'GET',
+  data?: Json,
+  /**
+   * Useful if you already have a full URL to be called and there is no point
+   * adding `ROOT_URL` to it.
+   */
+  prependRootUrl = true
+) => {
   const headers: {[key: string]: string} = {
     Accept: JSON_HEADER,
   };
@@ -30,7 +40,9 @@ const fetchData = async <T>(path: string, method = 'GET', data?: Json) => {
     headers['Content-Type'] = JSON_HEADER;
   }
 
-  const response = await fetch(ROOT_URL + path, {
+  const url = prependRootUrl ? ROOT_URL + path : path;
+
+  const response = await fetch(url, {
     method: method,
     headers,
     body: JSON.stringify(data),
@@ -92,6 +104,10 @@ export const fetchGet = async <T>(path: string) => fetchData<T>(path);
 export const fetchPost = async <T>(path: string, data: Json) =>
   fetchData<T>(path, 'POST', data);
 
+/** POST data to Kobo API at url */
+export const fetchPostUrl = async <T>(url: string, data: Json) =>
+  fetchData<T>(url, 'POST', data, false);
+
 /** PATCH (update) data to Kobo API at path */
 export const fetchPatch = async <T>(path: string, data: Json) =>
   fetchData<T>(path, 'PATCH', data);

jsapp/js/app.js

@@ -13,9 +13,10 @@ import 'js/surveyCompanionStore'; // importing it so it exists
 import {} from 'js/bemComponents'; // importing it so it exists
 import bem from 'js/bem';
 import mixins from 'js/mixins';
-import MainHeader from 'js/components/header';
+import MainHeader from 'js/components/header/mainHeader.component';
 import Drawer from 'js/components/drawer';
-import FormViewTabs from 'js/components/formViewTabs';
+import FormViewSideTabs from 'js/components/formViewSideTabs';
+import ProjectTopTabs from 'js/project/projectTopTabs.component';
 import PermValidator from 'js/components/permissions/permValidator';
 import {assign} from 'utils';
 import BigModal from 'js/components/bigModal/bigModal';
@@ -86,7 +87,7 @@ class App extends React.Component {
 
             {!this.isFormBuilder() && (
               <React.Fragment>
-                <MainHeader assetid={assetid} />
+                <MainHeader assetUid={assetid} />
                 <Drawer />
               </React.Fragment>
             )}
@@ -97,8 +98,8 @@ class App extends React.Component {
             >
               {!this.isFormBuilder() && (
                 <React.Fragment>
-                  <FormViewTabs type={'top'} show={this.isFormSingle()} />
-                  <FormViewTabs type={'side'} show={this.isFormSingle()} />
+                  {this.isFormSingle() && <ProjectTopTabs />}
+                  <FormViewSideTabs show={this.isFormSingle()} />
                 </React.Fragment>
               )}
               <Outlet />