@overmap-ai/core 1.0.60-sdk-refactor.16 → 1.0.60-sdk-refactor.19

package/dist/overmap-core.js

@@ -15473,9 +15473,7 @@ class JWTService extends BaseAuthService {
       }
       if (!response.access)
         throw new Error("Missing access token");
-      if (!response.refresh)
-        throw new Error("Missing refresh token");
-      return { accessToken: response.access, refreshToken: response.refresh };
+      return { accessToken: response.access, refreshToken: response.refresh ?? this.getRefreshToken() };
     });
   }
   /**
@@ -15661,12 +15659,7 @@ class CategoryService extends BaseApiService {
       blocks: []
     });
   }
-  async refreshStore() {
-    const { store } = this.client;
-    const projectId = store.getState().projectReducer.activeProjectId;
-    if (!projectId) {
-      throw new Error("No active project");
-    }
+  async refreshStore(projectId) {
     const result = await this.enqueueRequest({
       description: "Get categories",
       method: HttpMethod.GET,
@@ -15810,16 +15803,15 @@ class AssetService extends BaseApiService {
     });
     return batchPromises;
   }
-  async refreshStore() {
-    const { store } = this.client;
+  async refreshStore(projectId) {
     const result = await this.enqueueRequest({
       description: "Get assets",
       method: HttpMethod.GET,
-      url: `/projects/${store.getState().projectReducer.activeProjectId}/assets/`,
+      url: `/projects/${projectId}/assets/`,
       blockers: [],
       blocks: []
     });
-    store.dispatch(initializeAssets(result));
+    this.dispatch(initializeAssets(result));
   }
 }
 class AssetStageCompletionService extends BaseApiService {
@@ -15846,12 +15838,11 @@ class AssetStageCompletionService extends BaseApiService {
     });
     return [offlineStageCompletion, promise];
   }
-  async refreshStore() {
-    const { store } = this.client;
+  async refreshStore(projectId) {
     const result = await this.enqueueRequest({
       description: "Get stage completions",
       method: HttpMethod.GET,
-      url: `/projects/${store.getState().projectReducer.activeProjectId}/asset-stage-completions/`,
+      url: `/projects/${projectId}/asset-stage-completions/`,
       blockers: [],
       blocks: []
     });
@@ -16019,12 +16010,11 @@ class AssetStageService extends BaseApiService {
       throw e;
     }
   }
-  async refreshStore() {
-    const { store } = this.client;
+  async refreshStore(projectId) {
     const result = await this.enqueueRequest({
       description: "Get asset stages",
       method: HttpMethod.GET,
-      url: `/projects/${store.getState().projectReducer.activeProjectId}/asset-stages/`,
+      url: `/projects/${projectId}/asset-stages/`,
       blockers: [],
       blocks: []
     });
@@ -16185,14 +16175,12 @@ class BaseAttachmentService extends BaseApiService {
   }
   // Note that currently the fetching of attachments for all models dependds on the active projectId. This may change in the future. And
   //  so for some attachment model services, this method will have to be overridden.
-  async refreshStore() {
-    const { store } = this.client;
-    const activeProjectId = store.getState().projectReducer.activeProjectId;
+  async refreshStore(projectId) {
     const meta = AttachmentModelMeta[this.attachmentModel];
     const result = await this.enqueueRequest({
       description: `Get ${meta.name} attachments`,
       method: HttpMethod.GET,
-      url: `/projects/${activeProjectId}${meta.fetchUrlPostfix}/`,
+      url: `/projects/${projectId}${meta.fetchUrlPostfix}/`,
       blocks: [],
       blockers: []
     });
@@ -16288,12 +16276,11 @@ class AssetTypeService extends BaseApiService {
       throw e;
     });
   }
-  async refreshStore() {
-    const { store } = this.client;
+  async refreshStore(projectId) {
     const result = await this.enqueueRequest({
       description: "Get asset types",
       method: HttpMethod.GET,
-      url: `/projects/${store.getState().projectReducer.activeProjectId}/asset-types/`,
+      url: `/projects/${projectId}/asset-types/`,
       blockers: [],
       blocks: []
     });
@@ -16392,13 +16379,11 @@ class IssueCommentService extends BaseApiService {
     });
     return promise;
   }
-  async refreshStore() {
-    const { store } = this.client;
+  async refreshStore(projectId) {
     const result = await this.enqueueRequest({
       description: "Get comments",
       method: HttpMethod.GET,
-      // TODO: Choose between /issues/comments/in-project/${projectId}/ and /projects/${projectId}/issue-comments/
-      url: `/projects/${store.getState().projectReducer.activeProjectId}/comments/`,
+      url: `/projects/${projectId}/comments/`,
       blockers: [],
       blocks: []
     });
@@ -16406,12 +16391,11 @@ class IssueCommentService extends BaseApiService {
   }
 }
 class IssueUpdateService extends BaseApiService {
-  async refreshStore() {
-    const { store } = this.client;
+  async refreshStore(projectId) {
     const result = await this.enqueueRequest({
       description: "Get issue updates",
       method: HttpMethod.GET,
-      url: `/projects/${store.getState().projectReducer.activeProjectId}/issues/updates/`,
+      url: `/projects/${projectId}/issues/updates/`,
       blockers: [],
       blocks: []
     });
@@ -16642,12 +16626,7 @@ class IssueService extends BaseApiService {
     }
   }
   // Special functions
-  async refreshStore() {
-    const { store } = this.client;
-    const projectId = store.getState().projectReducer.activeProjectId;
-    if (!projectId) {
-      throw new Error("No active project");
-    }
+  async refreshStore(projectId) {
     const result = await this.enqueueRequest({
       description: "Get issues",
       method: HttpMethod.GET,
@@ -16668,23 +16647,19 @@ class IssueService extends BaseApiService {
   }
 }
 class IssueTypeService extends BaseApiService {
-  add(payload) {
+  add(payload, organizationId) {
     const { store } = this.client;
     const state = store.getState();
-    const activeOrganizationId = state.organizationReducer.activeOrganizationId;
-    if (!activeOrganizationId) {
-      throw new Error(`No active organization, got ${activeOrganizationId} for activeOrganizationId.`);
-    }
     const offlineIssueType = offline({
       ...payload,
       submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
       created_by: state.userReducer.currentUser.id,
-      organization: activeOrganizationId
+      organization: organizationId
     });
     this.dispatch(addIssueType(offlineIssueType));
     const promise = this.enqueueRequest({
       method: HttpMethod.POST,
-      url: `/organizations/${activeOrganizationId}/issue-types/`,
+      url: `/organizations/${organizationId}/issue-types/`,
       // Sending only whats needed here
       payload: {
         offline_id: offlineIssueType.offline_id,
@@ -16752,15 +16727,10 @@ class IssueTypeService extends BaseApiService {
     });
     return promise;
   }
-  async refreshStore() {
-    const { store } = this.client;
-    const activeOrganizationId = store.getState().organizationReducer.activeOrganizationId;
-    if (!activeOrganizationId) {
-      throw new Error(`No active organization, got ${activeOrganizationId} for activeOrganizationId.`);
-    }
+  async refreshStore(organizationId) {
     const result = await this.enqueueRequest({
       method: HttpMethod.GET,
-      url: `/organizations/${activeOrganizationId}/issue-types/`,
+      url: `/organizations/${organizationId}/issue-types/`,
       blockers: [],
       blocks: []
     });
@@ -16799,25 +16769,18 @@ class ProjectAccessService extends BaseApiService {
       blocks: []
     });
   }
-  async refreshStore() {
-    const { store } = this.client;
-    const state = store.getState();
-    const projectId = state.projectReducer.activeProjectId;
-    if (!projectId) {
-      throw new Error("No active project");
-    }
+  async refreshStore(projectId) {
     const promise = this.fetchAll(projectId);
     const result = await promise;
     this.dispatch(setProjectAccesses(result));
   }
 }
 class ProjectFileService extends BaseApiService {
-  async refreshStore() {
-    const { store } = this.client;
+  async refreshStore(projectId) {
     const result = await this.enqueueRequest({
       description: "Get project files",
       method: HttpMethod.GET,
-      url: `/projects/${store.getState().projectReducer.activeProjectId}/files/`,
+      url: `/projects/${projectId}/files/`,
       blockers: [],
       blocks: []
     });
@@ -16955,10 +16918,6 @@ class ProjectService extends BaseApiService {
       throw new Error("Project type was not chosen when trying to create a project");
     }
     const isOrganizationProject = !!project.owner_organization;
-    const activeOrganization = this.client.store.getState().organizationReducer.activeOrganizationId;
-    if (isOrganizationProject && (!activeOrganization || project.owner_organization !== activeOrganization)) {
-      throw new Error("User tried creating organization project for organization they do not belong to.");
-    }
     const url = isOrganizationProject ? `/organizations/${project.owner_organization}/projects/` : "/projects/";
     const projectType = isOrganizationProject ? { organization_owner: project.owner_organization } : { user_owner: project.owner_user };
     const result = await this.enqueueRequest({
@@ -17345,20 +17304,15 @@ class UserFormService extends BaseApiService {
       throw e;
     }
   }
-  async refreshStore() {
-    const { store } = this.client;
-    const activeProjectId = store.getState().projectReducer.activeProjectId;
-    if (!activeProjectId) {
-      throw new Error("No active project");
-    }
+  async refreshStore(projectId) {
     const forms = [];
     const revisions = [];
     const attachments = [];
     const projectFormsResult = await this.enqueueRequest({
       description: "Fetch project forms",
       method: HttpMethod.GET,
-      url: `/projects/${activeProjectId}/forms/`,
-      blockers: [activeProjectId.toString()],
+      url: `/projects/${projectId}/forms/`,
+      blockers: [projectId.toString()],
       blocks: []
     });
     for (const form of projectFormsResult.forms)
@@ -17370,8 +17324,8 @@ class UserFormService extends BaseApiService {
     const organizationFormsResult = await this.enqueueRequest({
       description: "Fetch organization forms",
       method: HttpMethod.GET,
-      url: `/projects/${activeProjectId}/organizations/forms/`,
-      blockers: [activeProjectId.toString()],
+      url: `/projects/${projectId}/organizations/forms/`,
+      blockers: [projectId.toString()],
       blocks: []
     });
     for (const form of organizationFormsResult.forms)
@@ -17383,8 +17337,8 @@ class UserFormService extends BaseApiService {
     const assetTypeFormsResult = await this.enqueueRequest({
       description: "Fetch asset type forms",
       method: HttpMethod.GET,
-      url: `/projects/${activeProjectId}/asset-types/forms/`,
-      blockers: [activeProjectId.toString()],
+      url: `/projects/${projectId}/asset-types/forms/`,
+      blockers: [projectId.toString()],
       blocks: []
     });
     for (const form of assetTypeFormsResult.forms)
@@ -17396,8 +17350,8 @@ class UserFormService extends BaseApiService {
     const issueTypeFormsResult = await this.enqueueRequest({
       description: "Fetch issue type forms",
       method: HttpMethod.GET,
-      url: `/projects/${activeProjectId}/issue-types/forms/`,
-      blockers: [activeProjectId.toString()],
+      url: `/projects/${projectId}/issue-types/forms/`,
+      blockers: [projectId.toString()],
       blocks: []
     });
     for (const form of issueTypeFormsResult.forms)
@@ -17680,9 +17634,7 @@ class UserFormSubmissionService extends BaseApiService {
       throw e;
     }
   }
-  async refreshStore() {
-    const { store } = this.client;
-    const projectId = store.getState().projectReducer.activeProjectId;
+  async refreshStore(projectId) {
     const submissions = await this.enqueueRequest({
       description: "Fetch form submissions",
       method: HttpMethod.GET,
@@ -17753,6 +17705,16 @@ class WorkspaceService extends BaseApiService {
     });
     return promise;
   }
+  async refreshStore(projectId) {
+    const result = await this.enqueueRequest({
+      description: "Get workspaces",
+      method: HttpMethod.GET,
+      url: `/projects/${projectId}/workspaces/`,
+      blockers: [],
+      blocks: []
+    });
+    this.dispatch(initializeWorkspaces(result));
+  }
 }
 class OrganizationAccessService extends BaseApiService {
   async update(organizationAccess) {
@@ -17780,13 +17742,7 @@ class OrganizationAccessService extends BaseApiService {
       blocks: []
     });
   }
-  async refreshStore() {
-    const { store } = this.client;
-    const state = store.getState();
-    const organizationId = state.organizationReducer.activeOrganizationId;
-    if (!organizationId) {
-      return;
-    }
+  async refreshStore(organizationId) {
     const result = await this.enqueueRequest({
       description: "Get organization accesses",
       method: HttpMethod.GET,
@@ -18051,11 +18007,7 @@ class EmailDomainsService extends BaseApiService {
       throw e;
     });
   }
-  async refreshStore() {
-    const organizationId = this.client.store.getState().organizationReducer.activeOrganizationId;
-    if (!organizationId) {
-      throw new Error("No active organization");
-    }
+  async refreshStore(organizationId) {
     const result = await this.enqueueRequest({
       description: "Fetch email domains for organization",
       method: HttpMethod.GET,
@@ -18067,36 +18019,6 @@ class EmailDomainsService extends BaseApiService {
   }
 }
 class OrganizationService extends BaseApiService {
-  async fetchInitialOrganizationData(organizationId, showLoading) {
-    if (showLoading) {
-      this.dispatch(setIsFetchingInitialData(true));
-    }
-    return this.enqueueRequest({
-      description: "Get initial organization data",
-      method: HttpMethod.GET,
-      url: `/organizations/${organizationId}/initial-data/`,
-      payload: {},
-      isAuthNeeded: true,
-      blockers: [],
-      blocks: [organizationId.toString()]
-    }).then((result) => {
-      this._processInitialOrganizationData(result, showLoading);
-      return result;
-    });
-  }
-  _processInitialOrganizationData(data, showLoading) {
-    const activeOrganization = data.organization;
-    const organizationAccesses = data.organization_accesses;
-    const emailDomains = data.email_domains;
-    const users = data.users;
-    this.dispatch(addUsers(users));
-    this.dispatch(setActiveOrganizationId(activeOrganization.id));
-    this.dispatch(initializeOrganizationAccesses(organizationAccesses));
-    this.dispatch(initializeEmailDomains(emailDomains));
-    if (showLoading) {
-      this.dispatch(setIsFetchingInitialData(false));
-    }
-  }
   create(name) {
     return this.enqueueRequest({
       description: "Create organization",
@@ -18130,26 +18052,30 @@ class OrganizationService extends BaseApiService {
       blocks: []
     });
   }
-}
-class LicenseService extends BaseApiService {
-  async fetchLicensesForOrganization(organizationId, showLoading = false) {
-    if (showLoading) {
-      this.dispatch(setIsFetchingInitialData(true));
-    }
-    const result = await this.enqueueRequest({
-      description: "Get licenses",
+  async refreshStore(projectId, organizationId) {
+    const organizationsRecord = {};
+    const projectOrganizations = await this.enqueueRequest({
+      description: "Get organizations",
       method: HttpMethod.GET,
-      url: `/organizations/${organizationId}/licenses/`,
-      isAuthNeeded: true,
-      blockers: [organizationId.toString()],
-      blocks: ["add-issue", "add-form-entry", "change-access-level", "add-workspace"]
+      url: `/projects/${projectId}/organizations/`,
+      blockers: [],
+      blocks: []
     });
-    if (showLoading) {
-      this.dispatch(setIsFetchingInitialData(false));
+    for (const organization2 of projectOrganizations) {
+      organizationsRecord[organization2.id] = organization2;
     }
-    this.dispatch(addLicenses(result));
-    return result;
+    const organization = await this.enqueueRequest({
+      description: "Get organization",
+      method: HttpMethod.GET,
+      url: `/organizations/${organizationId}/`,
+      blockers: [],
+      blocks: []
+    });
+    organizationsRecord[organization.id] = organization;
+    this.dispatch(setOrganizations(Object.values(organizationsRecord)));
   }
+}
+class LicenseService extends BaseApiService {
   async getLicense(license) {
     const result = await this.enqueueRequest({
       description: "Get license",
@@ -18246,6 +18172,32 @@ class LicenseService extends BaseApiService {
       blocks: [license.offline_id]
     });
   }
+  async refreshStore(projectId, organizationId) {
+    const licencesRecord = {};
+    const organizationLicences = await this.enqueueRequest({
+      description: "Get licenses",
+      method: HttpMethod.GET,
+      url: `/organizations/${organizationId}/licenses/`,
+      isAuthNeeded: true,
+      blockers: [organizationId.toString()],
+      blocks: ["add-issue", "add-form-entry", "change-access-level", "add-workspace"]
+    });
+    for (const license of organizationLicences) {
+      licencesRecord[license.offline_id] = license;
+    }
+    const projectLicences = await this.enqueueRequest({
+      description: "Get licenses",
+      method: HttpMethod.GET,
+      url: `/projects/${projectId}/licenses/`,
+      isAuthNeeded: true,
+      blockers: [projectId.toString()],
+      blocks: ["add-issue", "add-form-entry", "change-access-level", "add-workspace"]
+    });
+    for (const license of projectLicences) {
+      licencesRecord[license.offline_id] = license;
+    }
+    this.dispatch(setLicenses(Object.values(licencesRecord)));
+  }
 }
 class DocumentService extends BaseApiService {
   // TODO: Support adding for project or organization
@@ -18378,22 +18330,18 @@ class DocumentService extends BaseApiService {
     });
     return promise;
   }
-  async refreshStore() {
-    const { store } = this.client;
-    const state = store.getState();
-    const activeProjectId = state.projectReducer.activeProjectId;
+  async refreshStore(projectId, organizationId) {
     const projectDocumentsPromise = this.enqueueRequest({
       description: "Get project documents",
       method: HttpMethod.GET,
-      url: `/projects/${activeProjectId}/documents/`,
+      url: `/projects/${projectId}/documents/`,
       blockers: [],
       blocks: []
     });
-    const activeOrganizationId = state.organizationReducer.activeOrganizationId;
     const organizationDocumentsPromise = this.enqueueRequest({
       description: "Get organization documents",
       method: HttpMethod.GET,
-      url: `/organizations/${activeOrganizationId}/documents/`,
+      url: `/organizations/${organizationId}/documents/`,
       blockers: [],
       blocks: []
     });
@@ -18506,13 +18454,11 @@ class AgentService extends BaseApiService {
       blocks: ["rate"]
     });
   }
-  async refreshStore() {
-    const { store } = this.client;
-    const activeProject = store.getState().projectReducer.activeProjectId;
+  async refreshStore(projectId) {
     const result = await this.enqueueRequest({
       description: "Get agent conversation history",
       method: HttpMethod.GET,
-      url: `/projects/${activeProject}/agent-conversations/`,
+      url: `/projects/${projectId}/agent-conversations/`,
       blockers: ["agent-conversations"],
       blocks: ["agent-conversations"]
     });
@@ -18520,16 +18466,10 @@ class AgentService extends BaseApiService {
   }
 }
 class TeamService extends BaseApiService {
-  add(teamPayload) {
-    const { store } = this.client;
-    const state = store.getState();
-    const activeOrganizationId = state.organizationReducer.activeOrganizationId;
-    if (!activeOrganizationId) {
-      throw new Error(`Expected active organization to be set, got ${activeOrganizationId}`);
-    }
+  add(teamPayload, organizationId) {
     const offlineTeam = offline({
       ...teamPayload,
-      organization: activeOrganizationId,
+      organization: organizationId,
       submitted_at: (/* @__PURE__ */ new Date()).toISOString()
       // TODO: uncomment once supported
       // created_by: state.userReducer.currentUser.id,
@@ -18538,7 +18478,7 @@ class TeamService extends BaseApiService {
     const promise = this.enqueueRequest({
       description: "Create team",
       method: HttpMethod.POST,
-      url: `/organizations/${activeOrganizationId}/teams/`,
+      url: `/organizations/${organizationId}/teams/`,
       payload: offlineTeam,
       // No blocks since users and organizations are not offline
       blockers: [],
@@ -18642,16 +18582,11 @@ class TeamService extends BaseApiService {
     const newMembers = team.members.filter((member) => !members.includes(member));
     return this.setMembers(teamId, newMembers);
   }
-  async refreshStore() {
-    const { store } = this.client;
-    const activeOrganizationId = store.getState().organizationReducer.activeOrganizationId;
-    if (!activeOrganizationId) {
-      throw new Error(`Expected active organization to be set, got ${activeOrganizationId}`);
-    }
+  async refreshStore(organizationId) {
     const result = await this.enqueueRequest({
       description: "Fetch teams",
       method: HttpMethod.GET,
-      url: `/organizations/${activeOrganizationId}/teams/`,
+      url: `/organizations/${organizationId}/teams/`,
       blockers: [],
       blocks: []
     });