Merge pull request #1175 from lowcoder-org/concurrency-user-display

Concurrency user display

Author: FalkWolsky

.gitignore

@@ -17,3 +17,4 @@ application-dev-localhost.yaml
 .vscode/launch.json
 server/api-service/lowcoder-server/src/main/resources/application-local-dev.yaml
 translations/locales/node_modules/
+.vscode/settings.json

.vscode/settings.json

@@ -4,5 +4,6 @@
         "titleBar.activeBackground": "#3B431A",
         "titleBar.activeForeground": "#F9FAF2"
     },
-    "java.debug.settings.onBuildFailureProceed": true
+    "java.debug.settings.onBuildFailureProceed": true,
+    "java.configuration.updateBuildConfiguration": "automatic"
 }

client/packages/lowcoder/src/api/applicationApi.ts

@@ -9,6 +9,7 @@ import {
   PublishApplicationPayload,
   RecycleApplicationPayload,
   RestoreApplicationPayload,
+  SetAppEditingStatePayload,
   UpdateAppPermissionPayload,
 } from "redux/reduxActions/applicationActions";
 import { ApiResponse, GenericApiResponse } from "./apiResponses";
@@ -96,7 +97,7 @@ class ApplicationApi extends Api {
   static publicToAllURL = (applicationId: string) => `/applications/${applicationId}/public-to-all`;
   static publicToMarketplaceURL = (applicationId: string) => `/applications/${applicationId}/public-to-marketplace`;
   static getMarketplaceAppURL = (applicationId: string) => `/applications/${applicationId}/view_marketplace`;
-
+  static setAppEditingStateURL = (applicationId: string) => `/applications/editState/${applicationId}`;
 
   static fetchHomeData(request: HomeDataPayload): AxiosPromise<HomeDataResponse> {
     return Api.get(ApplicationApi.fetchHomeDataURL, request);
@@ -232,6 +233,13 @@ class ApplicationApi extends Api {
   static getMarketplaceApp(appId: string) {
     return Api.get(ApplicationApi.getMarketplaceAppURL(appId));
   }
+
+  static setAppEditingState(request: SetAppEditingStatePayload): AxiosPromise<ApplicationResp> {
+    const { applicationId, editingFinished } = request;
+    return Api.put(ApplicationApi.setAppEditingStateURL(applicationId), {
+      editingFinished,
+    });
+  }
 }
 
 export default ApplicationApi;

client/packages/lowcoder/src/constants/applicationConstants.ts

@@ -91,6 +91,8 @@ export interface ApplicationMeta {
   folder: false;
   isLocalMarketplace?: boolean;
   applicationStatus: "NORMAL" | "RECYCLED" | "DELETED";
+  editingUserId: string | null;
+  lastEditedAt: number;
 }
 
 export interface FolderMeta {

client/packages/lowcoder/src/constants/reduxActionConstants.ts

@@ -144,6 +144,7 @@ export const ReduxActionTypes = {
   FETCH_ALL_MODULES_SUCCESS: "FETCH_ALL_MODULES_SUCCESS",
   FETCH_ALL_MARKETPLACE_APPS: "FETCH_ALL_MARKETPLACE_APPS",
   FETCH_ALL_MARKETPLACE_APPS_SUCCESS: "FETCH_ALL_MARKETPLACE_APPS_SUCCESS",
+  SET_APP_EDITING_STATE: "SET_APP_EDITING_STATE",
 
   /* user profile */
   SET_USER_PROFILE_SETTING_MODAL_VISIBLE: "SET_USER_PROFILE_SETTING_MODAL_VISIBLE",

client/packages/lowcoder/src/i18n/locales/de.ts

@@ -2986,7 +2986,13 @@ export const de = {
   "editorMode_both": "Beide",
   "editorMode_layout_tooltip": "Passen Sie im rechten Fenster das Erscheinungsbild und Layout der Komponente an. Passen Sie Aussehen, Stil und Animationen an.",
   "editorMode_logic_tooltip": "Richten Sie im rechten Fenster ein, wie Ihre Komponente funktioniert und interagiert. Verwalten Sie den Inhalt und das interaktive Verhalten.",
-  },
+  "AppEditingBlocked": "App-Bearbeitung blockiert für:",
+  "AppEditingBlockedHint": "Änderungen werden nicht gespeichert, während ein anderer Benutzer diese App bearbeitet.",
+  "AppEditingBlockedMessage": "Bitte warten Sie, bevor Sie den Bearbeitungsstatus der App überprüfen.",
+  "AppEditingBlockedCheckStatus": "App-Status prüfen",
+  "AppEditingBlockedSomeone": "Jemand",
+  "AppEditingBlockedMessageSnipped": "bearbeitet diese App",
+},
   "userAuth": {
     ...en.userAuth,
 

client/packages/lowcoder/src/i18n/locales/en.ts

@@ -2922,7 +2922,13 @@ export const en = {
     "editorMode_logic": "Logic",
     "editorMode_both": "Both",
     "editorMode_layout_tooltip": "Customise the component's appearance and layout, in the right window. Adjust how it looks, styles, and animates.",
-    "editorMode_logic_tooltip": "Set up how your component works and interacts, in the right window. Manage its content and interactive behaviours."
+    "editorMode_logic_tooltip": "Set up how your component works and interacts, in the right window. Manage its content and interactive behaviours.",
+    "AppEditingBlocked": "App Editing Blocked for:",
+    "AppEditingBlockedHint": "Changes will not be saved while another user is editing this app.",
+    "AppEditingBlockedMessage": "Please wait before check the editing status of the App.",
+    "AppEditingBlockedCheckStatus": "Check App Status",
+    "AppEditingBlockedSomeone": "Someone",
+    "AppEditingBlockedMessageSnipped": "is editing this app",
   },
   "userAuth": {
     "registerByEmail": "Sign Up",

client/packages/lowcoder/src/i18n/locales/es.ts

@@ -2986,6 +2986,12 @@ export const es = {
   "editorMode_both": "Ambos",
   "editorMode_layout_tooltip": "Personalice la apariencia y el diseño del componente en la ventana derecha. Ajusta su aspecto, estilo y animación.",
   "editorMode_logic_tooltip": "Configure el funcionamiento y la interacción de su componente, en la ventana adecuada. Gestione su contenido y sus comportamientos interactivos.",
+  "AppEditingBlocked": "Edición de la App bloqueada para:",
+  "AppEditingBlockedHint": "Los cambios no se guardarán mientras otro usuario esté editando esta aplicación.",
+  "AppEditingBlockedMessage": "Por favor, espere antes de verificar el estado de edición de la aplicación.",
+  "AppEditingBlockedCheckStatus": "Verificar estado de la aplicación",
+  "AppEditingBlockedSomeone": "Alguien",
+  "AppEditingBlockedMessageSnipped": "está editando esta aplicación",
   },
   "userAuth": {
     ...en.userAuth,

client/packages/lowcoder/src/i18n/locales/it.ts

@@ -2986,6 +2986,12 @@ export const it = {
   "editorMode_both": "Entrambi",
   "editorMode_layout_tooltip": "Personalizzare l'aspetto e il layout del componente, nella finestra di destra. Regolate l'aspetto, gli stili e le animazioni.",
   "editorMode_logic_tooltip": "Impostate il funzionamento e l'interazione del vostro componente, nella finestra giusta. Gestite il suo contenuto e i suoi comportamenti interattivi.",
+  "AppEditingBlocked": "Modifica dell'app bloccata per:",
+  "AppEditingBlockedHint": "Le modifiche non verranno salvate mentre un altro utente sta modificando questa app.",
+  "AppEditingBlockedMessage": "Attendere prima di controllare lo stato di modifica dell'app.",
+  "AppEditingBlockedCheckStatus": "Controlla lo stato dell'app",
+  "AppEditingBlockedSomeone": "Qualcuno",
+  "AppEditingBlockedMessageSnipped": "sta modificando questa app",
   },
   "userAuth": {
     ...en.userAuth,

client/packages/lowcoder/src/i18n/locales/pt.ts

@@ -2986,6 +2986,12 @@ export const pt = {
   "editorMode_both": "Ambos",
   "editorMode_layout_tooltip": "Personalize a aparência e o layout do componente, na janela direita. Ajuste sua aparência, estilo e animação.",
   "editorMode_logic_tooltip": "Configure como seu componente funciona e interage, na janela direita. Gerencie seu conteúdo e comportamentos interativos.",
+  "AppEditingBlocked": "Edição do aplicativo bloqueada para:",
+  "AppEditingBlockedHint": "As alterações não serão salvas enquanto outro usuário estiver editando este aplicativo.",
+  "AppEditingBlockedMessage": "Por favor, aguarde antes de verificar o status de edição do aplicativo.",
+  "AppEditingBlockedCheckStatus": "Verificar status do aplicativo",
+  "AppEditingBlockedSomeone": "Alguém",
+  "AppEditingBlockedMessageSnipped": "está editando este aplicativo",
   },
   "userAuth": {
     ...en.userAuth,