use usrCrsDb interface to update settings (#666)

Author: NiloCK

.github/workflows/build-express.yml

@@ -43,6 +43,9 @@ jobs:
       - name: Build common package
         run: yarn workspace @vue-skuilder/common build
 
+      - name: Build db package
+        run: yarn workspace @vue-skuilder/db build
+
       - name: Build and test express package
         run: |
           yarn workspace @vue-skuilder/express build

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "test-couch"]
 	path = test-couch
-	url = http://github.com/nilock/skuilder-test-db
+	url = http://github.com/patched-network/skuilder-test-db

packages/common/src/ENVIRONMENT_VARS.ts

@@ -38,21 +38,43 @@ declare global {
 
 // Default fallback values if all else fails
 const defaultEnv: Environment = {
-  COUCHDB_SERVER_URL: 'default:5984/',
+  COUCHDB_SERVER_URL: 'localhost:5984/',
   COUCHDB_SERVER_PROTOCOL: 'http',
   EXPRESS_SERVER_URL: 'localhost:3000/',
   EXPRESS_SERVER_PROTOCOL: 'http',
   DEBUG: false,
   MOCK: false,
 };
 
-// Get environment from global or default
-const ENV: Environment =
-  typeof window !== 'undefined' && window.__SKUILDER_ENV__
-    ? { ...defaultEnv, ...window.__SKUILDER_ENV__ }
-    : defaultEnv;
+// Determine if we're in browser or Node environment
+const isBrowser = typeof window !== 'undefined';
 
-// Log the initialized environment
-console.log('ENV initialized:', ENV);
+// Function to get environment from Node process.env
+function getNodeEnv(): Environment {
+  console.log(`Process.env: ${JSON.stringify(process.env)}`);
+  return {
+    COUCHDB_SERVER_URL: process.env.COUCHDB_SERVER || defaultEnv.COUCHDB_SERVER_URL,
+    COUCHDB_SERVER_PROTOCOL: (process.env.COUCHDB_PROTOCOL ||
+      defaultEnv.COUCHDB_SERVER_PROTOCOL) as ProtocolString,
+    EXPRESS_SERVER_URL: process.env.EXPRESS_SERVER || defaultEnv.EXPRESS_SERVER_URL,
+    EXPRESS_SERVER_PROTOCOL: (process.env.EXPRESS_PROTOCOL ||
+      defaultEnv.EXPRESS_SERVER_PROTOCOL) as ProtocolString,
+    DEBUG: process.env.DEBUG === 'true' || defaultEnv.DEBUG,
+    MOCK: process.env.MOCK === 'true' || defaultEnv.MOCK,
+  };
+}
+
+// Get environment based on runtime context
+let ENV: Environment;
+
+if (isBrowser) {
+  // Browser environment - use window.__SKUILDER_ENV__ if available
+  ENV = window.__SKUILDER_ENV__ ? { ...defaultEnv, ...window.__SKUILDER_ENV__ } : defaultEnv;
+  console.log('Browser ENV initialized:', ENV);
+} else {
+  // Node.js environment - use process.env
+  ENV = getNodeEnv();
+  console.log('Node ENV initialized:', ENV);
+}
 
 export default ENV;

packages/courses/src/piano/utility/MidiConfig.vue

@@ -81,7 +81,7 @@ import { defineComponent, ref, watch, onMounted } from 'vue';
 import { alertUser } from '@vue-skuilder/common-ui';
 import SkMidi from './midi';
 import { Status } from '@vue-skuilder/common';
-import { UserDBInterface } from '@vue-skuilder/db';
+import { UserDBInterface, getDataLayer } from '@vue-skuilder/db';
 import { InputEventNoteon } from 'webmidi';
 import PianoRangeVisualizer from './PianoRangeVisualizer.vue';
 
@@ -437,7 +437,10 @@ export default defineComponent({
 
     const saveSettings = async () => {
       updatePending.value = true;
-      await props.user.updateCourseSettings(props._id, [
+
+      const usrCrsDB = await getDataLayer().getUserDB().getCourseInterface(props._id);
+
+      usrCrsDB.updateCourseSettings([
         {
           key: 'midiinput',
           value: selectedInput.value,

packages/db/package.json

@@ -30,7 +30,7 @@
         "@nilock2/pouchdb-authentication": "^1.0.2",
         "@vue-skuilder/common": "workspace:*",
         "moment": "^2.29.4",
-        "pouchdb-browser": "^9.0.0",
+        "pouchdb": "^9.0.0",
         "pouchdb-find": "^9.0.0"
     },
     "devDependencies": {

packages/db/src/core/interfaces/adminDB.ts

@@ -1,4 +1,4 @@
-import { ClassroomConfig } from '@vue-skuilder/common';
+import { ClassroomConfig, CourseConfig } from '@vue-skuilder/common';
 
 /**
  * Admin functionality
@@ -12,7 +12,7 @@ export interface AdminDBInterface {
   /**
    * Get all courses
    */
-  getCourses(): Promise<PouchDB.Core.Document<{}>[]>;
+  getCourses(): Promise<CourseConfig[]>;
 
   /**
    * Remove a course

packages/db/src/impl/pouch/adminDB.ts

@@ -1,11 +1,16 @@
-import pouch from 'pouchdb-browser';
+import pouch from 'pouchdb';
 import { ENV } from '@vue-skuilder/common';
-import { pouchDBincludeCredentialsConfig, getStartAndEndKeys } from '.';
-import { getCourseList, removeCourse } from './courseDB';
+import {
+  pouchDBincludeCredentialsConfig,
+  getStartAndEndKeys,
+  getCredentialledCourseConfig,
+  updateCredentialledCourseConfig,
+} from '.';
 import { TeacherClassroomDB, ClassroomLookupDB } from './classroomDB';
 import { PouchError } from './types';
 
 import { AdminDBInterface } from '@/core';
+import CourseLookup from './courseLookupDB';
 
 export class AdminDB implements AdminDBInterface {
   private usersDB!: PouchDB.Database;
@@ -27,12 +32,31 @@ export class AdminDB implements AdminDBInterface {
       })
     ).rows.map((r) => r.doc!);
   }
+
   public async getCourses() {
-    return (await getCourseList()).rows.map((r) => r.doc!);
+    const list = await CourseLookup.allCourses();
+    return await Promise.all(
+      list.map((c) => {
+        return getCredentialledCourseConfig(c._id);
+      })
+    );
   }
   public async removeCourse(id: string) {
-    return await removeCourse(id);
+    // remove the indexer
+    const delResp = await CourseLookup.delete(id);
+
+    // set the 'CourseConfig' to 'deleted'
+    const cfg = await getCredentialledCourseConfig(id);
+    cfg.deleted = true;
+    const isDeletedResp = await updateCredentialledCourseConfig(id, cfg);
+
+    return {
+      ok: delResp.ok && isDeletedResp.ok,
+      id: delResp.id,
+      rev: delResp.rev,
+    };
   }
+
   public async getClassrooms() {
     // const joincodes =
     const uuids = (

packages/db/src/impl/pouch/classroomDB.ts

@@ -5,7 +5,7 @@ import {
 } from '@/core/interfaces/contentSource';
 import { ClassroomConfig, ENV } from '@vue-skuilder/common';
 import moment from 'moment';
-import pouch from 'pouchdb-browser';
+import pouch from 'pouchdb';
 import {
   getCourseDB,
   getStartAndEndKeys,

packages/db/src/impl/pouch/courseAPI.ts

@@ -1,4 +1,4 @@
-import pouch from 'pouchdb-browser';
+import pouch from 'pouchdb';
 import { pouchDBincludeCredentialsConfig } from '.';
 import { ENV } from '@vue-skuilder/common';
 // import { DataShape } from '../..base-course/Interfaces/DataShape';
@@ -136,16 +136,17 @@ async function addCard(
   return card;
 }
 
-export async function getCredentialledCourseConfig(courseID: string) {
-  const db = getCourseDB(courseID);
-  const ret = await db.get<CourseConfig>('CourseConfig');
-  ret.courseID = courseID;
-  console.log(`Returning corse config:
-
-  ${JSON.stringify(ret)}
-  `);
-
-  return ret;
+export async function getCredentialledCourseConfig(courseID: string): Promise<CourseConfig> {
+  try {
+    const db = getCourseDB(courseID);
+    const ret = await db.get<CourseConfig>('CourseConfig');
+    ret.courseID = courseID;
+    console.log(`Returning course config: ${JSON.stringify(ret)}`);
+    return ret;
+  } catch (e) {
+    console.error(`Error fetching config for ${courseID}:`, e);
+    throw e;
+  }
 }
 
 /**