hydrooj-addons-manager 0.1.2 → 0.1.5

package/index.ts

@@ -43,9 +43,11 @@ class AddonsManagerHandler extends Handler {
         for(const pkg of packages){
             if(checkPackageIsLocal(pkg)) lockedPackages.push(pkg);
         }
+        console.log(this.request);
         this.response.body = this.request.body ||{
             packages: packages,
             lockedPackages: lockedPackages,
+            success: null,
             result: null
         };
         this.renderHTML(this.response.template, {title: 'manage_addons'});
@@ -53,7 +55,7 @@ class AddonsManagerHandler extends Handler {
     async post()
     {
         const body = this.request.body;
-        const packages = await AddonsManagerHandler.model.getActivedPackages();
+        let packages = await AddonsManagerHandler.model.getActivedPackages();
         let lockedPackages = await AddonsManagerHandler.model.getLockedPackages();
         for(const pkg of packages){
             if(checkPackageIsLocal(pkg)) lockedPackages.push(pkg);
@@ -92,11 +94,23 @@ class AddonsManagerHandler extends Handler {
 
         // optional: better log formatting
         console.log(`[Addons Manager] Action=${pkg.action} Package=${pkg.name} Version=${pkg.version} Result=${JSON.stringify(result)}`);
-        this.back({
-            result: result, 
-            packages: packages,
-            lockedPackages: lockedPackages
-        });
+        if(result.success){
+            packages = await AddonsManagerHandler.model.getActivedPackages();
+            lockedPackages = await AddonsManagerHandler.model.getLockedPackages();
+            this.response.template = 'manage_addons.html';
+            for(const pkg of packages){
+                if(checkPackageIsLocal(pkg)) lockedPackages.push(pkg);
+            }
+            this.response.body = {
+                packages: packages,
+                lockedPackages: lockedPackages,
+                success: result.success,
+                result: result.message || 'Operation successful'
+            };
+            this.renderHTML(this.response.template, {title: 'manage_addons'});
+        }else {
+            throw new UserFacingError(result.message || 'Operation failed');
+        }
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hydrooj-addons-manager",
-  "version": "0.1.2",
+  "version": "0.1.5",
   "description": "addons manager for hydrooj",
   "main": "index.ts",
   "author": "https://github.com/Bryan0324",

package/templates/manage_addons.html

@@ -127,18 +127,17 @@
             <button type="submit" name="action" value="add" class="btn btn--primary">{{ _('activate') }}</button>
         </div>
         </form>
-    {% if result %}
-    {% if result.success %}
-    <div class="alert alert--success">
-        {{ result.success }}
-    </div>
-    {% else %}
-    <div class="alert alert--danger">
-        {{ result.error }}
-    </div>
-    {% endif %}
-    {% endif %}
     </div>
     </div>
 </div>
+<script>
+    const result = {{ result | dump | safe }};
+    console.log('Debug: ', result);
+</script>
+{% if success and result %}
+<script>
+    const message = {{ result | dump | safe }};
+    alert('✓ success:  ' + message);
+</script>
+{% endif %}
 {% endblock %}