Skip to content

Commit e4c550c

Browse files
authored
Pr fix manage (#242)
* Change to use theme * Get ProjectManageModal cleaner * Cleanup of File Management * Add strings to internationalization * When copying, go to that one * Reduce duplication of code * Add select and rename now goes to one renamed * Remove individual mechanisms from Explorer * Move break to where it belongs * Removed spamming of console with log messages * Get rid of spamming message to console * Remove unneeded activeTab * Update comment to be correct after change in method * Move Manage to Control section and put back Explorer * Removed getDivider since it is no longer used * Fix interpolation in translation files * Change Create New to have type created * Added CreateNew to Project so it will look like the others
1 parent 77561d1 commit e4c550c

File tree

11 files changed

+219
-132
lines changed

11 files changed

+219
-132
lines changed

src/App.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -581,12 +581,17 @@ const AppContent: React.FC<AppContentProps> = ({ project, setProject }): React.J
581581
}
582582
}, [project]);
583583

584-
// Update tab items when fetching modules is done.
584+
// Update tab items when ever the modules in the project change.
585585
React.useEffect(() => {
586586
if (project) {
587587
const tabs = createTabItemsFromProject(project);
588588
setTabItems(tabs);
589-
setActiveTab(project.robot.modulePath);
589+
590+
// Only set active tab to robot if no active tab is set or if the current active tab no longer exists
591+
const currentActiveTabExists = tabs.some(tab => tab.key === activeTab);
592+
if (!activeTab || !currentActiveTabExists) {
593+
setActiveTab(project.robot.modulePath);
594+
}
590595
}
591596
}, [modulePathToContentText]);
592597

