@overmap-ai/core 1.0.63-selector-standardization.8 → 1.0.63-selector-standardization.9

package/dist/overmap-core.js

@@ -1786,9 +1786,6 @@ const selectLicenses = (state) => {
   return state.licenseReducer.instances;
 };
 const selectLicense = (id) => (state) => state.licenseReducer.instances[id];
-const selectActiveLicense = (state) => Object.values(state.licenseReducer.instances).find(
-  (license) => license.project === state.projectReducer.activeProjectId
-) ?? null;
 const selectLicenseForProject = (projectId) => (state) => Object.values(state.licenseReducer.instances).find((license) => license.project === projectId);
 const selectActiveStatusLicenses = createSelector(
   [selectLicenses],
@@ -4708,13 +4705,11 @@ class AssetAttachmentService extends BaseAttachmentService {
 class AssetTypeService extends BaseApiService {
   add(assetType) {
     const offlineAssetType = offline(assetType);
-    const { store } = this.client;
-    const activeProjectId = store.getState().projectReducer.activeProjectId;
     this.dispatch(addAssetType(offlineAssetType));
     const promise = this.enqueueRequest({
       description: "Create asset type",
       method: HttpMethod.POST,
-      url: `/projects/${activeProjectId}/asset-types/`,
+      url: `/projects/${assetType.project}/asset-types/`,
       payload: { ...offlineAssetType },
       blockers: [],
       blocks: [offlineAssetType.offline_id]
@@ -5709,10 +5704,6 @@ class FormService extends BaseUploadService {
     const offlineRevision = offline(revision);
     const { store } = this.client;
     const state = store.getState();
-    const activeProjectId = state.projectReducer.activeProjectId;
-    if (!activeProjectId) {
-      throw new Error("Cannot create form revision when there is no active project.");
-    }
     const currentUserId = state.userReducer.currentUser.id;
     const { fields, images } = await separateImageFromFields(offlineRevision.fields);
     const fullRevision = {
@@ -5751,10 +5742,9 @@ class FormService extends BaseUploadService {
     });
     return [fullRevision, offlineFormRevisionAttachments, promise, attachmentsPromise];
   }
-  async favorite(formId) {
+  async favorite(formId, projectId) {
     const { store } = this.client;
     const state = store.getState();
-    const activeProjectId = state.projectReducer.activeProjectId;
     const form = state.formReducer.instances[formId];
     if (!form) {
       throw new Error(`Expected form to exist, got ${form}`);
@@ -5764,7 +5754,7 @@ class FormService extends BaseUploadService {
       await this.enqueueRequest({
         description: "Favorite form",
         method: HttpMethod.POST,
-        url: `/forms/${formId}/favorite/${activeProjectId}/`,
+        url: `/forms/${formId}/favorite/${projectId}/`,
         blockers: [formId, `favorite-${formId}`],
         blocks: [`favorite-${formId}`]
       });
@@ -5773,10 +5763,9 @@ class FormService extends BaseUploadService {
       throw e;
     }
   }
-  async unfavorite(formId) {
+  async unfavorite(formId, projectId) {
     const { store } = this.client;
     const state = store.getState();
-    const activeProjectId = state.projectReducer.activeProjectId;
     const form = state.formReducer.instances[formId];
     if (!form) {
       throw new Error(`Expected form to exist, got ${form}`);
@@ -5786,7 +5775,7 @@ class FormService extends BaseUploadService {
       return await this.enqueueRequest({
         description: "Unfavorite form",
         method: HttpMethod.DELETE,
-        url: `/forms/${formId}/unfavorite/${activeProjectId}/`,
+        url: `/forms/${formId}/unfavorite/${projectId}/`,
         blockers: [formId, `favorite-${formId}`],
         blocks: [`favorite-${formId}`]
       });
@@ -5998,10 +5987,6 @@ class FormSubmissionService extends BaseUploadService {
   async add(payload) {
     const { store } = this.client;
     const state = store.getState();
-    const activeProjectId = state.projectReducer.activeProjectId;
-    if (!activeProjectId) {
-      throw new Error("Expected an active project");
-    }
     const { values, files } = separateFilesFromValues(payload.values);
     const offlineSubmission = offline({
       ...payload,
@@ -6013,7 +5998,7 @@ class FormSubmissionService extends BaseUploadService {
       description: "Respond to form",
       method: HttpMethod.POST,
       url: `/forms/revisions/${payload.form_revision}/respond/`,
-      payload: { ...offlineSubmission, project: activeProjectId },
+      payload: offlineSubmission,
       blockers: [payload.issue, payload.asset, payload.asset_stage, "add-form-entry"].filter(
         (x) => x !== void 0
       ),
@@ -6234,13 +6219,12 @@ class FormSubmissionService extends BaseUploadService {
 }
 class WorkspaceService extends BaseApiService {
   add(workspace) {
-    const { store } = this.client;
     const offlineWorkspace = offline(workspace);
     this.dispatch(addWorkspace(offlineWorkspace));
     const promise = this.enqueueRequest({
       description: "Create Workspace",
       method: HttpMethod.POST,
-      url: `/projects/${store.getState().projectReducer.activeProjectId}/workspaces/`,
+      url: `/projects/${workspace.project}/workspaces/`,
       payload: offlineWorkspace,
       blockers: ["add-workspace"],
       blocks: [offlineWorkspace.offline_id]
@@ -7764,7 +7748,6 @@ export {
   saveActiveProjectFileBounds,
   searchIssues,
   selectAccessToken,
-  selectActiveLicense,
   selectActiveOrganizationAccess,
   selectActiveProject,
   selectActiveProjectAccess,