Merge pull request #97 from uatisdeproblem/development

Development
uatisdeproblem · May 5, 2024 · e485884 · e485884
2 parents 99ad976 + b1269b9
commit e485884
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 41 deletions.
diff --git a/back-end/package-lock.json b/back-end/package-lock.json
diff --git a/back-end/package.json b/back-end/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.10.0",
+  "version": "1.10.1",
   "name": "back-end",
   "scripts": {
     "lint": "eslint --ext .ts",
@@ -13,7 +13,7 @@
     "idea-aws": "4.3.4",
     "idea-toolbox": "7.0.1",
     "jsonwebtoken": "^9.0.1",
-    "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.1/xlsx-0.20.1.tgz",
+    "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz",
     "xml2js": "^0.6.2"
   },
   "devDependencies": {

diff --git a/back-end/src/models/topic.model.ts b/back-end/src/models/topic.model.ts
@@ -57,6 +57,7 @@ export class Topic extends Resource {
   willCloseAt?: epochISOString;
   /**
    * The timestamp when the topic was closed. A topic which is closed cannot accept new interactions.
+   * Note: `TopicTypes.LIVE` topics are closed when they are created and opened when needed.
    */
   closedAt?: epochISOString;
   /**

diff --git a/back-end/swagger.yaml b/back-end/swagger.yaml
@@ -2,7 +2,7 @@ openapi: 3.0.3
 
 info:
   title: ESN Assembly app
-  version: 1.10.0
+  version: 1.10.1
   contact:
     name: Matteo Carbone
     email: [email protected]

diff --git a/front-end/package-lock.json b/front-end/package-lock.json
diff --git a/front-end/package.json b/front-end/package.json
@@ -1,6 +1,6 @@
 {
   "name": "esn-assembly",
-  "version": "1.10.0",
+  "version": "1.10.1",
   "author": "Matteo Carbone",
   "homepage": "https://matteocarbone.com/",
   "scripts": {
@@ -38,7 +38,7 @@
     "rxjs": "~7.8.0",
     "tslib": "^2.4.1",
     "typeface-poppins": "^1.1.13",
-    "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.1/xlsx-0.20.1.tgz",
+    "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz",
     "zone.js": "~0.13.0"
   },
   "devDependencies": {

diff --git a/front-end/src/app/tabs/topics/manageTopic.page.ts b/front-end/src/app/tabs/topics/manageTopic.page.ts
@@ -262,7 +262,8 @@ export class ManageTopicPage {
         copy.name = `${copy.name} - ${this.t._('COMMON.COPY')}`;
         delete copy.publishedSince;
         delete copy.willCloseAt;
-        delete copy.closedAt;
+        if (copy.type === TopicTypes.LIVE) this.topic.closedAt = new Date().toISOString();
+        else delete copy.closedAt;
         delete copy.archivedAt;
         copy.load(await this._topics.insert(copy));
         this.message.success('COMMON.OPERATION_COMPLETED');

diff --git a/front-end/src/environments/environment.idea.ts b/front-end/src/environments/environment.idea.ts
@@ -10,7 +10,7 @@ const STAGE = 'prod';
  */
 export const environment = {
   idea: {
-    app: { version: '1.10.0', mediaUrl: 'https://'.concat(parameters.mediaDomain), maxFileUploadSizeMB: 50 },
+    app: { version: '1.10.1', mediaUrl: 'https://'.concat(parameters.mediaDomain), maxFileUploadSizeMB: 50 },
     api: { url: parameters.apiDomain, stage: STAGE },
     socket: { url: parameters.webSocketApiDomain, stage: STAGE },
     ionicExtraModules: ['common']