rework ensureTypeIndexes

Author: Tim Berners-Lee

lib/signin.js

@@ -186,44 +186,48 @@ UI.widgets.loadTypeIndexes = function(context) {
 //         index.public
 //
 UI.widgets.ensureTypeIndexes = function(context) {
-    return new Promise(function(resolve, reject){
-        var kb = UI.store, tns = UI.ns, me = context.me;
-        return UI.widgets.loadTypeIndexes(context)
-        .then(function(context){
-            var ns = UI.ns, kb = UI.store, me = context.me;
-            var newIndex;
-
-            var makeIndex = function(visibility) {
-                var relevant = {'private': context.preferencesFile, 'public': context.publicProfile}[visibility];
-                if (context.index[visibility].length == 0) {
-                    newIndex = $rdf.sym(context.preferencesFile.dir().uri + '/' + visibility + 'TypeIndex.ttl');
-                    console.log("Creating new fresh type index " + newIndex)
-                    return kb.fetcher.webOperation('PUT', newIndex, {data: '# Type index'})
-                        .then(function(xhr){
-                            return new Promise(function(resolve, reject) {
-                                var ins = [$rdf.st(context.me, ns.solid(visibility + 'TypeIndex'), newIndex, relevant)];
-                                UI.store.updater.update([], ins, function(uri, ok, body){
-                                    if (ok) {
-                                        context.index[visibility].push(newIndex);
-                                        resolve(context);
-                                    } else {
-                                        reject("Adding link to new index file in " + relevant);
-                                    }
-                                })
-                            });
-                        })
-                        .catch(function(e){reject("Creating new index file " + e)})
-                } else {
-                    return Promise.resolve(context.index[visibility][0]); // exists
-                }
-            }
-            var ps = [ makeIndex('private'), makeIndex('public')];
-            Promise.all(ps).then(function(privPub){
-                resolve(context)
-            });
-        })
-    });
-}
+  return new Promise(function(resolve, reject){
+  var kb = UI.store, tns = UI.ns, me = context.me;
+  return UI.widgets.loadTypeIndexes(context)
+  .then(function(context){
+    var ns = UI.ns, kb = UI.store, me = context.me;
+    var newIndex;
+
+    var makeIndex = function(context, visibility) {
+      return new Promise( function(resolve, reject){
+        var relevant = {'private': context.preferencesFile, 'public': context.publicProfile}[visibility];
+        if (context.index[visibility].length == 0) {
+          newIndex = $rdf.sym(context.preferencesFile.dir().uri + visibility + 'TypeIndex.ttl');
+          console.log("Linking to new fresh type index " + newIndex)
+          addMe = [ $rdf.st(me,  ns.solid(visibility + 'TypeIndex'), newIndex, relevant)]
+          UI.store.updater.update([], addMe, function (uri, ok, body) {
+            if (!ok) {
+              reject('Error saving type index link saving back ' + uri + ': ' + body )
+            } else {
+              context.index[visibility].push(newIndex)
+              console.log("Creating new fresh type index " + newIndex)
+              if (!confirm("Creating new list of things  " + newIndex)){
+                reject('Cancelled by user: writing of '+ newIndex)
+              }
+              kb.fetcher.webOperation('PUT', newIndex, {data: '# '+ new Date()+' Blank initial Type index\n'})
+                  .then(function(xhr){
+                    resolve(context)
+                  })
+                  .catch(function(e){reject("Creating new index file " + e)})
+              }
+            })
+          } else {
+            resolve(context); // exists
+          }
+        }) // promise
+      } // makeIndex
+      var ps = [ makeIndex(context, 'private'), makeIndex(context, 'public')];
+      Promise.all(ps).then(function(privPub){
+          resolve(context)
+      });
+    }) // .then
+  }) // Promise
+} // ensureTypeIndexes
 
 // Returns promise of array of symbols
 //
@@ -263,7 +267,7 @@ UI.widgets.registrationControl = function(context, instance, klass) {
         var box = dom.createElement('div');
         context.div.appendChild(box);
         return UI.widgets.ensureTypeIndexes(context)
-            .then(function(indexes){
+            .then(function(context){
                 box.innerHTML = '<table><tbody><tr></tr><tr></tr></tbody></table>'; // tbody will be inserted anyway
                 box.setAttribute('style', 'font-size: 120%; text-align: right; padding: 1em; border: solid gray 0.05em;')
                 var tbody = box.children[0].children[0];
@@ -282,8 +286,9 @@ UI.widgets.registrationControl = function(context, instance, klass) {
                     tbody.children[1].appendChild(UI.widgets.buildCheckboxForm(
                         context.dom, UI.store, "Personal note of this " + context.noun, null, statement, form, index));
                 }
+
                 // UI.widgets.buildCheckboxForm(dom, kb, lab, del, ins, form, store)
-                resolve(box);
+                resolve(context);
             }).catch(function(e){reject(e)});
     })
 }
@@ -324,7 +329,7 @@ UI.widgets.registrationList = function(context, options) {
                     anchor.textContent = UI.utils.label(inst)
                   } else {
                     var deleteInstance = function(x){
-                      // @@@ TBD
+                      // @@@ TBD and added to opts
                     }
                     var opts = {}
                     var tr = UI.widgets.personTR(dom, ns.solid('instance'), inst, opts)
@@ -344,7 +349,7 @@ UI.widgets.registrationList = function(context, options) {
                 }
                 */
 
-                resolve(box);
+                resolve(context);
             }).catch(function(e){reject(e)});
     })
 }