src/i18n/locales/en/translation.json

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"search": "Search..."
2121
},
2222
"PROJECT": "Project",
23+
"PROJECTS": "Projects",
2324
"SAVE": "Save",
2425
"DEPLOY": "Deploy",
2526
"MANAGE": "Manage",
@@ -37,11 +38,35 @@
3738
"SELECT_HIDDEN": "Select Hidden",
3839
"NO_HIDDEN_MECHANISMS": "No Hidden Mechanisms",
3940
"NO_HIDDEN_OPMODES": "No Hidden Opmodes",
40-
"CREATE_NEW": "Create New",
41+
"CREATE_NEW": "Create New {{type}}",
4142
"CREATE": "Create",
4243
"BLOCKS": "Blocks",
4344
"CODE": "Code",
4445
"COPY": "Copy",
46+
"FAILED_TO_RENAME_PROJECT": "Failed to rename project",
47+
"FAILED_TO_COPY_PROJECT": "Failed to copy project",
48+
"FAILED_TO_CREATE_PROJECT": "Failed to create a new project.",
49+
"FAILED_TO_DELETE_PROJECT": "Failed to delete the project.",
50+
"RENAME_PROJECT": "Rename Project",
51+
"COPY_PROJECT": "Copy Project",
52+
"NAME": "Name",
53+
"ACTIONS": "Actions",
54+
"DELETE_PROJECT_CONFIRM": "Delete {{projectName}}?",
55+
"DELETE_CANNOT_BE_UNDONE": "This action cannot be undone.",
56+
"NO_PROJECTS_FOUND": "No projects found",
57+
"CREATE_PROJECT_TO_START": "Please create a new project to get started.",
58+
"PAGINATION_ITEMS": "{{range0}}-{{range1}} of {{total}} items",
59+
"FAILED_TO_RENAME_MODULE": "Failed to rename module",
60+
"FAILED_TO_COPY_MODULE": "Failed to copy module",
61+
"MODULE_NOT_FOUND_FOR_COPYING": "Original module not found for copying",
62+
"COPY_SUFFIX": "{{name}} (copy)",
63+
"DELETE_MODULE_CONFIRM": "Delete {{title}}?",
64+
"MANAGEMENT": "Management",
65+
"TYPE_MANAGEMENT": "{{type}} Management",
66+
"RENAME_TYPE_TITLE": "Rename {{type}}: {{title}}",
67+
"COPY_TYPE_TITLE": "Copy {{type}}: {{title}}",
68+
"RENAME": "Rename",
69+
"NO_FILES_FOUND": "No {{type}} files found",
4570
"MECHANISMS": "Mechanisms",
4671
"OPMODES": "OpModes",
4772
"BLOCKLY":{
@@ -103,7 +128,8 @@
103128
"EVENTS": "Events",
104129
"ADD_MECHANISM": "+ Mechanism",
105130
"ADD_COMPONENT": "+ Component",
106-
"TEST": "Test"
131+
"TEST": "Test",
132+
"PAGINATION_TOTAL": "{{start}}-{{end}} of {{total}} items"
107133
},
108134
"WARNING":{
109135
"CALL_COMPONENT_INSTANCE_METHOD_PRIVATE_COMPONENT": "This blocks calls a method on a private component in the {{mechanismClassName}} mechanism.",

src/i18n/locales/es/translation.json

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"example_opmode": "Por ejemplo: AutoEstacionarYDisparar",
1818
"example_project": "Por ejemplo: RobotRuedasLocas",
1919
"PROJECT": "Proyecto",
20+
"PROJECTS": "Proyectos",
2021
"SAVE": "Guardar",
2122
"DEPLOY": "Desplegar",
2223
"MANAGE": "Gestionar",
@@ -34,11 +35,35 @@
3435
"SELECT_HIDDEN": "Seleccionar Oculto",
3536
"NO_HIDDEN_MECHANISMS": "No Hay Mecanismos Ocultos",
3637
"NO_HIDDEN_OPMODES": "No Hay Opmodes Ocultos",
37-
"CREATE_NEW": "Crear Nuevo",
38+
"CREATE_NEW": "Crear Nuevo {{type}}",
3839
"CREATE": "Crear",
3940
"BLOCKS": "Bloques",
4041
"CODE": "Código",
4142
"COPY": "Copiar",
43+
"FAILED_TO_RENAME_PROJECT": "Error al renombrar proyecto",
44+
"FAILED_TO_COPY_PROJECT": "Error al copiar proyecto",
45+
"FAILED_TO_CREATE_PROJECT": "Error al crear un nuevo proyecto.",
46+
"FAILED_TO_DELETE_PROJECT": "Error al eliminar el proyecto.",
47+
"RENAME_PROJECT": "Renombrar Proyecto",
48+
"COPY_PROJECT": "Copiar Proyecto",
49+
"NAME": "Nombre",
50+
"ACTIONS": "Acciones",
51+
"DELETE_PROJECT_CONFIRM": "¿Eliminar {{projectName}}?",
52+
"DELETE_CANNOT_BE_UNDONE": "Esta acción no se puede deshacer.",
53+
"NO_PROJECTS_FOUND": "No se encontraron proyectos",
54+
"CREATE_PROJECT_TO_START": "Por favor crea un nuevo proyecto para comenzar.",
55+
"PAGINATION_ITEMS": "{{range0}}-{{range1}} de {{total}} elementos",
56+
"FAILED_TO_RENAME_MODULE": "Error al renombrar módulo",
57+
"FAILED_TO_COPY_MODULE": "Error al copiar módulo",
58+
"MODULE_NOT_FOUND_FOR_COPYING": "Módulo original no encontrado para copiar",
59+
"COPY_SUFFIX": "{{name}} (copia)",
60+
"DELETE_MODULE_CONFIRM": "¿Eliminar {{title}}?",
61+
"MANAGEMENT": "Gestión",
62+
"TYPE_MANAGEMENT": "Gestión de {{type}}",
63+
"RENAME_TYPE_TITLE": "Renombrar {{type}}: {{title}}",
64+
"COPY_TYPE_TITLE": "Copiar {{type}}: {{title}}",
65+
"RENAME": "Renombrar",
66+
"NO_FILES_FOUND": "No se encontraron archivos de {{type}}",
4267
"addTabDialog": {
4368
"title": "Agregar Pestaña",
4469
"search": "Buscar..."
@@ -104,7 +129,8 @@
104129
"EVENTS": "Eventos",
105130
"ADD_MECHANISM": "+ Mecanismo",
106131
"ADD_COMPONENT": "+ Componente",
107-
"TEST": "Prueba"
132+
"TEST": "Prueba",
133+
"PAGINATION_TOTAL": "{{start}}-{{end}} de {{total}} elementos"
108134
},
109135
"WARNING":{
110136
"CALL_COMPONENT_INSTANCE_METHOD_PRIVATE_COMPONENT": "Este bloque llama a un método en un componente privado en el mecanismo {{mechanismClassName}}.",

src/i18n/locales/he/translation.json

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"search": "חיפוש..."
2121
},
2222
"PROJECT": "פרויקט",
23+
"PROJECTS": "פרויקטים",
2324
"SAVE": "שמור",
2425
"DEPLOY": "העלה לרובוט",
2526
"MANAGE": "ניהול",
@@ -37,11 +38,35 @@
3738
"SELECT_HIDDEN": "בחר נסתר",
3839
"NO_HIDDEN_MECHANISMS": "אין מנגנונים נסתרים",
3940
"NO_HIDDEN_OPMODES": "אין אופמודים נסתרים",
40-
"CREATE_NEW": "צור חדש",
41+
"CREATE_NEW": "צור {{type}} חדש",
4142
"CREATE": "צור",
4243
"BLOCKS": "בלוקים",
4344
"CODE": "קוד",
4445
"COPY": "העתק",
46+
"FAILED_TO_RENAME_PROJECT": "נכשל בשינוי שם הפרויקט",
47+
"FAILED_TO_COPY_PROJECT": "נכשל בהעתקת הפרויקט",
48+
"FAILED_TO_CREATE_PROJECT": "נכשל ביצירת פרויקט חדש.",
49+
"FAILED_TO_DELETE_PROJECT": "נכשל במחיקת הפרויקט.",
50+
"RENAME_PROJECT": "שנה שם פרויקט",
51+
"COPY_PROJECT": "העתק פרויקט",
52+
"NAME": "שם",
53+
"ACTIONS": "פעולות",
54+
"DELETE_PROJECT_CONFIRM": "מחק את {{projectName}}?",
55+
"DELETE_CANNOT_BE_UNDONE": "פעולה זו לא ניתנת לביטול.",
56+
"NO_PROJECTS_FOUND": "לא נמצאו פרויקטים",
57+
"CREATE_PROJECT_TO_START": "אנא צור פרויקט חדש כדי להתחיל.",
58+
"PAGINATION_ITEMS": "{{range0}}-{{range1}} מתוך {{total}} פריטים",
59+
"FAILED_TO_RENAME_MODULE": "נכשל בשינוי שם המודול",
60+
"FAILED_TO_COPY_MODULE": "נכשל בהעתקת המודול",
61+
"MODULE_NOT_FOUND_FOR_COPYING": "המודול המקורי לא נמצא להעתקה",
62+
"COPY_SUFFIX": "{{name}} (עותק)",
63+
"DELETE_MODULE_CONFIRM": "מחק את {{title}}?",
64+
"MANAGEMENT": "ניהול",
65+
"TYPE_MANAGEMENT": "ניהול {{type}}",
66+
"RENAME_TYPE_TITLE": "שינוי שם {{type}}: {{title}}",
67+
"COPY_TYPE_TITLE": "העתקת {{type}}: {{title}}",
68+
"RENAME": "שנה שם",
69+
"NO_FILES_FOUND": "לא נמצאו קבצי {{type}}",
4570
"MECHANISMS": "מנגנונים",
4671
"OPMODES": "אופמודים",
4772
"BLOCKLY": {
@@ -103,7 +128,8 @@
103128
"EVENTS": "אירועים",
104129
"ADD_MECHANISM": "+ מנגנון",
105130
"ADD_COMPONENT": "+ רכיב",
106-
"TEST": "בדיקה"
131+
"TEST": "בדיקה",
132+
"PAGINATION_TOTAL": "{{start}}-{{end}} מתוך {{total}} פריטים"
107133
},
108134
"WARNING": {
109135
"CALL_COMPONENT_INSTANCE_METHOD_PRIVATE_COMPONENT": "בלוק זה קורא למתודה על רכיב פרטי במנגנון {{mechanismClassName}}.",

src/reactComponents/AddTabDialog.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ export default function AddTabDialog(props: AddTabDialogProps) {
185185
locale={{emptyText: tabType === TabType.MECHANISM ? t('NO_HIDDEN_MECHANISMS') : t('NO_HIDDEN_OPMODES')}}
186186
/>
187187
<h4 style={{margin: '0 0 8px 0'}}>
188-
{t('CREATE_NEW')}
188+
{t('CREATE_NEW', { type: TabTypeUtils.toString(tabType) })}
189189
</h4>
190190

191191
<div style={{

0 commit comments

Comments
 (0)