Task/fix bugs301122 (#1043)

* Release 2.0.2

* Task/fix bug delete stage (#1027)

* Fix bug at backstage can not delete stage

* Fix Bug Studio UI load file i18n form dashboard get 403 code

* Task/fix statis duplicate delete (#1040)

* Move button Clone, Delete from Stage to Stage Management

* Update Code Sort by Created Date and Id DESC

* FIx bug statistics worng

* sort by created date decs

* fix bug statistics wrong

* debug fix statistics on dev-app env

* debug fix statistics wrong

* debug

* debug

* debug

* Fix bug Created_on have the same date after clone

* change "manage stage" to "manage"

* Check upload file limit on studio

* implement player upload limit enhancement

* Update format  size

* Fix does not return to start at end of playing (once mode)

* Add Create_On and last access in backstage

* add create date and last access on backstage

* delete notify

* update "without time zone"

Co-authored-by: TU_COMPUTER\justr <nhtu160220@gmail.com>

* with player-only access on a stage, i can still change status & visibility #1019

* fix bug hide backstage

* Implement #1039 Format Date and sort date

* make button to change font size in player chat

* fix bug author

* fix bug duplicate stage last_access = null, and sort stage on backstage interface

* Debug task send mail

* Debug task sendmail

* Permission system email notifications #790

* fix build fail in github

* debug git build fail

* debug build fail

* debug

* debug

* debug1

* debug11

* playwright1.22.2

* Fix bug install playwright failed

* update test case

* debug githubJob

* debug

* debug

* debug

* debug

* debug

* debug

* debug

* debug

* debug

* debug

* debug

* debug

* debug

* debug

* debug

* debug

* debug

* debug

* debug

* debug

Co-authored-by: gloriajw <gloriajw@users.noreply.github.com>
Co-authored-by: TU_COMPUTER\justr <nhtu160220@gmail.com>

Author: 3 people

.github/workflows/devapp1.yml

@@ -6,7 +6,7 @@ name: DEVAPP1 CI
 on:
   # Triggers the workflow on push or approved pull request on R1-2021 branch
   push:
-    branches: [ GnarlyPine-24 ]
+    branches: [ BlueMoon-2.0.2 ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -32,7 +32,7 @@ jobs:
           script: |
             cd /home/upstage/upstage/ui/dashboard/
             git fetch
-            git checkout GnarlyPine-24
+            git checkout BlueMoon-2.0.2
             git pull
             yarn
             yarn build:dev

.github/workflows/playwright.yml

@@ -19,7 +19,7 @@ jobs:
     - name: Install Playwright Browsers
       working-directory: ./ui/dashboard
       run: npx playwright install --with-deps
-    - name: Run Playwright tests
+    - name: Run Playwright tests 
       working-directory: ./ui/dashboard
       run: yarn playwright test
     - uses: actions/upload-artifact@v2

asset/models.py

@@ -62,6 +62,7 @@ class Stage(Base, db.Model):
     owner_id = Column(Integer, ForeignKey(User.id), nullable=False, default=0)
     file_location = Column(Text, nullable=False)
     created_on = Column(DateTime, nullable=False, default=datetime.utcnow)
+    last_access = Column(DateTime, nullable=True)
     owner = relationship(User, foreign_keys=[owner_id])
     attributes = relationship(lambda: StageAttribute, lazy='dynamic', back_populates='stage')
     assets = relationship('ParentStage', lazy='dynamic', back_populates='stage')

asset/sqlfiles/create.sql

@@ -33,6 +33,7 @@ CREATE TABLE "public"."stage" (
     "owner_id" integer NOT NULL,
     "file_location" character varying NOT NULL,
     "created_on" timestamp DEFAULT (now() at time zone 'utc'),
+    "last_access" timestamp without time zone,
     PRIMARY KEY ("id"),
     FOREIGN KEY (owner_id) REFERENCES upstage_user(id)
 );

config/sqlfiles/create.sql

@@ -11,6 +11,6 @@ CREATE TABLE "public"."config" (
 INSERT INTO "config" ("name", "value") VALUES ('FOYER_TITLE', 'CYBERFORMANCE PLATFORM');
 INSERT INTO "config" ("name", "value") VALUES ('FOYER_DESCRIPTION', 'UpStage is an online venue for live performance: remote performers collaborate in real time using digital media, and online audiences anywhere in the world join events by going to a web page, without having to download and install any additional software. UpStage is available free to anyone who would like to use it.');
 INSERT INTO "config" ("name", "value") VALUES ('FOYER_MENU', 'UpStage User Manual (https://docs.upstage.live/)
-Customise Foyer (/backstage/admin/foyer-customisation)');
+Customise Foyer (/backstage/admin/foyer-customisation) (8,32)');
 
 INSERT INTO "config" ("name", "value") VALUES ('ENABLE_DONATE', 'true');

mail/templates.py

@@ -100,6 +100,30 @@ def request_permission_for_media(user, media, note, studio_url):
 {footer}
 """
 
+def waiting_request_media_approve(user, media):
+    return f"""
+<p>
+Hi <b>{display_user(user)}</b>,
+<br>
+<br>
+Your permission request for media <b>{media.name}</b> has been sent to the owner, please wait to approve.
+<br>
+<br>
+{footer}
+"""
+
+def request_permission_acknowledgement(user, media):
+    return f"""
+<p>
+Hi <b>{display_user(media.owner)}</b>,
+<br>
+<br>
+{display_user(user)} has indicated that they wish to use your media <b>{media.name}</b> and will acknoweldege it as you have specified.
+<br>
+<br>
+{footer}    
+"""
+
 def permission_response_for_media(user, media, note, approved, studio_url):
     return f"""
 <p>

stage/schema.py

@@ -4,6 +4,7 @@
 import sys
 import os
 import json
+import datetime
 
 appdir = os.path.abspath(os.path.dirname(__file__))
 projdir = os.path.abspath(os.path.join(appdir, '..'))
@@ -250,7 +251,7 @@ def mutate(self, info, input):
             local_db_session.commit()
             stage = DBSession.query(StageModel).filter(
                 StageModel.id == data['id']).first()
-
+            
             return UpdateStage(stage=stage)
 
 
@@ -308,6 +309,29 @@ def mutate(self, info, stage_id):
             local_db_session.commit()
             return UpdateAttributeVisibility(result=attribute.description)
 
+
+class UpdateLastAccess(graphene.Mutation):
+    """Mutation to update a stage last access attribute."""
+    result = graphene.String()
+
+    class Arguments:
+        stage_id = graphene.ID(
+            required=True, description="Global Id of the stage.")
+        
+
+    # decorate this with jwt login decorator.
+    def mutate(self, info, stage_id):
+        with ScopedSession() as local_db_session:
+            _id = int(stage_id)
+            stage = local_db_session.query(StageModel).filter(StageModel.id == _id);
+            if stage:
+                stage.update({
+                StageModel.last_access: datetime.datetime.utcnow()
+                }, synchronize_session="fetch")
+
+            local_db_session.commit()
+            return UpdateLastAccess(result= datetime.datetime.utcnow())
+
 class AssignMediaInput(graphene.InputObjectType):
     id = graphene.ID(required=True, description="Global Id of the stage.")
     media_ids = graphene.List(graphene.Int, description="Id of assigned media")
@@ -403,6 +427,9 @@ def mutate(self, info, id):
                     ParentStage.stage_id == id).delete(synchronize_session=False)
                 local_db_session.query(StageAttributeModel).filter(
                     StageAttributeModel.stage_id == id).delete(synchronize_session=False)
+                local_db_session.query(SceneModel).filter(
+                    SceneModel.stage_id == id).delete(synchronize_session=False)
+    
                 for performance in local_db_session.query(PerformanceModel).filter(
                         PerformanceModel.stage_id == id).all():
                     local_db_session.query(EventModel).filter(
@@ -444,6 +471,8 @@ def mutate(self, info, id, name):
                 stage.id = None
                 stage.name = name
                 stage.owner_id = user.id
+                stage.last_access = None
+                stage.created_on = datetime.datetime.utcnow()
                 shortname = re.sub(
                     '\s+', '-', re.sub('[^A-Za-z0-9 ]+', '', name)).lower()
 
@@ -498,12 +527,13 @@ class Mutation(graphene.ObjectType):
     saveRecording = SaveRecording.Field()
     updateStatus = UpdateAttributeStatus.Field()
     updateVisibility = UpdateAttributeVisibility.Field()
+    updateLastAccess = UpdateLastAccess.Field()
 
 
 class Query(graphene.ObjectType):
     node = relay.Node.Field()
     stageList = StageConnectionField(
-        Stage.connection, id=graphene.ID(), name_like=graphene.String(), file_location=graphene.String())
+        Stage.connection, id=graphene.ID(), name_like=graphene.String(), file_location=graphene.String(), created_on=graphene.DateTime())
     assetList = AssetConnectionField(
         Asset.connection, id=graphene.ID(), name_like=graphene.String(), asset_type=graphene.String(), file_location=graphene.String())
     assetTypeList = StageConnectionField(

studio/media.py

@@ -19,7 +19,7 @@
 from asset.models import Asset as AssetModel, MediaTag, Stage as StageModel, Tag
 from asset.models import AssetType as AssetTypeModel
 from mail.mail_utils import send
-from mail.templates import permission_response_for_media, request_permission_for_media
+from mail.templates import permission_response_for_media, request_permission_for_media, waiting_request_media_approve, request_permission_acknowledgement, display_user
 from user.models import GUEST, PLAYER, User as UserModel
 from config.project_globals import DBSession, ScopedSession, appdir
 from config.settings import STREAM_EXPIRY_DAYS, STREAM_KEY
@@ -505,13 +505,15 @@ async def mutate(self, info, asset_id, note=None):
                     user_id=user.id, asset_id=asset_id, note=note)
                 if asset.copyright_level == 2:
                     asset_usage.approved = False
+                    studio_url = f"{request.url_root}studio"
+                    await send([asset.owner.email], f"Pending permission request for media {asset.name}", request_permission_for_media(user, asset, note, studio_url))
+                    await send(user.email,f"Waiting permission request for media {asset.name} approve", waiting_request_media_approve(user,asset))
                 else:
                     asset_usage.approved = True
+                    await send(user.email, f"{display_user(user)} want to use yout media {asset.name} acknowledge media", request_permission_acknowledgement(user, asset, note))
                 local_db_session.add(asset_usage)
                 local_db_session.flush()
                 local_db_session.commit()
-                studio_url = f"{request.url_root}studio"
-                await send([asset.owner.email], f"Pending permission request for media {asset.name}", request_permission_for_media(user, asset, note, studio_url))
         return ConfirmPermission(success=True)
 
 

ui/dashboard/package.json

@@ -38,6 +38,7 @@
     "moveable": "^0.24.5",
     "mqtt": "^4.2.6",
     "object-hash": "^2.1.1",
+    "playwright": "1.23.0",
     "qr-code-styling": "^1.6.0-rc.1",
     "register-service-worker": "^1.7.1",
     "vue": "^3.2.2",
@@ -47,7 +48,7 @@
     "vuex-persistedstate": "^4.0.0-beta.1"
   },
   "devDependencies": {
-    "@playwright/test": "^1.22.2",
+    "@playwright/test": "1.23.0",
     "@vue/cli-plugin-babel": "~4.5.13",
     "@vue/cli-plugin-eslint": "~4.5.13",
     "@vue/cli-plugin-pwa": "~4.5.13",

ui/dashboard/src/components/DataTable/index.vue

@@ -69,7 +69,7 @@
                 </template>
                 <template v-else-if="header.type === 'date'">
                   <span :title="moment(item[header.key])">
-                    {{ fromNow(item[header.key]) }}
+                    {{ handleFormatDate(item[header.key]) }}
                   </span>
                 </template>
                 <template v-else>{{ item[header.key] }}</template>
@@ -154,6 +154,18 @@ export default {
         this.sortBy = header;
       }
     },
+
+    handleFormatDate(date){
+      if (date == null) {
+        return null;
+      } 
+      
+      if (moment(this.now).diff(date, "weeks") > 1) {
+        return moment(date).format('DD/MM/yyyy')
+      }
+
+      return this.fromNow(date);
+    }
   },
   computed: {
     offset() {
@@ -174,7 +186,7 @@ export default {
             return render(a).localeCompare(render(b));
           }
           if (key) {
-            return a[key].localeCompare(b[key]);
+            return a[key]?.localeCompare(b[key]);
           }
         });
       }